gentoo resync : 25.11.2020

4 files changed, 4 insertions, 209 deletions

diff --git a/app-emulation/open-vm-tools/Manifest b/app-emulation/open-vm-tools/Manifest
index f5b97c5f5e39..cac4b468c659 100644
--- a/app-emulation/open-vm-tools/Manifest
+++ b/app-emulation/open-vm-tools/Manifest
@@ -1,14 +1,11 @@
 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.0.1-udev-complaints.patch 3025 BLAKE2B 73c8bca32a2da4c652bc3c66144c07eabc0b294f086b43cef51035f358671fdf37d621903f601bbdaea5c4a5cb85fb48419eb1eb9b4d7e29eedd06ef2989d8a6 SHA512 4c589da04ac160c044fed982d1fce28006e5709ce7620cdff753d6b7b29a5c2140cb12234b9cc85117ebb77487c297237a693155c3db458246ac4288379f7d6f
 AUX mount.vmhgfs 63 BLAKE2B 8214f6eaae9e1c2b6af7cb364572323f91e544d17d816ce93ca1a58e4f6c0ac8692000c95ef982ad6a2721bb070a5d0c4a65275a63e8cea91e14888713b560d4 SHA512 dbad70fbb96e37ffca4664abe7766c26ce3303e52ccfc80b5c83d1e21066d2a23d548910f8e15055be36e1ca162cdbbf6e19fcb672314888c63cd802a499acb9
 AUX open-vm-tools.confd 88 BLAKE2B d82267674328d1e38cc850df238b8cc6c566588883d81e59f308ddd070fde6e4f9ae4950c9d68ac6daf2ed33e1a45f323d8f954430559b03697f1a25f1e7ef6a SHA512 fca30a3be4dd3247e16115fe32b4d27ede8751f96b5a33b9f489b0ce57823c605b6249ff722d6f4ed82a98979f36d28821603b4a5a1d967d3048d23d983a19be
 AUX open-vm-tools.initd 1225 BLAKE2B 279f572bfb07c40f0612c39989ba0048c640b5bdfdb06e624d8af974cd9fdff42ab0b4bb6ad79e19dedf3cd89fd90d61f7d549b9c8a8a6406129a5eab5e60cbc SHA512 a612dd69e671cd32b028caeefa8123243e46ed6ffe5f6f7cbd1f805ec10088dbe994d4ecb2346a7f6d094e913e70e87fa17fa195702a0825cc3af319d350d34d
 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.0.1-14773994.tar.gz 3972888 BLAKE2B 8ead9b37e9fa861386087d50af4e20274a9ee9fafd929da3ca0652ea2c4eecff4c203cadf02d38401bfd7ff0129ebcc7895d2819785cf2d818aac91a46f8d163 SHA512 3f500b3f0daaed01f787cf271d094b693baa18304491c3b58c79b64ab7db41b1b4a4747440e0039b2d9f9cc7e1474ee15f0ee7413544a34c2c9402443c145276
-DIST open-vm-tools-11.1.0-16036546.tar.gz 3986835 BLAKE2B f02e9426fb324ec0f4f78f43554a55ce0b615f609f888c008e8ecaf59332b9e25b0c865730cd263be1936d223c9cd5e078d304d1ddd8903cec88512cd63c258b SHA512 cd1f8399b9660ecac8222cfdc0d6331dce67db2f3a1788f21b18b201066dbcd059f429130f1fb5b416bb9a06b4882ec462a134aa8ca595f17dc48af0b7f59e8e
-EBUILD open-vm-tools-11.0.1-r1.ebuild 3134 BLAKE2B 424ed232a629c2d8c9d2af5f5cf57c5c686f9dbbc062b2abd208e4d687aea875e753ddefbd417caf9bbabe071167f45591774df667097d7edefde4546fb4b119 SHA512 f64540dfcffe1ee7e0584fb59ace3082544c6f71fa310c2fa4f3ba35440c586da43780e5e5a5cac551cd1781c617b3945e825fcb07fd52f54ad6d6d1703fbfe7
-EBUILD open-vm-tools-11.1.0.ebuild 3146 BLAKE2B c509b879979229195cb42172149e997167c223c84e8dd9087d8a38f8ff028eb0f1418e73639eacdaa79f0f5bc95f1ee020d10ef8d13ab0504a9eada90642c5ba SHA512 270c9bb189641b2a0650195601aebd86cbdbbe8cc1ae15a894e8a8f7ce269d6069cd018843c0ed596ac3581c15e4e6a9e672a162a60f695eb00bc97ee8adeb2d
+DIST open-vm-tools-11.2.0-16938113.tar.gz 4050857 BLAKE2B b0e5e1e985d9f3d50dbbb8a4a7939d37d8968f0aa15e6d7200b7ec8511bd059d3a78a4ddd763d22965dc6da614d156e6b7ee23af73490f8bbf8e1dc2664041d3 SHA512 c950d6e8ba5218dd40e845f3c2b09eeb640ef0d33c7ea1671164027927e062dcf0b4745f6e4515a7495ec20a6d06a8fbf700819f6211073194b5ef97d7be441d
+EBUILD open-vm-tools-11.2.0_p16938113.ebuild 3153 BLAKE2B 6d8424e4ba4588a1161764495d2fa2846fc0009badc101cbeb06e2b496e9ba58322ecbb158f08524e9aa39bf11c4c3ab951c9a0872cf837560c48deb636e8ebf SHA512 ed7bdc4a7ef9f6b6b615f03735df0b0b3b1bbe3ea7e7f40c5c84e46f81d0c120e6fbfb51749d81600f89d3ebf087fc711d2857d7010c895644616696889da8bb
 MISC metadata.xml 1098 BLAKE2B f4a5ef8cb8661438d0d1e01da16993a3334c25dcf8a43e55ecabd0b02734b33681d1b0824db1f08431086f8287094d7aee559e50af8c0ef0f4819cc2c14158eb SHA512 f4eb924b8a5269f0fe7f4c00f3a4747f56dfdc5c028a913785cf1929938ad333102ebfba6f3ca9ac15fb7e25f06d629be528abdcd7bb96a8c31e257405cda201
diff --git a/app-emulation/open-vm-tools/files/11.0.1-udev-complaints.patch b/app-emulation/open-vm-tools/files/11.0.1-udev-complaints.patch
deleted file mode 100644
index b34e06d1a227..000000000000
--- a/app-emulation/open-vm-tools/files/11.0.1-udev-complaints.patch
+++ /dev/null
@@ -1,60 +0,0 @@
-From f1dab8ded45aaaa4b6993a4d96d0aefc700f1796 Mon Sep 17 00:00:00 2001
-From: Oliver Kurth <okurth@vmware.com>
-Date: Mon, 28 Oct 2019 16:12:42 -0700
-Subject: [PATCH] stop systemd-243 udev complaints #371
-
-Address issues from pull request #371 on github:
-- fix substiution variables for systemd-243
-- fix permissions of rules file
-See https://github.com/vmware/open-vm-tools/pull/371
----
- open-vm-tools/AUTHORS                        | 4 ++++
- open-vm-tools/udev/99-vmware-scsi-udev.rules | 6 +++---
- open-vm-tools/udev/Makefile.am               | 4 ++--
- 3 files changed, 9 insertions(+), 5 deletions(-)
-
-diff --git a/open-vm-tools/AUTHORS b/open-vm-tools/AUTHORS
-index 08cc28ef2..026de07e6 100644
---- a/open-vm-tools/AUTHORS
-+++ b/open-vm-tools/AUTHORS
-@@ -49,3 +49,7 @@ Josh Paetzel    Additional changes to vmmemctl.ko for FreeBSD 12.0 API changes.
- 
- Haruki Tsurumoto        Fix Asianux identification
-                 - https://github.com/vmware/open-vm-tools/pull/325
-+
-+MilhouseVH      stop systemd-243 udev complaints
-+                - https://github.com/vmware/open-vm-tools/pull/371
-+
-diff --git a/open-vm-tools/udev/99-vmware-scsi-udev.rules b/open-vm-tools/udev/99-vmware-scsi-udev.rules
-index 053b59706..fb4ed6844 100644
---- a/open-vm-tools/udev/99-vmware-scsi-udev.rules
-+++ b/open-vm-tools/udev/99-vmware-scsi-udev.rules
-@@ -1,7 +1,7 @@
--# Copyright (C) 2016 VMware, Inc.  All rights reserved.
-+# Copyright (C) 2016,2019 VMware, Inc.  All rights reserved.
- #
- # This file is part of open-vm-tools
- 
--ACTION=="add", SUBSYSTEMS=="scsi", ATTRS{vendor}=="VMware*", ATTRS{model}=="Virtual disk*", ENV{DEVTYPE}=="disk", RUN+="/bin/sh -c 'echo 180 >/sys$DEVPATH/device/timeout'"
--ACTION=="add", SUBSYSTEMS=="scsi", ATTRS{vendor}=="VMware*", ATTRS{model}=="VMware Virtual S", ENV{DEVTYPE}=="disk", RUN+="/bin/sh -c 'echo 180 >/sys$DEVPATH/device/timeout'"
-+ACTION=="add", SUBSYSTEMS=="scsi", ATTRS{vendor}=="VMware*", ATTRS{model}=="Virtual disk*", ENV{DEVTYPE}=="disk", RUN+="/bin/sh -c 'echo 180 >/sys$env{DEVPATH}/device/timeout'"
-+ACTION=="add", SUBSYSTEMS=="scsi", ATTRS{vendor}=="VMware*", ATTRS{model}=="VMware Virtual S", ENV{DEVTYPE}=="disk", RUN+="/bin/sh -c 'echo 180 >/sys$env{DEVPATH}/device/timeout'"
- 
-diff --git a/open-vm-tools/udev/Makefile.am b/open-vm-tools/udev/Makefile.am
-index 68fbc3e27..c3baadf16 100644
---- a/open-vm-tools/udev/Makefile.am
-+++ b/open-vm-tools/udev/Makefile.am
-@@ -1,5 +1,5 @@
- ################################################################################
--### Copyright (C) 2016 VMware, Inc.  All rights reserved.
-+### Copyright (C) 2016,2019 VMware, Inc.  All rights reserved.
- ###
- ### This program is free software; you can redistribute it and/or modify
- ### it under the terms of version 2 of the GNU General Public License as
-@@ -17,5 +17,5 @@
- 
- install-data-local:
- 	$(INSTALL) -d $(DESTDIR)$(UDEVRULESDIR)
--	$(INSTALL) $(srcdir)/99-vmware-scsi-udev.rules $(DESTDIR)$(UDEVRULESDIR)
-+	$(INSTALL) -m 644 $(srcdir)/99-vmware-scsi-udev.rules $(DESTDIR)$(UDEVRULESDIR)
- 
diff --git a/app-emulation/open-vm-tools/open-vm-tools-11.0.1-r1.ebuild b/app-emulation/open-vm-tools/open-vm-tools-11.0.1-r1.ebuild
deleted file mode 100644
index 3fb3beb6d1d3..000000000000
--- a/app-emulation/open-vm-tools/open-vm-tools-11.0.1-r1.ebuild
+++ /dev/null
@@ -1,142 +0,0 @@
-# Copyright 2007-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools linux-info pam systemd toolchain-funcs
-
-DESCRIPTION="Opensourced tools for VMware guests"
-HOMEPAGE="https://github.com/vmware/open-vm-tools"
-MY_P="${P}-14773994"
-SRC_URI="https://github.com/vmware/open-vm-tools/releases/download/stable-${PV}/${MY_P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="X +deploypkg +dnet doc +fuse gtkmm +icu multimon pam +resolutionkms +ssl static-libs +vgauth"
-REQUIRED_USE="
-	multimon? ( X )
-	vgauth? ( ssl )
-"
-
-RDEPEND="
-	dev-libs/glib
-	net-libs/libtirpc
-	deploypkg? ( dev-libs/libmspack )
-	fuse? ( sys-fs/fuse:0 )
-	pam? ( sys-libs/pam )
-	ssl? ( dev-libs/openssl:0 )
-	vgauth? (
-		dev-libs/libxml2
-		dev-libs/xmlsec
-	)
-	X? (
-		x11-libs/libXext
-		multimon? ( x11-libs/libXinerama )
-		x11-libs/libXi
-		x11-libs/libXrender
-		x11-libs/libXrandr
-		x11-libs/libXtst
-		x11-libs/libSM
-		x11-libs/libXcomposite
-		x11-libs/gdk-pixbuf:2
-		x11-libs/gtk+:3
-		gtkmm? (
-			dev-cpp/gtkmm:3.0
-			dev-libs/libsigc++:2
-		)
-	)
-	dnet? ( dev-libs/libdnet )
-	icu? ( dev-libs/icu:= )
-	resolutionkms? (
-		x11-libs/libdrm[video_cards_vmware]
-		virtual/libudev
-	)
-"
-
-DEPEND="${RDEPEND}
-	net-libs/rpcsvc-proto
-"
-
-BDEPEND="
-	dev-util/glib-utils
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}/10.1.0-mount.vmhgfs.patch"
-	"${FILESDIR}/10.1.0-Werror.patch"
-	"${FILESDIR}/11.0.1-udev-complaints.patch"
-)
-
-pkg_setup() {
-	local CONFIG_CHECK="~VMWARE_BALLOON ~VMWARE_PVSCSI ~VMXNET3"
-	use X && CONFIG_CHECK+=" ~DRM_VMWGFX"
-	kernel_is -lt 3 9 || CONFIG_CHECK+=" ~VMWARE_VMCI ~VMWARE_VMCI_VSOCKETS"
-	kernel_is -lt 3 || CONFIG_CHECK+=" ~FUSE_FS"
-	linux-info_pkg_setup
-}
-
-src_prepare() {
-	eapply -p2 "${PATCHES[@]}"
-	eapply_user
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		--without-root-privileges
-		$(use_enable multimon)
-		$(use_with X x)
-		$(use_with X gtk3)
-		$(use_with gtkmm gtkmm3)
-		$(use_enable doc docs)
-		--disable-tests
-		$(use_enable resolutionkms)
-		$(use_enable static-libs static)
-		$(use_enable deploypkg)
-		$(use_with pam)
-		$(use_enable vgauth)
-		$(use_with dnet)
-		$(use_with icu)
-	)
-	# Avoid a bug in configure.ac
-	use ssl || myeconfargs+=( --without-ssl )
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	find "${ED}" -name '*.la' -delete || die
-
-	if use pam; then
-		rm "${ED}"/etc/pam.d/vmtoolsd || die
-		pamd_mimic_system vmtoolsd auth account
-	fi
-
-	newinitd "${FILESDIR}/open-vm-tools.initd" vmware-tools
-	newconfd "${FILESDIR}/open-vm-tools.confd" vmware-tools
-
-	if use vgauth; then
-		systemd_newunit "${FILESDIR}"/vmtoolsd.vgauth.service vmtoolsd.service
-		systemd_dounit "${FILESDIR}"/vgauthd.service
-	else
-		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
-
-	if use X; then
-		fperms 4711 /usr/bin/vmware-user-suid-wrapper
-		dobin scripts/common/vmware-xdg-detect-de
-	fi
-}
diff --git a/app-emulation/open-vm-tools/open-vm-tools-11.1.0.ebuild b/app-emulation/open-vm-tools/open-vm-tools-11.2.0_p16938113.ebuild
index b9f5c70c0417..b710d1bb40cd 100644
--- a/app-emulation/open-vm-tools/open-vm-tools-11.1.0.ebuild
+++ b/app-emulation/open-vm-tools/open-vm-tools-11.2.0_p16938113.ebuild
@@ -7,8 +7,8 @@ inherit autotools linux-info pam systemd toolchain-funcs
 
 DESCRIPTION="Opensourced tools for VMware guests"
 HOMEPAGE="https://github.com/vmware/open-vm-tools"
-MY_P="${P}-16036546"
-SRC_URI="https://github.com/vmware/open-vm-tools/releases/download/stable-${PV}/${MY_P}.tar.gz"
+MY_P="${PN}-${PV/_p/-}"
+SRC_URI="https://github.com/vmware/open-vm-tools/releases/download/stable-${PV%_p*}/${MY_P}.tar.gz"
 
 LICENSE="LGPL-2.1"
 SLOT="0"