Depend on sys-fs/fuse unconditionally, bug 500002.

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0x0BBEEA1FEA4843A4

4 files changed, 42 insertions, 143 deletions

diff --git a/app-emulation/open-vm-tools/ChangeLog b/app-emulation/open-vm-tools/ChangeLog
index 74b35b7e8153..e54861c6aaa6 100644
--- a/app-emulation/open-vm-tools/ChangeLog
+++ b/app-emulation/open-vm-tools/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for app-emulation/open-vm-tools
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/open-vm-tools/ChangeLog,v 1.81 2014/02/01 21:15:05 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/open-vm-tools/ChangeLog,v 1.82 2014/02/02 15:47:56 floppym Exp $
+
+*open-vm-tools-2013.09.16.1328054-r3 (02 Feb 2014)
+
+  02 Feb 2014; Mike Gilbert <floppym@gentoo.org>
+  +open-vm-tools-2013.09.16.1328054-r3.ebuild,
+  -open-vm-tools-2013.04.16.1098359-r1.ebuild,
+  -open-vm-tools-2013.09.16.1328054-r1.ebuild:
+  Depend on sys-fs/fuse unconditionally, bug 500002.
 
   01 Feb 2014; Mike Gilbert <floppym@gentoo.org>
   open-vm-tools-2013.09.16.1328054-r2.ebuild:
diff --git a/app-emulation/open-vm-tools/Manifest b/app-emulation/open-vm-tools/Manifest
index 9d97ac7fa099..8d0f21a0c74a 100644
--- a/app-emulation/open-vm-tools/Manifest
+++ b/app-emulation/open-vm-tools/Manifest
@@ -6,19 +6,17 @@ AUX open-vm-tools.confd 88 SHA256 180a2b6d9d18af319b79b2ca6ebf1020b63e5ebf2f601a
 AUX open-vm-tools.desktop 140 SHA256 86363f5430d33afb2f9fcb004ca86813f14434f56986e427e296bd530724eeb0 SHA512 19472f03c9a14dd43a720cb9d6813d09534883236d55934577b2a2387c46a101ee02cf29ce784cd0b7c095af1f8267fa522646eba98a6026a0319c1ea19eaf5e WHIRLPOOL 17c57ee861da58986d868f493ab1979d3ebf5c9257dea2e09767c8dffb1be1ed40fc5423e378972fa719b7077af119cd5136903d08d661969737afd38b3e4e18
 AUX open-vm-tools.initd 1353 SHA256 6f42e73919981a00791cda6babfb30335c30ab539d536bb0e5813a467dded169 SHA512 cce7c02f4e93a1c60b8082347fe97252ba2d029640613604ac71aacab14c446a51659888a3837a78aaccc6be0d0b7f77ee3f583a2c65201504af802fb9578c83 WHIRLPOOL 52fa9432ab88cc2e5a6662b8aa5bb954aee76ec4b135d7f40781d7e6da782641ee43e099b0a65dff81eebf9e86c51116c623e54e62b39e6af21238aeef4ae51e
 AUX vmtoolsd.service 251 SHA256 ddc8dff4dc274fa9ba130208a647fe997885f7639e15f66976028df2e268f389 SHA512 912447c338f7875acc9fe420b7bc1430984d27d2cae6168ded14eea28b7516ff0b8fcdfa252aec3ab44c738697ece1a621e996cac18829b5631e28a99b743044 WHIRLPOOL a700241e7a0c2aa3aa1dcedaa07d6df965b99da9e7c5b809b4c9b98757dee74ea13bc9c71d52ddc2fc8e8447a43d07ae82067edb7662b5af575d56ef46db71a6
-DIST open-vm-tools-2013.04.16-1098359.tar.gz 3737845 SHA256 fc939de4133d66c0cced8d0a7b5d87edcad3f598393b71c341e66bfec5087960 SHA512 682c25e315e3108617fd4d419f5bba8bf45f4966f13fa60944650390f63af2a7e4fcf740052106693403fcc2ec6f8b126e9911cbba044fc227f0c663e19f68e0 WHIRLPOOL eb13974f1e0a837617fad8c49f45e73570b343071c0619cc8408b5b9812e135cd9eafffc35a761740a58875c3e5583c625300398346d5863a2fa468044f6dd5f
 DIST open-vm-tools-2013.09.16-1328054.tar.gz 3793719 SHA256 470a6ea3ce14c2c5ea6b7bc59745eccbacc8d88a3f343e712312786435975d13 SHA512 7ae62d5411b4bdefd0e8db5f0a81bb357bfd4a624af06bf9a5a74f49ede0b7051b41dfe548c758fd7e73cded34af983c8aa0c412e65343092e05ae9b997895cb WHIRLPOOL 688fb4e494fb7aab7d0eb09189afff95ec8727bcc1893a4ec632bb8198661a1a55d58a813d2d56a3ac330fd7a55afc1fa7dc11f1d60c06c91ecf6a0bf866b249
 DIST open-vm-tools-9.4.0-1280544.tar.gz 3659504 SHA256 5d30652eb0f6dc5e930781029c184837e700be5543b6a7116db4c62a6f3ca399 SHA512 07b36f49713140606f74864b59c2e01c9ed83a960dd3f5d172b84fc75e760f7370065774a0e26897924af60454c86b682ca0fd32276b0e9fb17b268247f8cbdf WHIRLPOOL 88533768cf718de3b5f64e688597209fa2029d02cdf350d7fd05ec8dd8ca0f0c125a8d1445c1ec9287bc486076d5c335f3cc615c3f0b9aa7bac84e921da4c9e6
-EBUILD open-vm-tools-2013.04.16.1098359-r1.ebuild 3026 SHA256 8908d0a99469f226c16a2f84994a84ed9540ae9324a49c2c5bf534d5b21263a6 SHA512 8ff4c2aeef4d7434ef75ede2624db9f94ee21aa7380597ec0b2549bf933b6bd946ae7db734c94852d7c55485c702cbfad7cd0eaa8711c50a61530f49ecb91550 WHIRLPOOL 619d7fb9ec22cba6c7c30edb2fb9b58043da3c51f394fe609dbbe229b22c0621cda9bc531057f7fe7f215d887cfe4bc465746e3c153d74266b2cd9b54ede0719
-EBUILD open-vm-tools-2013.09.16.1328054-r1.ebuild 3028 SHA256 a871b64548432cf5658817a1329944f7bbbc2e966d8ab947243b485ad2995e56 SHA512 ec952c68559e1f0c44e01e25029e63dc3ab1af08c6cd17593b28e71177f1a0e64bbdc41305c97cbb77039ea8b7b87e98b00b14b882eb6b8eee4ffaa2d81a356f WHIRLPOOL 43be4560ccf0cb1a174a28dc33af0a986358184e4bfdb475dbd650753c03252725a14d2ae8392c8e95510c15fdf01ce074af2bec608537efc364fe1d625800f2
 EBUILD open-vm-tools-2013.09.16.1328054-r2.ebuild 3145 SHA256 fc4dba5684fd6a784a231a5a1c996de68aded4f7c31af0f22bc7edd946d07ca2 SHA512 ac782cc3c0c5302f154d4e3c14ecb749294f34b8a386d1388c9d9e5cc3a997304ae32f12310f44c90a9a8c6138daa4748d222373feae86c7494295650191d6af WHIRLPOOL 52472bac48dc6b26ed58dd7c12323547328f227b74f4a6bfb9928a207c9cd9e23eb5e4718e921f2e83ecd0ca4b28af5d56d429665ec7b54a7fdba461b224a21e
+EBUILD open-vm-tools-2013.09.16.1328054-r3.ebuild 3129 SHA256 dd870327e1ae58a42493f4c85aa3c86c73209e1bd1029f7026bc2e096f621e43 SHA512 749bb4a957b8b240d9f44875d3c4561369ee054b50d7b5d12122faee574434be061861001d7420c150dc6a5fc781bf8b5f387333e50d0de015b804c04ec0f431 WHIRLPOOL 7e32079e18f4ccfbfb63273289d485cb8099091e8da9d20444ccac06139384bbbe3d7d7a99acfd760a3cfb7d3564b609c6ff00fe99bafd2c6a55616688595daa
 EBUILD open-vm-tools-9.4.0.1280544.ebuild 3020 SHA256 99ea08ac3f50072192dad4b4988237a97ac34c8b811765b1ecc42002cca298fc SHA512 a771cad78b76572e238731c857e02248659f1d5ab9240269fe3a5f604c6c03ad60f1de47ef54b620ff5c4cc44effe70493b663d7c6296ecbe905aab47d7e41bd WHIRLPOOL cd7914da23a8531832480cd079eace0b3c47ef498a8d9d17c75a9756c3ad3599a5ee8e9151011f57dd080358cdad3962c4edfa88059f021151ede80d6a6b2101
-MISC ChangeLog 16928 SHA256 0c91e6282592c62f781d31a1ade5fd3ed541ee3abd15aaaa5bf5a047e743ed1c SHA512 16fd4fc6116cd366b55442a41a1e658f6ead5829fa7cecfb7912e70740e005d9272f9ed22a6ffa1219e62d454eae05a1ddd56860e77f21d9b6bf418dd3e0840d WHIRLPOOL d6662e8b857a5b84f1b9ccc57728f2cea535f399c7d22d3e7d5257d7e420b3012c6491a840280ebe7099c9221412080ca4ee757982cfa166fef6e4cd0560a26f
+MISC ChangeLog 17224 SHA256 96767a73c752aa1cee562fabd4b56c553db10a1f7d8f862f3f50ee961b20dd35 SHA512 5ebf3c0395a01f81555de742d6ca5920fab9641dd6e86e0e22f157ef0ad3a7a801f1bdd8ac6c3a085b0ba9b5e2fbf449f143f8e3bc33efd136b58ecd72a1cd8f WHIRLPOOL a524bfee6b186d439c53c6f87c596434e02466484a7561328afd080070ff8648f20b0863e2502656a6918d157f691723b1af8b3e92b428c6dd6b3de7dae0a64b
 MISC metadata.xml 673 SHA256 a610f212fae2771e81767592d831773332b9a28d9ab9d435f57f044f8c5f2134 SHA512 e69f6ca6f22b0679f613d7aa9dbc2c6473a2a8773db65257dbe55d11a18a3dfd7946f2c1b2eb491052b718f0135c94d9a638f2d76c794306bb55c4c97cba8ab8 WHIRLPOOL fe76138bec7680264fa1390db0d07711b2d33b2f631e5cd9515021df177f4c20f67a1f6d7ba76ed022f08f6cf1471859c2b98ebb4c99567b078053379897ea3c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iF4EAREIAAYFAlLtY9oACgkQC77qH+pIQ6T9kgD/WrdP0Fw4+KKYiRn7kuvopImN
-yOKuvs3parpP6c5hAgQA/1OZ0fE3dmNde7MqwLH/5/mccGooeFnmG1B4LalSIuvG
-=ZCbz
+iF4EAREIAAYFAlLuaK0ACgkQC77qH+pIQ6SYHgEAoiA6Fsv2MLl+6FiT46YnHEDO
+qFagKwLND2aQ/tvw73sBALR6Dsz4lo8YN+o+of2GbJYQi9HQ0u7HfsRb8Dw59Vqp
+=UxLR
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/open-vm-tools/open-vm-tools-2013.09.16.1328054-r1.ebuild b/app-emulation/open-vm-tools/open-vm-tools-2013.09.16.1328054-r1.ebuild
deleted file mode 100644
index a82cf450f4ad..000000000000
--- a/app-emulation/open-vm-tools/open-vm-tools-2013.09.16.1328054-r1.ebuild
+++ /dev/null
@@ -1,115 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/open-vm-tools/open-vm-tools-2013.09.16.1328054-r1.ebuild,v 1.1 2013/10/31 20:08:41 floppym Exp $
-
-EAPI=5
-
-inherit eutils multilib pam user versionator flag-o-matic systemd toolchain-funcs
-
-MY_PV="$(replace_version_separator 3 '-')"
-MY_P="${PN}-${MY_PV}"
-
-DESCRIPTION="Opensourced tools for VMware guests"
-HOMEPAGE="http://open-vm-tools.sourceforge.net/"
-SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
-
-LICENSE="LGPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="X doc fuse icu +pic xinerama"
-
-RDEPEND="app-emulation/open-vm-tools-kmod
-	dev-libs/glib:2
-	dev-libs/libdnet
-	sys-apps/ethtool
-	sys-process/procps
-	virtual/pam
-	X? (
-		dev-cpp/gtkmm:2.4
-		x11-base/xorg-server
-		x11-drivers/xf86-input-vmmouse
-		x11-drivers/xf86-video-vmware
-		x11-libs/gtk+:2
-		x11-libs/libnotify
-		x11-libs/libX11
-		x11-libs/libXtst
-	)
-	fuse? ( sys-fs/fuse )
-	icu? ( dev-libs/icu:= )
-	xinerama? ( x11-libs/libXinerama )
-	"
-
-DEPEND="${RDEPEND}
-	doc? ( app-doc/doxygen )
-	virtual/pkgconfig
-	virtual/linux-sources
-	sys-apps/findutils
-	"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	enewgroup vmware
-}
-
-src_prepare() {
-	# Do not filter out Werror
-	# Upstream Bug  http://sourceforge.net/tracker/?func=detail&aid=2959749&group_id=204462&atid=989708
-	# sed -i -e 's/CFLAGS=.*Werror/#&/g' configure || die "sed comment out Werror failed"
-	sed -i -e 's:\(TEST_PLUGIN_INSTALLDIR=\).*:\1\$libdir/open-vm-tools/plugins/tests:g' configure || die "sed test_plugin_installdir failed"
-}
-
-src_configure() {
-	# http://bugs.gentoo.org/402279
-	if has_version '>=sys-process/procps-3.3.2'; then
-		export CUSTOM_PROCPS_NAME=procps
-		export CUSTOM_PROCPS_LIBS="$($(tc-getPKG_CONFIG) --libs libprocps)"
-	fi
-
-	econf \
-		--with-procps \
-		--with-dnet \
-		--without-kernel-modules \
-		$(use_enable doc docs) \
-		--docdir=/usr/share/doc/${PF} \
-		$(use_with X x) \
-		$(use_with X gtk2) \
-		$(use_with X gtkmm) \
-		$(use_with icu) \
-		$(use_with pic) \
-		$(use_enable xinerama multimon)
-
-	# Bugs 260878, 326761
-	find ./ -name Makefile | xargs sed -i -e 's/-Werror//g'  || die "sed out Werror failed"
-}
-
-src_install() {
-	default
-
-	rm "${D}"/etc/pam.d/vmtoolsd
-	pamd_mimic_system vmtoolsd auth account
-
-	rm "${D}"/usr/$(get_libdir)/*.la
-	rm "${D}"/usr/$(get_libdir)/open-vm-tools/plugins/common/*.la
-
-	newinitd "${FILESDIR}/open-vm-tools.initd" vmware-tools
-	newconfd "${FILESDIR}/open-vm-tools.confd" vmware-tools
-	systemd_dounit "${FILESDIR}"/vmtoolsd.service
-
-	exeinto /etc/vmware-tools/scripts/vmware/
-	doexe "${FILESDIR}"/network
-
-	if use X;
-	then
-		fperms 4755 "/usr/bin/vmware-user-suid-wrapper"
-
-		dobin "${S}"/scripts/common/vmware-xdg-detect-de
-
-		insinto /etc/xdg/autostart
-		doins "${FILESDIR}/open-vm-tools.desktop"
-
-		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
-	elog "Add 'vmware-tools' service to the default runlevel."
-}
diff --git a/app-emulation/open-vm-tools/open-vm-tools-2013.04.16.1098359-r1.ebuild b/app-emulation/open-vm-tools/open-vm-tools-2013.09.16.1328054-r3.ebuild
index b7eeefe23c88..b789e117b2ce 100644
--- a/app-emulation/open-vm-tools/open-vm-tools-2013.04.16.1098359-r1.ebuild
+++ b/app-emulation/open-vm-tools/open-vm-tools-2013.09.16.1328054-r3.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/open-vm-tools/open-vm-tools-2013.04.16.1098359-r1.ebuild,v 1.1 2013/08/31 06:26:06 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/open-vm-tools/open-vm-tools-2013.09.16.1328054-r3.ebuild,v 1.1 2014/02/02 15:47:56 floppym Exp $
 
 EAPI=5
 
@@ -16,14 +16,14 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
 LICENSE="LGPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="X doc fuse icu +pic xinerama"
+IUSE="X doc icu modules pam +pic xinerama"
 
-RDEPEND="app-emulation/open-vm-tools-kmod
+COMMON_DEPEND="
 	dev-libs/glib:2
 	dev-libs/libdnet
 	sys-apps/ethtool
 	sys-process/procps
-	virtual/pam
+	pam? ( virtual/pam )
 	X? (
 		dev-cpp/gtkmm:2.4
 		x11-base/xorg-server
@@ -34,17 +34,21 @@ RDEPEND="app-emulation/open-vm-tools-kmod
 		x11-libs/libX11
 		x11-libs/libXtst
 	)
-	fuse? ( sys-fs/fuse )
+	sys-fs/fuse
 	icu? ( dev-libs/icu:= )
 	xinerama? ( x11-libs/libXinerama )
-	"
+"
 
-DEPEND="${RDEPEND}
+DEPEND="${COMMON_DEPEND}
 	doc? ( app-doc/doxygen )
 	virtual/pkgconfig
 	virtual/linux-sources
 	sys-apps/findutils
-	"
+"
+
+RDEPEND="${COMMON_DEPEND}
+	modules? ( app-emulation/open-vm-tools-kmod )
+"
 
 S="${WORKDIR}/${MY_P}"
 
@@ -66,18 +70,22 @@ src_configure() {
 		export CUSTOM_PROCPS_LIBS="$($(tc-getPKG_CONFIG) --libs libprocps)"
 	fi
 
-	econf \
-		--with-procps \
-		--with-dnet \
-		--without-kernel-modules \
-		$(use_enable doc docs) \
-		--docdir=/usr/share/doc/${PF} \
-		$(use_with X x) \
-		$(use_with X gtk2) \
-		$(use_with X gtkmm) \
-		$(use_with icu) \
-		$(use_with pic) \
+	local myeconfargs=(
+		--with-procps
+		--with-dnet
+		--without-kernel-modules
+		$(use_enable doc docs)
+		--docdir=/usr/share/doc/${PF}
+		$(use_with X x)
+		$(use_with X gtk2)
+		$(use_with X gtkmm)
+		$(use_with icu)
+		$(use_with pam)
+		$(use_with pic)
 		$(use_enable xinerama multimon)
+	)
+
+	econf "${myeconfargs[@]}"
 
 	# Bugs 260878, 326761
 	find ./ -name Makefile | xargs sed -i -e 's/-Werror//g'  || die "sed out Werror failed"