Add grabbitmqproxy and vgauth use flags.

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

diff --git a/app-emulation/open-vm-tools/ChangeLog b/app-emulation/open-vm-tools/ChangeLog
index f4140f5c0636623ccbefc319c60252925295bbec..28e8663698e2e6e4c4277170b42a245fb033b945 100644 (file)
--- 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/Manifest b/app-emulation/open-vm-tools/Manifest
index 02301c869400446c0434368384b47f9f5f34c05a..57050d9fc86715840328d6b528fff16481fbf3c6 100644 (file)
--- a/app-emulation/open-vm-tools/Manifest
+++ b/app-emulation/open-vm-tools/Manifest
@@ -1,6 +1,7 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX 9.10.0-vgauth.patch 571 SHA256 8b720a813dffa2b136fe52a41bf8853e2bb0a2aab202234d97e0635f1106c3dc SHA512 2fb7276a3919605f641d56bb5e30185ec156bd9e75b221503e9574b367c72a07e5b80965b10201211e6e2c08b0b2997ab2cb8153528fae1fc203aa2577b0ba4d WHIRLPOOL 7605052af5245822f90a05b8a8f41fafaa9802925b2d0a015d44e2adb192dba79223ea3ad6c039db7a9b8bdbc44cbc8415102a2e0a3049518fa5d3711864a7d0
 AUX network 265 SHA256 5086ad67e1ad98877e2992ac4637f304028424177151606243e35bc8a021117a SHA512 dc51bd94cf16ac1f4d083bec59d7254f68d6ade37dce5d700cc6de120e4b86da649853669341538e33e67759afb2bb7c37c1d1f9ed8f5cad5a3250c7a38f5832 WHIRLPOOL a925caecc399ee26d8eb1f2aa9891e8fd199ea3860ba92ddf25a051f0786618815589ac505c75b08a9946639fda4aac82379c1eb2270d8241bd19b9f897f6d89
 AUX open-vm-tools.confd 88 SHA256 180a2b6d9d18af319b79b2ca6ebf1020b63e5ebf2f601a63c1a9f9f7d2e0b95c SHA512 fca30a3be4dd3247e16115fe32b4d27ede8751f96b5a33b9f489b0ce57823c605b6249ff722d6f4ed82a98979f36d28821603b4a5a1d967d3048d23d983a19be WHIRLPOOL b2cbc98b5e0e125fc3ef6440006d4f6b75b8b020680a7184c4b7fa0651c2387c5d02baf8b61e196cfd560ccfc7be069fba19340dc6fc9ba6ea161f407ffd73e5
 AUX open-vm-tools.desktop 125 SHA256 12a7a94c312c660f03312d52c4b42408e495ecc98df01a69a7f55f80aa5df1fb SHA512 1b9f19d3bcb782d04eb297d4bd759a6f281e8d92ad88365a01659ec8ac4e6bed3ed70c6951d72bae57427edd1d2cbc7de14a71d19de0f1fea4878562beeb509b WHIRLPOOL 6231f623a2e1805d08cfe703b734dd1d4ad477b7965d7cf46432036aa29921e373d12771aa14fd006ffd8b35802f5ba9f804cd84bcf5b889311455a3618aa9c3
@@ -11,14 +12,14 @@ DIST open-vm-tools-9.10.0-2476743.tar.gz 4093306 SHA256 e146ad53d744d7793ee72c52
 DIST open-vm-tools-9.4.0-1280544.tar.gz 3659504 SHA256 5d30652eb0f6dc5e930781029c184837e700be5543b6a7116db4c62a6f3ca399 SHA512 07b36f49713140606f74864b59c2e01c9ed83a960dd3f5d172b84fc75e760f7370065774a0e26897924af60454c86b682ca0fd32276b0e9fb17b268247f8cbdf WHIRLPOOL 88533768cf718de3b5f64e688597209fa2029d02cdf350d7fd05ec8dd8ca0f0c125a8d1445c1ec9287bc486076d5c335f3cc615c3f0b9aa7bac84e921da4c9e6
 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.10.0_p2476743.ebuild 3196 SHA256 1a8b3aa2de0f0b29eb7a92aafb4db1fc28c2853415246bbd3e43a024e8b0b11a SHA512 4333b7005e0b5257d7203aa768533d035c3beceac08c7a496612eef1c085afd4252da7ba9ca9f460db7beacbc986f07ec58685d272d5e003721e2af50be047d1 WHIRLPOOL 5a6962b16eed2cc709d8dd6c8eead0fd3eddd02b9ed89d6098da1e576573757ca49a403e5cd09c6d794bbe803b23b5c3198c93a4f6e1aac6c51ecb007abebcb0
+EBUILD open-vm-tools-9.10.0_p2476743.ebuild 2984 SHA256 5822e611a893d04c0f9be002d716d9dad76d61e005edaa4089dc4ccbb2cbacbf SHA512 9ea8efd747860ac81e6efaab33045e0cdc1af4e1db8db94ccae90bb031640aac941f535809dede0d9a319765d72f79d1c46fa36186ae0f1f1c05c3ee60f361c1 WHIRLPOOL a4cd40d1e6b5c5f394362ab543e5564a33810fac23fb00768f9080c5935160e6e0ee103b6aa2034b267b46597b5dd95475585ec44c840073ec155298c4c49163
 EBUILD open-vm-tools-9.4.0.1280544.ebuild 3020 SHA256 99ea08ac3f50072192dad4b4988237a97ac34c8b811765b1ecc42002cca298fc SHA512 a771cad78b76572e238731c857e02248659f1d5ab9240269fe3a5f604c6c03ad60f1de47ef54b620ff5c4cc44effe70493b663d7c6296ecbe905aab47d7e41bd WHIRLPOOL cd7914da23a8531832480cd079eace0b3c47ef498a8d9d17c75a9756c3ad3599a5ee8e9151011f57dd080358cdad3962c4edfa88059f021151ede80d6a6b2101
-MISC ChangeLog 17760 SHA256 040fa30ba0d860b4f8ddd27bc1f87da3597b2644de26bbcce8dc5fc3b217612d SHA512 a982970044778db4eb237ce8f8ac59e15f8efb2e9673c66f528cf437023b20f53c6709c9af1b71853a1668d46ba23768a903afd3ea33ba2bf3233d41bbb0a499 WHIRLPOOL 8825cc2850fbde7d8d0c5d39409a5ed7976f94243e8cb16340d4905e705a302db9878d661aade87a56f34fbd1d8dd1f457a50233adeaf12823078377979f458a
-MISC metadata.xml 766 SHA256 b595c1396d3f1d3bea4c95abb29786089bc2a8689ca4dc1b0ffb0ba6062ba096 SHA512 aa1689f0006e09f2950ef1dd78b2327f0bc263092cafc02e538e00b5bf69d743c014d98b013e5a1ec4826139252e1e229986e1e1404e623f7b08ea5e77700e58 WHIRLPOOL 05a9d214940e1d439fdc926271ab92a1da847e00dd40cb2f049307129ee2c94696d539e2093e64d5bd4e560d8696a02417d8e46065d3e781449034d617574768
+MISC ChangeLog 17935 SHA256 76d29a5cc7899a9c5aff4657bea095c897908593bfde83b10ad6cbf94222c9d4 SHA512 5fb8fcaf8e4464d8ad1ee01b66eccb7d599de1c20bbd803568bd3bacb3cb03583ec8771e28cb65a4a81cb75f7925746cf3f21007e4b038b1c82107e2211f546e WHIRLPOOL 41c363dc1061cf133ecb376a576f5d1bc3ce4b675b3dfa7e9b28a0f10334e06c0de9ea633ed49b2a21d5fcd0f06d15e1ceec32bd8838d666141cc21cad5dbb7f
+MISC metadata.xml 866 SHA256 1fbcd2095c56d39b0fe1131887f1d88767e3411b20d63f256e856f6c0735eca2 SHA512 56dc0372dc87e78ed3594ac8850418430cee9821627e4785d6de005d5c8b2c5749468760057eaa123e1df98462a819669315c807533eee7763a692b476866e88 WHIRLPOOL cb7ffd3388c20794c966552a201cc7b0818602f00c95b098e9b1ca8ada37e9fb4cee55d8509e3a17b368585a7ea881043e0c80ca44e24b66fd503d678df6ca9d
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iF4EAREIAAYFAlVLv4MACgkQC77qH+pIQ6TuEgD/ZHP0m/mEv5BqhZxcR6MPr6bB
-DcASeaZsWCOtugDwf/IBAJW0LjayiLSSrtTZ1xHmoSZxQJWzi+aGrxXOs7us9dUr
-=xNQI
+iF4EAREIAAYFAlVMCvQACgkQC77qH+pIQ6SWNQD+PP+qD7ePevKDZholuYYzOIp1
+gtcGjPAWZX3DpoOwGy0A/2p7LPNucwDMFD6qV6wDp145LXpFGkh/xg+sD7fBQ0W0
+=X5c7
 -----END PGP SIGNATURE-----

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 (file)
index 0000000..4206816
--- /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 e9d95bd200862b45cd9a565245ba0350e30cc7bb..c410522f57dad7550eac21c1d30e390e6bb88a6d 100644 (file)
--- 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 c30202df3a1841051d220aaec574ea5079468ea3..075b90a3c2ecca0f869c32d0e214a1ceb2b41268 100644 (file)
--- 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[@]}"