Expect that gsync resides in /usr/libexec/glusterfs on remote machine or in other words that the remote machine runs Gentoo too. Fixes #464196 by Francesco Riosa <francesco+gentoo_bugzilla@pnpitalia.it> who also provided the patch

Package-Manager: portage-2.2.0_alpha166/cvs/Linux x86_64
Manifest-Sign-Key: 0x895192F9

4 files changed, 32 insertions, 20 deletions

diff --git a/sys-cluster/glusterfs/ChangeLog b/sys-cluster/glusterfs/ChangeLog
index ae5d60eb2a1c..d8eb62c666d9 100644
--- a/sys-cluster/glusterfs/ChangeLog
+++ b/sys-cluster/glusterfs/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for sys-cluster/glusterfs
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/glusterfs/ChangeLog,v 1.45 2013/04/02 17:00:19 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/glusterfs/ChangeLog,v 1.46 2013/04/03 15:03:44 xarthisius Exp $
+
+*glusterfs-3.3.1-r2 (03 Apr 2013)
+
+  03 Apr 2013; Kacper Kowalik <xarthisius@gentoo.org>
+  +glusterfs-3.3.1-r2.ebuild, -glusterfs-3.3.1-r1.ebuild,
+  glusterfs-3.3.0.ebuild:
+  Expect that gsync resides in /usr/libexec/glusterfs on remote machine or in
+  other words that the remote machine runs Gentoo too. Fixes #464196 by
+  Francesco Riosa <francesco+gentoo_bugzilla@pnpitalia.it> who also provided the
+  patch
 
   02 Apr 2013; Kacper Kowalik <xarthisius@gentoo.org> metadata.xml:
   Drop alexxy from metadata per his request
diff --git a/sys-cluster/glusterfs/Manifest b/sys-cluster/glusterfs/Manifest
index 78625c77a6db..74bac8d941cd 100644
--- a/sys-cluster/glusterfs/Manifest
+++ b/sys-cluster/glusterfs/Manifest
@@ -21,24 +21,24 @@ DIST glusterfs-3.3.0.tar.gz 2599586 SHA256 76d80ded9ecc5146131e9d59b03cbe09a1833
 DIST glusterfs-3.3.1.tar.gz 2636698 SHA256 19aaefe3a0f9059ae831b44c92944503cf439da82da23467101ac13da8b77519 SHA512 c32e95a0e4568a62fabcf0c52ad3d6a173b62c5536006c3680e3efd1240e2a68177e14891e11d1d16eff5eb67bf60108dbd44151c26241203d8ddb58f0270c69 WHIRLPOOL 30316bbdb7087dd32d35f0f017ea461711830f5450984edb6d6c527d7f9cae5ee307601887cf489a2d675180d1f21a77ac7901f37f44cc860cccbe510c5a18bf
 EBUILD glusterfs-3.1.2.ebuild 3647 SHA256 e2835d83bf6e03f4b0bb9d4f7dd2749d0454204e401444a357fb4371d90c9be3 SHA512 ba02e24cc76ab53059ec76ce9f84aafdd2e1ea47ba9e34390f4f73bfc170a4037e65795af3d17315c19d5cb50f1e784d095cf2129d8debc102fb2305c1637def WHIRLPOOL f0f4285e4c3dbf0704c2e3770891f5997dd4468ff8b9e944f3a14e0e607744382451edd9afc05b6d485efef69d54a48b8ae20b3efb7103b6dee8ecf33a3d2122
 EBUILD glusterfs-3.2.7.ebuild 3702 SHA256 2a32929580fad41bf449a79bc4e5d195bbab6c8560f0a937b9bdadb790fe7ff3 SHA512 2a9530fb240f220d9e3581053edf4fe18f1545223386c03e2b4f1a36fe2832cd8abc33110d234160bfc4a07f2532e1f2a7f4c976253b5fb45ef3a71b99833dde WHIRLPOOL 5a3d7d1b6349a266d2bdeb9be3061610c99bf8338cc724dba70d9db55e37b2a1fb10e798ae13130f010cc88445f58aa3006b459bf502184898de3c36cd21c3c5
-EBUILD glusterfs-3.3.0.ebuild 3794 SHA256 aa41cf11fad03bb8512184bdd4eb5ab579e89233d44146e0836785b39a2f1b59 SHA512 9111bda6144aa1e51c265b1f1a35f0d492a87862e1260d6564d93716b711f98a66d8566f2c0b01abfc582f56f4212d0c45aaffa38faa7205311f85354a7519ed WHIRLPOOL 6eefd66ff924765ad0722f7c7103a70c6992aac94c66817e836e4c3ef57bb9c0b9b668e6979a01d3c75d9b13761f89ed84aa0e9f8bbc75b4f9e773d9e6a45eeb
-EBUILD glusterfs-3.3.1-r1.ebuild 3954 SHA256 098cc8d04f13d8b851df9202e41f6b281542b31e2c2ebfeb19d9ea244585c4ec SHA512 d28965be6a2ba69100be05c856eec082da99c97c4ee7824e092d1da3092bac6864eb4c93f9a8c6f4401a5d31bde6044ec65439a772e4bd5fd691c6797c21daf8 WHIRLPOOL 21221cc0e1ad96228df60ba375cba5e4c74264f9c2b80cc60c3a49ee9c53b3391c83367fe3c79f49fe379203a1621354a8d74e3b2c99dacca00073086fea28b3
-MISC ChangeLog 8214 SHA256 4f95c87f125c3a4d2e1df007c7f75cee9cbbeacef8555cfb1e0dce8d5a60f9d4 SHA512 0e3157d1fb477aef46c5d0978482ee627b0135b6a298fae4629d45368ce90f3709c2d3b7d7fbc4317221bb1dc1c31a793384881ca5fcf34803988a468cdff312 WHIRLPOOL 0e169115c95cdab035f092a197916b6927dfa8332a99961b5ffebc2322c616e4c1a4f73da74523ca1699d94b50a7f181c9e671aafaaa1e9e404520f66825ac77
+EBUILD glusterfs-3.3.0.ebuild 3796 SHA256 bc7ebd431067f8e8b8c7c15ab16a2701e6d5e1b45935ec48216c516c2c8ae7c6 SHA512 af2a53e1e3786e7366a88a1d9191e3fc66204163e25b497668bbbee7b96e64d28212362bcb9ab6807ee229f6469eeee70e10919f9453161ae4423fc62445bf30 WHIRLPOOL 851ffce2dce2dd372a0a5e1af9f147ec517e5ba2118fe2ea33ba6c013b3ae4ddb0e4fa3332c3a8e4f3dc629bb88a5faa540e479425366cb1780485558572fcd6
+EBUILD glusterfs-3.3.1-r2.ebuild 4071 SHA256 688fac9b91eacff4ebde95f0e60ee48bd3e0c0063f3603186e6f902e85b81d3d SHA512 e510359e5ea465cc1c8b3545b88b204671ed0d4b0bf2739ed8a5a324c12a1b04855c5fee5c8f1153b2916eb180fc9d225282af4982b3ff831d997ce90e8f8896 WHIRLPOOL dc55997fc5b0d8d9f59bb54406bab2c5699f9ce4f244b0465899906235a95942cc2f502e174a694c5a42206939195712dcddd2c8750417f5a7a4d04881e19924
+MISC ChangeLog 8627 SHA256 dbbf323d1e7d186b991b59b65a0e5e3fa24cf9cb379d19297e481766aff8f783 SHA512 9fb62aae66578ad6c0fe33d4959803919305114963fc22a3ff8130d9f44fa312c623e42f6290d608c242a64e9c7c3927e2a887c1d93b6a9acb2ba17c74db858a WHIRLPOOL d26417e6c10ff5519199221960285452d9d0ab79de06f37bd2c76e05fb88ad4898536452bd0169832cb4bbc7318bd1bf74e5b60f439abf15164605570e2af2d6
 MISC metadata.xml 747 SHA256 d1eba4f73ff87c510ceaef3f3847e81435d48996efa19a855278c870ca600ba0 SHA512 f5131c30b30d7e057dbfa36359ea666d12720d9beaa51e267d84e504fda0d75c493d21ffc9aeac9cfcc72f79827bd1c12c6d6315ca5bf0ebddea67f7fdcb8215 WHIRLPOOL eddbe28a06de26635e6dd9858a51a49d810fe4719182a52d387f69dd0dae613ecb021076836750ee1b76db6627aed4012f4813f831f5eea1a3c221c66e1a1dba
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJRWw6nAAoJEF0huFKJUZL56CcP/A+ki0zuJsZw7XbzPFKEEpMh
-3qM7mEaJZVJzG72MfxFzWuz0attmfKOlk16Y8YRrZwSqZD+mca+eHOnSjPSpO2xD
-xK1T1qGB9F307Bm4AoBIYUNcQkZyI9J73In198Cn5NLtbc4TPoYbGWKYD36NQODM
-iSvWmLDKiK3HBB/yD0aoD/wjZeq/4Pnr40O67JXR74FN8sg06w55BQYPyeLFRlX+
-kEzDrfoMkrHZawf0pNgqygGa1xcmqSXGsVw16BS/+m6iuA5ZZi3RDuvhYF4PCMh3
-1IHgXpweNFxHRtEvQl+0osB44+LM4AnQZz8zvZFBmfnxV8MgLqqK3zb5tz7QAspv
-XT4vH/iV+em2OlfmYt3cfcYVgULtem3TBbcrAU6t/zqxiGgof5pCv/O700JEycJA
-qDaWlPlCOaSicFZbP/x8FPzFF+9tHU+RoTOvH6A99CvvPhm7c+bFblGFQ1xFhlrY
-AjXEDxpHdASlfc2EhAuGVa12iiqIuVZ1QxzvN2PAhhF+bPKkeVvvGaewObaViBJO
-7hcklWfAtJLiT8ejdSBrxGKLciDzIbMdaQztIznRRxBYaZp71zh/ZhuN7Eve1p+T
-UYTgNN7kJMdrCrZDGn2n7BuMJgo0E6c5WLBTVxlPOqvgVVCdJlh/tZy4seYQXooS
-5z5R1zKrOTFPdnu9tmsy
-=eqHh
+iQIcBAEBCAAGBQJRXETWAAoJEF0huFKJUZL5eOYP/2cOEP5yVRbgeLfijnr1n4Zw
+Voe126vUaNxggcG1L+UI33VlYcp2ZbMEXhTvTEwe9XJ1MWAihNEdmLz6alm4z8FI
+kLu6+fqIMbD/hwU9QMzqBTWGA+Nf8ZQdoh971Y4dIzU/veypTfMOI2ucMw0eUSrP
+ufPU59WBlCaCDTPzEX3JeksW8zYGDPurLQBlXxTO+SWtodqDdc29Jek1cC0nLJE7
+jtt3mGu5X3MSX7kf4L7RAFl2h8OFhYTspxEg3a7zuS0oPMipRf5tzsVCOzd42wDx
+tm++UzVIwzHDUvi/aBwilcrBx5kc8SfVuZnOz3wQfoZvnalXoD6hz8bD5URwEE16
+B/Zv8GTZGZCNNa6CosLHWUCmkP9UXQGkqdI1U36B4TMpyugxWBJfVPpphO2rz1py
+tX4/AXS10jbfsSuqjgxdnwL+9WXWrOG1YzhMob7XBc1YK08VU0OqxJz/5BIixvh5
+wwP+80OAF98QjxvACjlfZ0/aCqH74V0TD7UfLbYs//pBhbpAaen0BQsFBp/jFJY2
+aj0HJi2GFaWjns50UF8DRxdbjo4HZ7o5R43VVR/FjG4qgFfqgWOednlKsw10XYNo
+UeJqqDmwJ4yIkG25TQFtf/acTDP5T+JTLaZqVjRc9x71+gb6yoKmymmlHJoudF6F
+mmm0+qr/O/pPoT8JnwPF
+=bazK
 -----END PGP SIGNATURE-----
diff --git a/sys-cluster/glusterfs/glusterfs-3.3.0.ebuild b/sys-cluster/glusterfs/glusterfs-3.3.0.ebuild
index be48c986f392..9e6d4fb55bf0 100644
--- a/sys-cluster/glusterfs/glusterfs-3.3.0.ebuild
+++ b/sys-cluster/glusterfs/glusterfs-3.3.0.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/glusterfs/glusterfs-3.3.0.ebuild,v 1.3 2012/11/19 13:36:35 ultrabug Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/glusterfs/glusterfs-3.3.0.ebuild,v 1.4 2013/04/03 15:03:44 xarthisius Exp $
 
 EAPI=4
 
diff --git a/sys-cluster/glusterfs/glusterfs-3.3.1-r1.ebuild b/sys-cluster/glusterfs/glusterfs-3.3.1-r2.ebuild
index cdd7c20fd5fe..7690f1dfc2f0 100644
--- a/sys-cluster/glusterfs/glusterfs-3.3.1-r1.ebuild
+++ b/sys-cluster/glusterfs/glusterfs-3.3.1-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/glusterfs/glusterfs-3.3.1-r1.ebuild,v 1.1 2013/01/06 09:52:54 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/glusterfs/glusterfs-3.3.1-r2.ebuild,v 1.1 2013/04/03 15:03:44 xarthisius Exp $
 
 EAPI=4
 
@@ -47,6 +47,8 @@ src_prepare() {
 		-i argp-standalone/configure.ac || die
 	sed -e "s:\$(PYTHON):${PREFIX}/usr/bin/python2:g" \
 		-i xlators/features/marker/utils/src/Makefile.am || die #446330
+	sed -e 's:"/usr/local/libexec/glusterfs:GSYNCD_PREFIX":' \
+		-i xlators/mgmt/glusterd/src/glusterd.c || die #464196
 	autotools-utils_src_prepare
 	cd argp-standalone && eautoreconf
 }