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

(Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key B9D4F231BD1558AB!)

3 files changed, 27 insertions, 22 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/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>