gentoo resync : 16.02.1018

7 files changed, 1 insertions, 554 deletions

diff --git a/app-emulation/open-vm-tools/Manifest b/app-emulation/open-vm-tools/Manifest
index 53cbbb80f50d..aaa403c1c9c8 100644
--- a/app-emulation/open-vm-tools/Manifest
+++ b/app-emulation/open-vm-tools/Manifest
@@ -1,19 +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 10.1.0-vgauth.patch 803 BLAKE2B 67402d20388a53cf95a43b43373546a1278fd5002f012e79c29563d4b792bffc3448ab8f346bdf86f2fa5d923919610b4c4c160e0526fdb4aca77b964cf321a6 SHA512 95b4ee3b24eb656241fa7a303429727cf5254df3a78756ff865fba6a9643a6e401c8b4fbfc014e81792a89ecab895006d42f5930e33c23fb3c381cbaf7bbd7a3
-AUX 10.2.5-libtirpc.patch 1673 BLAKE2B 2fdaddcfd7447d8345addcc59f154edfa291a2e2cf4f47badcc54cd7c1acd9403c386409d04aaf69698196603a73774000603b5c56f0c589f033e0e430a9f0b7 SHA512 81dbb13da2901eb558c5c7d40589cc36306b529a2a5b34f3c4eebd5f07b9ab5993a72cbb6a89737c22271c7c9f543ecc8dec19968084958475e962a6f14447d2
 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-10.1.10-6082533.tar.gz 5111726 BLAKE2B 22e2e901c542ae14b7537bc26ff848359f30bde6824a16968b70070dd6e57c92fbf76dca0d02e35ef45bda257725e207632b0602a4336bd2d9c97d10fb094967 SHA512 60c52a24509cb0630f2ad649fe6717fefff624fc2a5c736ced35cbdb8f639264d482e063e8140eedb39216adfb1231d58232bfef0233ebc477ba4f9a732c5965
-DIST open-vm-tools-10.1.15-6677369.tar.gz 5153995 BLAKE2B 03c6b359df8f42f1ba65331dcac67e8ce86b0fce9a572c1665d3f385cae14f1757611d3948d30bb5b2e40bb2b4673bb244c45f56098faf09d6de515bb937ea3f SHA512 fe3699a7f704bdadc4c274c963d177f4700067e7436074554b7cf113ffa341ad0e4753016214f947418fd5a7cb4a6f2c0342acf074b6b414b3fd18fd2ea2bc58
-DIST open-vm-tools-10.2.5-8068406.tar.gz 4818035 BLAKE2B 87e3edc42afceaf9efe69ae8cbd1abfbbf959fe09a721dbe4737ca30c6b57dcf1d8bff23bb3ed3d2236c31e7f3e6fd4d10a689b40b3b725eb580609a68bb7090 SHA512 da2f26b4b22e195af111cc16d5819aeb963f0dfa18b5d2677d897549836ec8679808315646f7f86ae36862df9e623bbcb5d553dae97a68b3ef928a5c07ea2e68
 DIST open-vm-tools-10.3.5-10430147.tar.gz 4623854 BLAKE2B a2bc0ed099cd713820aea17f01131fb4ffcdefedc04b2edb217b4a96c6c9a4007f8ecc80c40445580abffaf3fb0f67be3ca9f3df7a55d368109a53da91e0db77 SHA512 2f2b3d9a8d39b01904cf845936b51a468ba61a29ca64635f842451ca9fd90bf5a770967e4c332319327c6f920ac4fb06d304e185c18ab8898aeb4fcd491a4a1f
-EBUILD open-vm-tools-10.1.10.ebuild 3412 BLAKE2B 230f0c96a19168f8097772f2b962829b430732c025c091f0c5a2b5deb22a8dd038036b3482d7347aadab490c2335cd56a6279e2380bab925b456a5af0278281d SHA512 20d56ddb09464c77792febabe57db66a33d1c6f81e22a8b6f7b6e4c4d0ca6f58b1646bc155d1fb77a96774e023f321a74af0bb5b2f8aa08d3f50459f2f041ce5
-EBUILD open-vm-tools-10.1.15.ebuild 3597 BLAKE2B 93ceaf85d62b4049e7b1ba68ff52b0d6ffc47dbb4d4e143368f64c3be3ef1d3154801e4451da74949c50df0f3bd489c6cdfc3d7e3ec51633ce72397375aacabd SHA512 ff5467262b1bffd67a8806bd922ffa955688b9ad642707de8920e74bddf94d013e170a82d92d2f9eb95550db9f2dd4d7ba19442f2cfd2ba85d87f67345d7ee00
-EBUILD open-vm-tools-10.2.5.ebuild 3952 BLAKE2B 23c4c618eceba910f901da93e647a744b4c3025f4914782185731e96540e7a2b134b2828fada90cfc08e5b031f37b983b8de2b6c5727ded68c7826809702dc41 SHA512 2ffd16170f6ec537185b1cb31254e459b671252baa811c7488e863e842c0925d147da58836b25989687beabc589dba07a69914bec93f00ce0fd4ea150da77f1e
 EBUILD open-vm-tools-10.3.5.ebuild 3333 BLAKE2B 8d22fa3fbc5e059d6e9ad11ec8ce2df51a00e69ff30415a2282655cfb9fcbd1da2918431b9eef6553d50e359482b54d6367b6a39737a2ff9df654b2beef89018 SHA512 148f1277d0aba2c2d26b9a8af8d165566b237425866ab884c453ad76f984e30a9b8b22889a128f82f68da03ddd0c7f2c70eec50949e87fe158471b82014dffe7
-MISC metadata.xml 1572 BLAKE2B 3242a50ca7fb3fbf9bf166070d8c6d2734c52edd1983bc2992c4a329031f0fc21bdb522c46c1dce5e6e3a7682fe8706c0da5784ba168f1e4bf5a110cbf5a208e SHA512 e75e73b412df8f3a04ba5805888d09d6455ee7a5244ce0fc4ff794ddfaadf96deadc935312c66a7b1ec7e1e2b89246c4319e0a353b2413efdf29a8794d6ff153
+MISC metadata.xml 1279 BLAKE2B a684605896b5902fd97d03801a9306ba6780e31ff0bcbb10e929815090eb458225a80c4a38634ae0e60a481e15dc5e4e3e0592191ddbda926a6aa34361c37b14 SHA512 a7ada3809edd7ae8c5348afad28651babc6107919630545996e31018e993b9ae396e0242f14ee2de087874f10543d49377e0167ca037c3dfe40796ed356bd787
diff --git a/app-emulation/open-vm-tools/files/10.1.0-vgauth.patch b/app-emulation/open-vm-tools/files/10.1.0-vgauth.patch
deleted file mode 100644
index bc91b1b141ab..000000000000
--- a/app-emulation/open-vm-tools/files/10.1.0-vgauth.patch
+++ /dev/null
@@ -1,25 +0,0 @@
-From 488258effa60e293a70000338422c33ce5c73f9b Mon Sep 17 00:00:00 2001
-From: Mike Gilbert <floppym@gentoo.org>
-Date: Fri, 25 Nov 2016 13:59:34 -0500
-Subject: [PATCH] build: Always link VGAuthService using CXX
-
----
- open-vm-tools/vgauth/service/Makefile.am | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/open-vm-tools/vgauth/service/Makefile.am b/open-vm-tools/vgauth/service/Makefile.am
-index 8c51d9f2..8f99dad1 100644
---- a/open-vm-tools/vgauth/service/Makefile.am
-+++ b/open-vm-tools/vgauth/service/Makefile.am
-@@ -95,7 +95,7 @@ if HAVE_ICU
-                             $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
-                             $(LDFLAGS) -o $@
- else
--   VGAuthService_LINK = $(LINK)
-+   VGAuthService_LINK = $(CXXLINK)
- endif
- 
- # Message catalogs.
--- 
-2.11.0.rc2
-
diff --git a/app-emulation/open-vm-tools/files/10.2.5-libtirpc.patch b/app-emulation/open-vm-tools/files/10.2.5-libtirpc.patch
deleted file mode 100644
index a9dfb42b2fc4..000000000000
--- a/app-emulation/open-vm-tools/files/10.2.5-libtirpc.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 75505fed193fc3779560b57c1b0d6d4209b05bf9 Mon Sep 17 00:00:00 2001
-From: Xiami <i@f2light.com>
-Date: Thu, 14 Jun 2018 16:23:00 +0800
-Subject: [PATCH] lib/dynxdr: for libtirpc
-
-glibc-2.26 do not provide RPC support by default.
-This workaround only works for Gentoo as ebuild forces libtirpc.
----
- open-vm-tools/lib/dynxdr/dynxdr.c | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
-diff --git a/open-vm-tools/lib/dynxdr/dynxdr.c b/open-vm-tools/lib/dynxdr/dynxdr.c
-index 95fdc7e2..d3182733 100644
---- a/open-vm-tools/lib/dynxdr/dynxdr.c
-+++ b/open-vm-tools/lib/dynxdr/dynxdr.c
-@@ -55,7 +55,7 @@ typedef struct DynXdrData {
-  * Mac OS X, FreeBSD and Solaris don't take a const parameter to the
-  * "x_getpostn" function.
-  */
--#if defined(__APPLE__) || defined(__FreeBSD__) || defined(sun)
-+#if defined(__APPLE__) || defined(__FreeBSD__) || defined(sun) || defined(_TIRPC_XDR_H)
- #  define DYNXDR_GETPOS_CONST
- #else
- #  define DYNXDR_GETPOS_CONST const
-@@ -172,7 +172,7 @@ DynXdrSetPos(XDR *xdrs, // IN
- }
- 
- 
--#if defined(__GLIBC__) || (defined(sun) && (defined(_LP64) || defined(_KERNEL)))
-+#if (defined(__GLIBC__) && !defined(_TIRPC_XDR_H)) || (defined(sun) && (defined(_LP64) || defined(_KERNEL)))
- /*
-  *-----------------------------------------------------------------------------
-  *
-@@ -322,7 +322,7 @@ DynXdr_Create(XDR *in)  // IN
-       DynXdrSetPos,     /* x_setpostn */
-       DynXdrInline,     /* x_inline */
-       NULL,             /* x_destroy */
--#if defined(__GLIBC__)
-+#if defined(__GLIBC__) && !defined(_TIRPC_XDR_H)
-       NULL,             /* x_getint32 */
-       DynXdrPutInt32,   /* x_putint32 */
- #elif defined(__APPLE__)
--- 
-2.16.4
-
diff --git a/app-emulation/open-vm-tools/metadata.xml b/app-emulation/open-vm-tools/metadata.xml
index 9e8e61bb812a..fffabeca19bc 100644
--- a/app-emulation/open-vm-tools/metadata.xml
+++ b/app-emulation/open-vm-tools/metadata.xml
@@ -16,7 +16,6 @@
 		of virtual machines.
 	</longdescription>
 	<use>
-		<flag name="caf">Build Common Agent Framework</flag>
 		<flag name="deploypkg">Build deploypkg plugin</flag>
 		<flag name="dnet">Enable support for nicinfo</flag>
 		<flag name="doc">Generate API documentation</flag>
@@ -24,11 +23,8 @@
 		<flag name="grabbitmqproxy">Build grabbitmqproxy plugin</flag>
 		<flag name="gtkmm">Compile with Gtkmm and sigc++ (Recommended)</flag>
 		<flag name="multimon">Enable multimon (Requires X)</flag>
-		<flag name="pic">Force shared libraries to be built as PIC</flag>
 		<flag name="resolutionkms">Build the linux/unix resolutionkms module</flag>
 		<flag name="vgauth">Build vgauth</flag>
-		<flag name="xml-security-c">Build vgauth with xml-security-c instead of xmlsec1</flag>
-		<flag name="xmlsec">Build vgauth with xmlsec1 instead of xml-security-c</flag>
 	</use>
 	<upstream>
 		<remote-id type="github">vmware/open-vm-tools</remote-id>
diff --git a/app-emulation/open-vm-tools/open-vm-tools-10.1.10.ebuild b/app-emulation/open-vm-tools/open-vm-tools-10.1.10.ebuild
deleted file mode 100644
index 5ba66d7b94fd..000000000000
--- a/app-emulation/open-vm-tools/open-vm-tools-10.1.10.ebuild
+++ /dev/null
@@ -1,152 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-MODULES_OPTIONAL_USE="modules"
-
-inherit autotools linux-mod pam systemd toolchain-funcs user
-
-DESCRIPTION="Opensourced tools for VMware guests"
-HOMEPAGE="https://github.com/vmware/open-vm-tools"
-MY_P="${P}-6082533"
-SRC_URI="https://github.com/vmware/open-vm-tools/releases/download/stable-${PV}/${MY_P}.tar.gz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="X doc grabbitmqproxy icu pam +pic vgauth xinerama"
-
-COMMON_DEPEND="
-	dev-libs/glib:2
-	dev-libs/libdnet
-	sys-fs/fuse:0
-	>=sys-process/procps-3.3.2
-	grabbitmqproxy? ( dev-libs/openssl:0 )
-	icu? ( dev-libs/icu:= )
-	pam? ( virtual/pam )
-	vgauth? (
-		dev-libs/openssl:0
-		dev-libs/xerces-c
-		dev-libs/xml-security-c
-	)
-	X? (
-		dev-cpp/gtkmm:3.0
-		x11-libs/gtk+:3
-		x11-libs/libICE
-		x11-libs/libSM
-		x11-libs/libX11
-		x11-libs/libXcomposite
-		x11-libs/libXext
-		x11-libs/libXi
-		x11-libs/libXrender
-		x11-libs/libXrandr
-		x11-libs/libXtst
-		xinerama? ( x11-libs/libXinerama )
-	)
-"
-
-DEPEND="${COMMON_DEPEND}
-	doc? ( app-doc/doxygen )
-	virtual/pkgconfig
-"
-
-RDEPEND="${COMMON_DEPEND}
-"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}/10.1.0-mount.vmhgfs.patch"
-	"${FILESDIR}/10.1.0-vgauth.patch"
-	"${FILESDIR}/10.1.0-Werror.patch"
-)
-
-pkg_setup() {
-	linux-info_get_any_version
-	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"
-	if use modules; then
-		linux-mod_pkg_setup
-	else
-		linux-info_pkg_setup
-	fi
-}
-
-src_prepare() {
-	eapply -p2 "${PATCHES[@]}"
-	eapply_user
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		--disable-deploypkg
-		--disable-static
-		--disable-tests
-		--with-procps
-		--with-dnet
-		$(use_enable doc docs)
-		$(use_enable grabbitmqproxy)
-		$(use_enable vgauth)
-		$(use_enable xinerama multimon)
-		$(use_with icu)
-		$(use_with pam)
-		$(use_with pic)
-		--without-gtk2
-		--without-gtkmm
-		$(use_with X gtk3)
-		$(use_with X gtkmm3)
-		$(use_with X x)
-
-		# configure locates the kernel object directory by looking for
-		# "/lib/modules/${KERNEL_RELEASE}/build".
-		# This will fail if the user is building against an uninstalled kernel.
-		# Fixing this would mean reworking the build system.
-		$(use_with modules kernel-modules)
-		--without-root-privileges
-		--with-kernel-release="${KV_FULL}"
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	use modules && set_arch_to_kernel
-	default
-}
-
-src_install() {
-	default
-	prune_libtool_files --modules
-
-	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
-	systemd_dounit "${FILESDIR}"/vmtoolsd.service
-
-	# 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
-
-		elog "To be able to use the drag'n'drop feature of VMware for file"
-		elog "exchange, please add the users to the 'vmware' group."
-	fi
-}
-
-pkg_postinst() {
-	enewgroup vmware
-	linux-mod_pkg_postinst
-}
diff --git a/app-emulation/open-vm-tools/open-vm-tools-10.1.15.ebuild b/app-emulation/open-vm-tools/open-vm-tools-10.1.15.ebuild
deleted file mode 100644
index 3829a224743b..000000000000
--- a/app-emulation/open-vm-tools/open-vm-tools-10.1.15.ebuild
+++ /dev/null
@@ -1,156 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-MODULES_OPTIONAL_USE="modules"
-
-inherit autotools flag-o-matic linux-mod pam systemd toolchain-funcs user
-
-DESCRIPTION="Opensourced tools for VMware guests"
-HOMEPAGE="https://github.com/vmware/open-vm-tools"
-MY_P="${P}-6677369"
-SRC_URI="https://github.com/vmware/open-vm-tools/releases/download/stable-${PV}/${MY_P}.tar.gz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="X doc grabbitmqproxy icu pam +pic vgauth xinerama"
-
-COMMON_DEPEND="
-	dev-libs/glib:2
-	dev-libs/libdnet
-	net-libs/libtirpc:0=
-	sys-fs/fuse:0
-	>=sys-process/procps-3.3.2
-	grabbitmqproxy? ( dev-libs/openssl:0 )
-	icu? ( dev-libs/icu:= )
-	pam? ( virtual/pam )
-	vgauth? (
-		dev-libs/openssl:0
-		dev-libs/xerces-c
-		dev-libs/xml-security-c
-	)
-	X? (
-		dev-cpp/gtkmm:3.0
-		x11-libs/gtk+:3
-		x11-libs/libICE
-		x11-libs/libSM
-		x11-libs/libX11
-		x11-libs/libXcomposite
-		x11-libs/libXext
-		x11-libs/libXi
-		x11-libs/libXrender
-		x11-libs/libXrandr
-		x11-libs/libXtst
-		xinerama? ( x11-libs/libXinerama )
-	)
-"
-
-DEPEND="${COMMON_DEPEND}
-	doc? ( app-doc/doxygen )
-	net-libs/rpcsvc-proto
-	virtual/pkgconfig
-"
-
-RDEPEND="${COMMON_DEPEND}
-"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}/10.1.0-mount.vmhgfs.patch"
-	"${FILESDIR}/10.1.0-vgauth.patch"
-	"${FILESDIR}/10.1.0-Werror.patch"
-)
-
-pkg_setup() {
-	linux-info_get_any_version
-	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"
-	if use modules; then
-		linux-mod_pkg_setup
-	else
-		linux-info_pkg_setup
-	fi
-}
-
-src_prepare() {
-	eapply -p2 "${PATCHES[@]}"
-	eapply_user
-	eautoreconf
-}
-
-src_configure() {
-	append-cppflags "$($(tc-getPKG_CONFIG) --cflags libtirpc)"
-	export LIBVMTOOLS_LIBADD="$($(tc-getPKG_CONFIG) --libs libtirpc)"
-	local myeconfargs=(
-		--disable-deploypkg
-		--disable-static
-		--disable-tests
-		--with-procps
-		--with-dnet
-		$(use_enable doc docs)
-		$(use_enable grabbitmqproxy)
-		$(use_enable vgauth)
-		$(use_enable xinerama multimon)
-		$(use_with icu)
-		$(use_with pam)
-		$(use_with pic)
-		--without-gtk2
-		--without-gtkmm
-		$(use_with X gtk3)
-		$(use_with X gtkmm3)
-		$(use_with X x)
-
-		# configure locates the kernel object directory by looking for
-		# "/lib/modules/${KERNEL_RELEASE}/build".
-		# This will fail if the user is building against an uninstalled kernel.
-		# Fixing this would mean reworking the build system.
-		$(use_with modules kernel-modules)
-		--without-root-privileges
-		--with-kernel-release="${KV_FULL}"
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	use modules && set_arch_to_kernel
-	default
-}
-
-src_install() {
-	default
-	prune_libtool_files --modules
-
-	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
-	systemd_dounit "${FILESDIR}"/vmtoolsd.service
-
-	# 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
-
-		elog "To be able to use the drag'n'drop feature of VMware for file"
-		elog "exchange, please add the users to the 'vmware' group."
-	fi
-}
-
-pkg_postinst() {
-	enewgroup vmware
-	linux-mod_pkg_postinst
-}
diff --git a/app-emulation/open-vm-tools/open-vm-tools-10.2.5.ebuild b/app-emulation/open-vm-tools/open-vm-tools-10.2.5.ebuild
deleted file mode 100644
index bddd12cadf29..000000000000
--- a/app-emulation/open-vm-tools/open-vm-tools-10.2.5.ebuild
+++ /dev/null
@@ -1,163 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools flag-o-matic linux-info pam systemd toolchain-funcs user
-
-DESCRIPTION="Opensourced tools for VMware guests"
-HOMEPAGE="https://github.com/vmware/open-vm-tools"
-MY_P="${P}-8068406"
-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 caf +deploypkg +dnet doc +fuse +grabbitmqproxy gtkmm +icu multimon pam +resolutionkms +ssl static-libs test +vgauth +xml-security-c xmlsec"
-REQUIRED_USE="
-	multimon? ( X )
-	vgauth? (
-		^^ ( xmlsec xml-security-c )
-		ssl
-	)
-	caf? ( vgauth ssl )
-	grabbitmqproxy? ( ssl )
-"
-
-RDEPEND="
-	dev-libs/glib
-	net-libs/libtirpc
-	deploypkg? ( dev-libs/libmspack )
-	fuse? ( sys-fs/fuse:0 )
-	pam? ( virtual/pam )
-	ssl? ( dev-libs/openssl:0 )
-	vgauth? (
-		xml-security-c? ( dev-libs/xerces-c dev-libs/xml-security-c )
-		xmlsec? ( 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:= )
-	caf? (
-		dev-libs/log4cpp
-		net-libs/rabbitmq-c
-	)
-	resolutionkms? (
-		x11-libs/libdrm[video_cards_vmware]
-		virtual/libudev
-	)
-"
-
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	net-libs/rpcsvc-proto
-	doc? ( app-doc/doxygen )
-	test? ( dev-util/cunit )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}/10.1.0-mount.vmhgfs.patch"
-	"${FILESDIR}/10.1.0-Werror.patch"
-	"${FILESDIR}/10.2.5-libtirpc.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() {
-	# On >=sys-libs/glibc-2.26, SunRPC no longer provided
-	# Use libtirpc and rpcsvc-proto instead
-	append-cppflags "$($(tc-getPKG_CONFIG) --cflags libtirpc)"
-	export LIBVMTOOLS_LIBADD="$($(tc-getPKG_CONFIG) --libs libtirpc)"
-	local myeconfargs=(
-		--without-root-privileges
-		$(use_enable multimon)
-		$(use_with X x)
-		$(use_with X gtk3)
-		$(use_with gtkmm gtkmm3)
-		$(use_enable doc docs)
-		$(use_enable test tests)
-		$(use_enable resolutionkms)
-		$(use_enable static-libs static)
-		$(use_enable deploypkg)
-		$(use_enable grabbitmqproxy)
-		$(use_with pam)
-		$(use_enable vgauth)
-		$(use vgauth && use_enable xmlsec xmlsec1)
-		$(use vgauth && use_enable xml-security-c xmlsecurity)
-		$(use_enable caf)
-		$(use_with dnet)
-		$(use_with icu)
-	)
-	# Avoid a bug in configure.ac
-	use ssl || myeconfargs+=( --without-ssl )
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	find "${D}" -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
-
-		elog "To be able to use the drag'n'drop feature of VMware for file"
-		elog "exchange, please add the users to the 'vmware' group."
-	fi
-}
-
-pkg_postinst() {
-	enewgroup vmware
-}