Add grabbitmqproxy and vgauth use flags.

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

4 files changed, 41 insertions, 25 deletions

diff --git a/app-emulation/open-vm-tools/ChangeLog b/app-emulation/open-vm-tools/ChangeLog
index f4140f5c0636..28e8663698e2 100644
--- a/app-emulation/open-vm-tools/ChangeLog
+++ b/app-emulation/open-vm-tools/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for app-emulation/open-vm-tools
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-emulation/open-vm-tools/ChangeLog,v 1.86 2015/05/07 19:39:46 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/open-vm-tools/ChangeLog,v 1.87 2015/05/08 01:01:39 floppym Exp $
+
+  08 May 2015; Mike Gilbert <floppym@gentoo.org> +files/9.10.0-vgauth.patch,
+  metadata.xml, open-vm-tools-9.10.0_p2476743.ebuild:
+  Add grabbitmqproxy and vgauth use flags.
 
   07 May 2015; Mike Gilbert <floppym@gentoo.org>
   open-vm-tools-9.10.0_p2476743.ebuild:
diff --git a/app-emulation/open-vm-tools/files/9.10.0-vgauth.patch b/app-emulation/open-vm-tools/files/9.10.0-vgauth.patch
new file mode 100644
index 000000000000..4206816397b6
--- /dev/null
+++ b/app-emulation/open-vm-tools/files/9.10.0-vgauth.patch
@@ -0,0 +1,11 @@
+--- a/vgauth/service/Makefile.in
++++ b/vgauth/service/Makefile.in
+@@ -322,7 +322,7 @@
+ 	../lib/libvgauth.la @XERCES_LIBS@ @XMLSECURITY_LIBS@ \
+ 	@SSL_LIBS@ -lxerces-c -lxml-security-c -lssl -lcrypto \
+ 	$(am__append_1)
+-@HAVE_ICU_FALSE@VGAuthService_LINK = $(LINK)
++@HAVE_ICU_FALSE@VGAuthService_LINK = $(CXXLINK)
+ @HAVE_ICU_TRUE@VGAuthService_LINK = $(LIBTOOL) --tag=CXX $(AM_LIBTOOLFLAGS)     \
+ @HAVE_ICU_TRUE@                            $(LIBTOOLFLAGS) --mode=link $(CXX)       \
+ @HAVE_ICU_TRUE@                            $(AM_CXXFLAGS) $(CXXFLAGS) $(AM_LDFLAGS) \
diff --git a/app-emulation/open-vm-tools/metadata.xml b/app-emulation/open-vm-tools/metadata.xml
index e9d95bd20086..c410522f57da 100644
--- a/app-emulation/open-vm-tools/metadata.xml
+++ b/app-emulation/open-vm-tools/metadata.xml
@@ -14,8 +14,9 @@
 	</longdescription>
 	<use>
 		<flag name='doc'>Generate API documentation</flag>
-		<flag name='fuse'>Build vmblock-fuse in favor of FUSE based blocking
-		mechanism for DnD</flag>
+		<flag name='fuse'>Build vmblock-fuse in favor of FUSE based blocking mechanism for DnD</flag>
+		<flag name="grabbitmqproxy">Enable grabbitmqproxy</flag>
 		<flag name="pic">Force shared libraries to be built as PIC</flag>
+		<flag name="vgauth">Enable vgauth</flag>
 	</use>
 </pkgmetadata>
diff --git a/app-emulation/open-vm-tools/open-vm-tools-9.10.0_p2476743.ebuild b/app-emulation/open-vm-tools/open-vm-tools-9.10.0_p2476743.ebuild
index c30202df3a18..075b90a3c2ec 100644
--- a/app-emulation/open-vm-tools/open-vm-tools-9.10.0_p2476743.ebuild
+++ b/app-emulation/open-vm-tools/open-vm-tools-9.10.0_p2476743.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 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-9.10.0_p2476743.ebuild,v 1.2 2015/05/07 19:39:46 floppym Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-emulation/open-vm-tools/open-vm-tools-9.10.0_p2476743.ebuild,v 1.3 2015/05/08 01:01:39 floppym Exp $
 
 EAPI=5
 
@@ -15,14 +15,22 @@ SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.gz"
 LICENSE="LGPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="X doc icu modules pam +pic xinerama"
+IUSE="X doc grabbitmqproxy icu modules pam +pic vgauth xinerama"
 
 COMMON_DEPEND="
 	dev-libs/glib:2
 	dev-libs/libdnet
 	sys-apps/ethtool
+	sys-fs/fuse
 	>=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:2.4
 		x11-base/xorg-server
@@ -33,15 +41,8 @@ COMMON_DEPEND="
 		x11-libs/libX11
 		x11-libs/libXtst
 	)
-	sys-fs/fuse
-	icu? ( dev-libs/icu:= )
 	xinerama? ( x11-libs/libXinerama )
 "
-#	vgauth? (
-#		dev-libs/openssl:0
-#		dev-libs/xerces-c
-#		dev-libs/xml-security-c
-#	)
 
 DEPEND="${COMMON_DEPEND}
 	doc? ( app-doc/doxygen )
@@ -61,10 +62,8 @@ pkg_setup() {
 }
 
 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"
+	epatch "${FILESDIR}/9.10.0-vgauth.patch"
+	epatch_user
 }
 
 src_configure() {
@@ -73,22 +72,23 @@ src_configure() {
 	export CUSTOM_PROCPS_LIBS="$($(tc-getPKG_CONFIG) --libs libprocps)"
 
 	local myeconfargs=(
+		--disable-deploypkg
+		--disable-tests
+		# Broken build
+		--docdir=/usr/share/doc/${PF}
 		--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_enable grabbitmqproxy)
+		$(use_enable vgauth)
+		$(use_enable xinerama multimon)
 		$(use_with icu)
 		$(use_with pam)
 		$(use_with pic)
-		$(use_enable xinerama multimon)
-		# Missing libmspack
-		--disable-deploypkg
-		# Broken build
-		--disable-vgauth
+		$(use_with X gtk2)
+		$(use_with X gtkmm)
+		$(use_with X x)
 	)
 
 	econf "${myeconfargs[@]}"