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

(Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 0BBEEA1FEA4843A4)

3 files changed, 37 insertions, 136 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/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"