Make modules and PAM optional, bug 484360.

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

3 files changed, 136 insertions, 6 deletions

diff --git a/app-emulation/open-vm-tools/ChangeLog b/app-emulation/open-vm-tools/ChangeLog
index 1db3add46afe..ee5a4e216ab5 100644
--- a/app-emulation/open-vm-tools/ChangeLog
+++ b/app-emulation/open-vm-tools/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for app-emulation/open-vm-tools
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/open-vm-tools/ChangeLog,v 1.79 2013/10/31 20:08:41 floppym Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/open-vm-tools/ChangeLog,v 1.80 2014/01/19 19:22:52 floppym Exp $
+
+*open-vm-tools-2013.09.16.1328054-r2 (19 Jan 2014)
+
+  19 Jan 2014; Mike Gilbert <floppym@gentoo.org>
+  +open-vm-tools-2013.09.16.1328054-r2.ebuild:
+  Make modules and PAM optional, bug 484360.
 
 *open-vm-tools-2013.09.16.1328054-r1 (31 Oct 2013)
 
diff --git a/app-emulation/open-vm-tools/Manifest b/app-emulation/open-vm-tools/Manifest
index 2fbd5e7b286c..165ff7039612 100644
--- a/app-emulation/open-vm-tools/Manifest
+++ b/app-emulation/open-vm-tools/Manifest
@@ -11,13 +11,14 @@ DIST open-vm-tools-2013.09.16-1328054.tar.gz 3793719 SHA256 470a6ea3ce14c2c5ea6b
 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 3144 SHA256 a0bccafec9103efd4362012682ed85de560a3be5b804a750a45a8a3ca52d9f09 SHA512 49db303685ce71a0574e9cc49ce02c1ef24edce29af5335ce5b39a1805eaea17f00428724868a66d7501c6b7aa9bb1a67ed33bcb44d96dc49bccfa33e06f29ef WHIRLPOOL 25327c2380b219211241b4c1559400761a8597be2f3a1909413003ce8bd64934eb2c0e2f9f05958a5116790df0e35e8e9722042e9600469bce8a26d9e21a7e1a
 EBUILD open-vm-tools-9.4.0.1280544.ebuild 3020 SHA256 99ea08ac3f50072192dad4b4988237a97ac34c8b811765b1ecc42002cca298fc SHA512 a771cad78b76572e238731c857e02248659f1d5ab9240269fe3a5f604c6c03ad60f1de47ef54b620ff5c4cc44effe70493b663d7c6296ecbe905aab47d7e41bd WHIRLPOOL cd7914da23a8531832480cd079eace0b3c47ef498a8d9d17c75a9756c3ad3599a5ee8e9151011f57dd080358cdad3962c4edfa88059f021151ede80d6a6b2101
-MISC ChangeLog 16612 SHA256 2463e666d29b5a9fb92f7fdc7b055c2782ce7fa2c4ede5973852aabb57b48279 SHA512 15f9ff41dfe4b2bd40822dc6d11c466b0bbdfffcbb05dcd8b59f9e21f65004ca79b2328541c94ae6b2fc2ec6ddfde829fdd02173757cc7a4862eda6a3acfc018 WHIRLPOOL 27b4da1a7252a130c77ed75a624f60df33a1687fc263e2e66acc2d247da046295e0efc1fe2f655c3058df25c955c2234f53ee44c0b73a607341d5e99cb29423b
+MISC ChangeLog 16806 SHA256 8353a7a6383d98e8f508148fb340871be7c7079625678a226ad334df9c1acc31 SHA512 35939fa3f7b99f9f0db851e51fff7eb76762a675df97ff0ebdec19b4dd69b5f8a943a92a895050417b59e64722bbd0660ce9e541f7624149f2d0ac920a81ffca WHIRLPOOL fe9f0de786c2c7a6ed7b958bd3e6f4203f3e2c1cb0f9fdb7130ce793aaee21faee00afd498bfd9c7beec2c50ec62be36b4c83aee5cd66fbb63e382f6360a3f88
 MISC metadata.xml 673 SHA256 a610f212fae2771e81767592d831773332b9a28d9ab9d435f57f044f8c5f2134 SHA512 e69f6ca6f22b0679f613d7aa9dbc2c6473a2a8773db65257dbe55d11a18a3dfd7946f2c1b2eb491052b718f0135c94d9a638f2d76c794306bb55c4c97cba8ab8 WHIRLPOOL fe76138bec7680264fa1390db0d07711b2d33b2f631e5cd9515021df177f4c20f67a1f6d7ba76ed022f08f6cf1471859c2b98ebb4c99567b078053379897ea3c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iF4EAREIAAYFAlJyuMsACgkQC77qH+pIQ6Q+zwD/QBdE8gifJO2jkp+AzYxTb87s
-EBFJr2U4Pcr5+2OyW4YA/io++C2KgAvlbSuYE0vS1UGyxDcQKy18FBMwZicrV/DA
-=/TcO
+iF4EAREIAAYFAlLcJg0ACgkQC77qH+pIQ6RpWwD8C4QBBPJpklMw5OIyL7ccU6xe
+S12Zn2eIjG3iXCV2xn4BALbZ3WxJIdr4SPuD4WkvuKyO8wsudmocbNi4sjatxN4p
+=fkIL
 -----END PGP SIGNATURE-----
diff --git a/app-emulation/open-vm-tools/open-vm-tools-2013.09.16.1328054-r2.ebuild b/app-emulation/open-vm-tools/open-vm-tools-2013.09.16.1328054-r2.ebuild
new file mode 100644
index 000000000000..e7098d4dfc2f
--- /dev/null
+++ b/app-emulation/open-vm-tools/open-vm-tools-2013.09.16.1328054-r2.ebuild
@@ -0,0 +1,123 @@
+# 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.09.16.1328054-r2.ebuild,v 1.1 2014/01/19 19:22:52 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 modules pam +pic xinerama"
+
+COMMON_DEPEND="
+	dev-libs/glib:2
+	dev-libs/libdnet
+	sys-apps/ethtool
+	sys-process/procps
+	pam? ( 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="${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}"
+
+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
+
+	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"
+}
+
+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."
+}