sys-cluster/glusterfs: Add workaround for 'fperms does not support wildcards issue', #517482

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0xB9D4F231BD1558AB!

4 files changed, 46 insertions, 41 deletions

diff --git a/sys-cluster/glusterfs/ChangeLog b/sys-cluster/glusterfs/ChangeLog
index 3db9843b5fb9..80143a5c5679 100644
--- a/sys-cluster/glusterfs/ChangeLog
+++ b/sys-cluster/glusterfs/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-cluster/glusterfs
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/glusterfs/ChangeLog,v 1.58 2014/07/18 12:18:20 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/glusterfs/ChangeLog,v 1.59 2014/07/23 07:00:48 jlec Exp $
+
+  23 Jul 2014; Justin Lecher <jlec@gentoo.org> glusterfs-3.5.1.ebuild,
+  metadata.xml:
+  Add workaround for 'fperms does not support wildcards issue', #517482
 
 *glusterfs-3.5.1 (18 Jul 2014)
 
diff --git a/sys-cluster/glusterfs/Manifest b/sys-cluster/glusterfs/Manifest
index c9a5d40dcb5d..6ceb845f7144 100644
--- a/sys-cluster/glusterfs/Manifest
+++ b/sys-cluster/glusterfs/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA256
+Hash: SHA512
 
 AUX 50glusterfs-mode-gentoo.el 169 SHA256 2467d044665d16dd95f78f7a7a104099ce00849cd0a2a86b110fe4c91b316a9d SHA512 f90b3f49f53c08db5596a6795df64a834b390602a79fb79b56f6cfb6191c7ca8ce2bedd2885d049575e26cc3b321f80e2786e99055c02682f4fbf454d5ed5804 WHIRLPOOL fb4abfc0c07ddc8805430446bd901b95a9951f53711da647e87ea8c26bece8ed9c7bb17b33cfa9b114ba2a64a055f275202d520cf37ee0c178d005d07ff80173
 AUX glusterd-3.2.0-workdir.patch 1651 SHA256 019fd1418041b98bcb5d841d19ef90a7d63483b801843876d7c5fdf54189cc80 SHA512 052496bda60b70ae8b3bd7d44cbeae093b9de80f56d8373dce4ff18fc50250a17cfeb38a00a111c5d17fed64962f48bc6d12100c0cfe0fbb83ec594a3d98b7bb WHIRLPOOL 7dafc97a1c4b17a9c4e3626f0b67e963f01adca295074e4cf80e85cf0ec096bd78a65eebb140925e092c2c5af29e4cac7e31faa5b16cfa4945f0321d95eeb6d9
@@ -38,25 +38,25 @@ EBUILD glusterfs-3.3.1-r2.ebuild 4071 SHA256 688fac9b91eacff4ebde95f0e60ee48bd3e
 EBUILD glusterfs-3.4.2-r1.ebuild 4638 SHA256 b2bcb8fccaeec4497e530b7f35b5fd0d8a4c11a03db79ff8150d1ea42073d5b1 SHA512 adbbc2696670439d031273a0d5fde1882585a0361d73e78826d1adb4cf44dd9256361fe5e9f626655a0365c4d2c49d9725b869cfa7170507c17eab60049cb632 WHIRLPOOL a1bdf5ac317dde52303ba5d806bf9c5ed1207102f478f9ce2c87f28b1c802e680e0068dd2e059573cdb619746e9968257fd6dcf7400bf759253d5aaf974bdeec
 EBUILD glusterfs-3.4.4-r2.ebuild 4753 SHA256 84c89911307c5deb3a73d687662e54fbd8465c23b621fc47eae4cc7c99b03773 SHA512 d86ada3611a3b89fc50f5d53d0165637b7725b865b503dbaeac77ae2f312a4f24028d80a9b3fe97dc6848cbe99e41f33d5f91fde20d12e35a36a582a3d1d6aa4 WHIRLPOOL d4197af0909df0645b65d9934d752139a32d38019c0b040b79a5f86bff57d8ddea9fe7952039e6deda1419e5715c55cf328c41425c60a017692bd2fa404515af
 EBUILD glusterfs-3.4.4.ebuild 4593 SHA256 d396bad164bad9e0a7379cec9134107aaf6ff7ee92350c9877b243c78b0a748b SHA512 a6c9dbc24bd98f9cdcd7db6cd1dc55793a9ed6c0400f459a6726b697298c28860d30461498ebcd1c0ca47601f1ce02d82a8ae7d00398b9dcf090d8618fb7cbe4 WHIRLPOOL 4c47c87d7094e99e9d5977b47a200defc3a592c9a734d2b39e240106fdbda7a68c6db0bb183505411a51559c91a7757d3689f0fcd2610602919b8b60a1706a29
-EBUILD glusterfs-3.5.1.ebuild 5429 SHA256 f59df821183f50799294b7f0eda41eabfc0f3bac68104248d09d80fbe7308e26 SHA512 7a4e5168abcca66e094abd46b6ff8741d15bee54e0936cd361fc183468deef01d6a2a8944afd862e0f6ea824a950d44d61dfe430713f34bec0bc8e5f5c2eda98 WHIRLPOOL d1d79b5219b2dde18e36544da5403ac8353071bb2624c76c5dcd37c8fdf9915b9a629d7fad45ded9e47ac40484a0184d383b5e686af9bffa3aa7b69ab09a586f
-MISC ChangeLog 12002 SHA256 afe5243aaf3fe452a4bcb10bcbc9e977efbf7d30226fdaf0f479645fc09ca2d5 SHA512 2be580347c84c146ba3657877ab8905ac0d3049f44e7931670132a89102c820dce14c3ecaba4e6acd1996138c73d80dc676865881633a07946a62476b4b73363 WHIRLPOOL 52a6441bdebf13130ab826e2f0145b5dfd3e487a847c1bae850e0c0cd1f4b4d17a8fbdca10965a6eef95652c856b4e17a2db256d6cca240f924ee404309e054c
-MISC metadata.xml 1410 SHA256 9ceacab1ac68629cf60dfeca0c547509b263bfd49fc371acae71d844c26c1628 SHA512 1cc2b9e19cf7eb1d8290f0525ef69d852bbaca2f0d4bf9a41a24186fdec5680f538a1b77a9d246aad0b61421c987536e9088537a25e15f55693b7adc30889604 WHIRLPOOL b9c02a883ced00ff5ff4405a43806437c71af0a725cb42c79d481fd4f3fc81f822a347ec8506565dbd4577078e5f84ee18004b6d24e00de9510998de25c101a0
+EBUILD glusterfs-3.5.1.ebuild 5495 SHA256 34e604f08ac2c296fc6360a21ffa7bf67a86ddae41ba4ccded9457d8e15b86e9 SHA512 1b5471045ba18c16c9ae011213546e25bf29504c8c683823596213cc5f33b1cac63c25d99b11c61b9dbfdce270c0edc13c5a75dc585cf35b3da06c99285eb6e1 WHIRLPOOL 646be6e7e2e0a0bcf893e80d7d785315ad0c7d7cd071e53ec3ef457b4c983e14c16d3d7d7ae7506ffe8e580ea91877c4af74266d639f9eb8b4019ce12d108135
+MISC ChangeLog 12158 SHA256 d8317d4eb292d9e71f90ee18cc11c78880953dbdfaca8e72df21894658053761 SHA512 1f2047fe2a31c01bfface2f6b0a3b5da2959d71a747d5a9497a1fe7efb2a3167cb9ffca912432c890558d117cc1ef1e02100f3592ae198214d817483a9aca041 WHIRLPOOL 9a4857652b2e639cb70dbeed78a71de4cd1b3a415064da45477c47ddf3dcded2032ebf101c4b64632d9032202cfda03264515fc5b24a13dd45af1591cd865579
+MISC metadata.xml 1434 SHA256 6b06ad02c5e50e33dbf3135fe5fd752b379a995b35887f1be899a1845540f84c SHA512 5c774c6a99663a4da155e46f31d31784a9f53ce171909a0e6af96a6bdeea80c15803111bfc7721d1442f3fdc4ca532485063bc1a4552cb15c38c08fd054ff327 WHIRLPOOL a01703c3ec564795a1f48448de70883b48d1db8e8c5c14b9d21ecb037ba95fcd9b27cc848edef0d1c968662ab2f6199db6839ce98280ae051f05d8898a8c2722
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0
 
-iQJ8BAEBCABmBQJTyRCNXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXRCMjM3NDkyMkQ0OTFBMUIyMzgzNkZBMkUx
-QTVEMDIzOTc1QjA1ODNEAAoJEBpdAjl1sFg9IeQP/0AUXXkm2nwyroeqkqSYSbm0
-QNLHZFT7eWYsAkMTUDFUkMuMyKpKSDORzQmpVBxclTuJymZWJEWe0T3m6+H0WvsT
-os+kPhUiQoFItRGQQlDB4eRvM3skO6/yFrZgy9kQHVAZuGHkWT8iL+mYmFRthKiY
-DZbni137LB7YpGCmikxtyYYRHEIoVAAf7/uHM9htAHqmpfHC4HFOdpNtQlaqon7W
-0SYBSFBwXA66TJNmLGHt/uv8AgEKwV7s6NwOYLqvF4s785S6uAEwYDiUKKTIoqQm
-OE3TW/qXBka6JoVpmA4WOSgi0Y++RYO9ztAPrMgA7wKh2TivFLxR3zuiEOC9cE9+
-ptGqxYgzcLyRj5PvQK/XbrLbHwqyDf9/5mll/23ouLxFzXfUW9YkHBhJmwxQDvxA
-icg6wVie3HFvDifiJIEb4HVDTY4uil6fIJGLhO1p7ytEsrrWkm8X6KKi0vSETyqH
-9thIMjJh6Mgj5G9xQxOJbL1gi0h2dJXFkdgqsZn6ySyoDfVzkK5e9UBMnf2Ek82B
-R6mSf0xjuHZwy5EjOdeDWiT1egDpcP1ht/zUaW9Hgjm+Dff5CR/GSSW3vfNwhcIR
-wRXkkuOXygKn+FR1ka3nG3G5tOlFA2wzOymTPf/QzlBmwkh7ZaJvAoTK3U+fkjQj
-+HxY/ephOqAOllt32HWQ
-=1tml
+iQJ8BAEBCgBmBQJTz12hXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQyQ0JDQjFGMzBDQ0UxMjFGNENDNDgxMDdC
+OUQ0RjIzMUJEMTU1OEFCAAoJELnU8jG9FVirCU4P/i7GPY1gBl6zab7c8BTYmazZ
+p4vSFcSWR/9CX03v6TEtmtstAiAJaOGw9H4DUbctV6hbYj5LbJ7I+lV5ITFL6VcM
+Znz/mU8w7libmpRwLYf7xzHycTC/KWoHHDWESc1FxZn8Z1M1y4ZHb66LVGKc4SBL
+4IIa/ym/xRXIqu9QYjm4PAjpoY7OTUNBvcdIySdHnNJOdM7fma8YYCQHcjA8Um/2
+l1hRLWnnJDDoDycDtHwh8tfOuE8l392eCEdcEvooNQwYJBKz24p7eXQqOowC7ntN
+X3c5AJprSDerOKXRF+CjpuYrJNr3lOMjvNCIRrQ8ILRyRcCLgchi/VNaiFaKQK+S
+qmXbo9zpFbsqcGSS1+7a+BA472H1ejm2B3Ywe8b9YCMq1hZ5GQU/u0bZ/3hBCyIL
+ct2HDUKOAnqedr3Jk/belaLN9OW7Sz4JI02YbTDUsshUfUIScQSd0NC2DRadZPwU
+OLBljrBQbiqbjKAZ7772h3XVBuKfTUmIVr/riAl0bLyTtXR6/eJy5vRcyU9I2Yge
+RvfERV3+P8o0xj02TxK30/ZwV7x+xyl38UVep9MajetIS+wlvWoYQqIIh3LLx941
+i9j6qQTSAZ4o/l88f2ia0UIo6pqEUzzECPXG2fYEAbwdSJTWLk2aqTVA/DLy8oOG
+S+DZvqRLW8s4iXzGoae7
+=2vgw
 -----END PGP SIGNATURE-----
diff --git a/sys-cluster/glusterfs/glusterfs-3.5.1.ebuild b/sys-cluster/glusterfs/glusterfs-3.5.1.ebuild
index 65397c0cc95a..60a35a97cf65 100644
--- a/sys-cluster/glusterfs/glusterfs-3.5.1.ebuild
+++ b/sys-cluster/glusterfs/glusterfs-3.5.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/glusterfs/glusterfs-3.5.1.ebuild,v 1.1 2014/07/18 12:18:20 dev-zero Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/glusterfs/glusterfs-3.5.1.ebuild,v 1.2 2014/07/23 07:00:48 jlec Exp $
 
 EAPI=5
 
@@ -120,12 +120,13 @@ src_install() {
 		extras/migrate-unify-to-distribute.sh
 
 	# correct permissions on installed scripts
-	fperms 0755 /usr/share/glusterfs/scripts/*.sh
+	# fperms 0755 /usr/share/glusterfs/scripts/*.sh
+	chmod 0755 "${ED}"/usr/share/glusterfs/scripts/*.sh || die
 
 	if use georeplication ; then
 		# move the gsync-sync-gfid tool to a binary path
 		# and set a symlink to be compliant with all other distros
-		mv "${D}"/usr/{share/glusterfs/scripts/gsync-sync-gfid,libexec/glusterfs/} || die
+		mv "${ED}"/usr/{share/glusterfs/scripts/gsync-sync-gfid,libexec/glusterfs/} || die
 		dosym ../../../libexec/glusterfs/gsync-sync-gfid /usr/share/glusterfs/scripts/gsync-sync-gfid
 	fi
 
@@ -137,7 +138,7 @@ src_install() {
 	keepdir /var/lib/glusterd
 
 	# QA
-	rm -rf "${ED}/var/run/"
+	rm -rf "${ED}/var/run/" || die
 
 	use georeplication && python_fix_shebang "${ED}"
 }
@@ -146,17 +147,17 @@ pkg_postinst() {
 	elog "Starting with ${PN}-3.1.0, you can use the glusterd daemon to configure your"
 	elog "volumes dynamically. To do so, simply use the gluster CLI after running:"
 	elog "  /etc/init.d/glusterd start"
-	elog
+	echo
 	elog "For static configurations, the glusterfsd startup script can be multiplexed."
 	elog "The default startup script uses /etc/conf.d/glusterfsd to configure the"
 	elog "separate service.  To create additional instances of the glusterfsd service"
 	elog "simply create a symlink to the glusterfsd startup script."
-	elog
+	echo
 	elog "Example:"
 	elog "    # ln -s glusterfsd /etc/init.d/glusterfsd2"
 	elog "    # ${EDITOR} /etc/glusterfs/glusterfsd2.vol"
 	elog "You can now treat glusterfsd2 like any other service"
-	elog
+	echo
 	ewarn "You need to use a ntp client to keep the clocks synchronized across all"
 	ewarn "of your servers. Setup a NTP synchronizing service before attempting to"
 	ewarn "run GlusterFS."
diff --git a/sys-cluster/glusterfs/metadata.xml b/sys-cluster/glusterfs/metadata.xml
index 044cdc8ea08f..7ca776b6ff2c 100644
--- a/sys-cluster/glusterfs/metadata.xml
+++ b/sys-cluster/glusterfs/metadata.xml
@@ -1,21 +1,21 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>cluster</herd>
-	<longdescription lang='en'>
+  <herd>cluster</herd>
+  <longdescription lang="en">
 		GlusterFS is a cluster file-system capable of scaling to several peta-bytes. It aggregates various storage bricks over Infiniband RDMA or TCP/IP interconnect into one large parallel network file system. GlusterFS is based on a stackable user space design without compromising performance.
 	</longdescription>
-	<use>
-		<flag name='bd-xlator'>Enable the blockdevice translator (requires <pkg>sys-fs/lvm2</pkg>)</flag>
-		<flag name='crypt-xlator'>Enable the encryption translator</flag>
-		<flag name='fuse'>Add FUSE mount helper</flag>
-		<flag name='glupy'>Enable support for translators written in Python</flag>
-		<flag name='georeplication'>Enable support for georeplication (requires <pkg>dev-lang/python</pkg>)</flag>
-		<flag name='extras'>Install extra helper scripts</flag>
-		<flag name='infiniband'>Add support for Infiniband ibverbs transport.
+  <use>
+    <flag name="bd-xlator">Enable the blockdevice translator (requires <pkg>sys-fs/lvm2</pkg>)</flag>
+    <flag name="crypt-xlator">Enable the encryption translator</flag>
+    <flag name="fuse">Add FUSE mount helper</flag>
+    <flag name="glupy">Enable support for translators written in Python</flag>
+    <flag name="georeplication">Enable support for georeplication (requires <pkg>dev-lang/python</pkg>)</flag>
+    <flag name="extras">Install extra helper scripts</flag>
+    <flag name="infiniband">Add support for Infiniband ibverbs transport.
 			Libraries can be found in science overlay</flag>
-		<flag name='rsyslog'>Install configuration snippet for <pkg>app-admin/rsyslog</pkg></flag>
-		<flag name='qemu-block'>Transparently create files as QCow2/QED images in the backend, including the possibility to snapshot.</flag>
-		<flag name='systemtap'>Enable support for <pkg>dev-util/systemtap</pkg></flag>
-	</use>
+    <flag name="rsyslog">Install configuration snippet for <pkg>app-admin/rsyslog</pkg></flag>
+    <flag name="qemu-block">Transparently create files as QCow2/QED images in the backend, including the possibility to snapshot.</flag>
+    <flag name="systemtap">Enable support for <pkg>dev-util/systemtap</pkg></flag>
+  </use>
 </pkgmetadata>