Version bump, EAPI4, fix #367253.

Package-Manager: portage-2.1.9.49/cvs/Linux x86_64

4 files changed, 174 insertions, 5 deletions

diff --git a/sys-cluster/glusterfs/ChangeLog b/sys-cluster/glusterfs/ChangeLog
index c6488b37285d..fa43df598569 100644
--- a/sys-cluster/glusterfs/ChangeLog
+++ b/sys-cluster/glusterfs/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-cluster/glusterfs
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/glusterfs/ChangeLog,v 1.26 2011/04/29 15:53:54 ultrabug Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/glusterfs/ChangeLog,v 1.27 2011/05/16 10:13:39 ultrabug Exp $
+
+*glusterfs-3.2.0 (16 May 2011)
+
+  16 May 2011; Ultrabug <ultrabug@gentoo.org> +glusterfs-3.2.0.ebuild,
+  +files/glusterd-3.2.0-workdir.patch:
+  Version bump, thanks to Marcin Mirosław for reporting #367253.
 
 *glusterfs-3.1.4-r1 (29 Apr 2011)
 
diff --git a/sys-cluster/glusterfs/Manifest b/sys-cluster/glusterfs/Manifest
index 4d47bc601382..95d1e006f33c 100644
--- a/sys-cluster/glusterfs/Manifest
+++ b/sys-cluster/glusterfs/Manifest
@@ -2,6 +2,7 @@
 Hash: SHA256
 
 AUX 50glusterfs-mode-gentoo.el 169 RMD160 406c0dd2d79d054f059fcae29961fb6b7950e367 SHA1 5cb956b94b2704d244a4031093305de3243a7a86 SHA256 2467d044665d16dd95f78f7a7a104099ce00849cd0a2a86b110fe4c91b316a9d
+AUX glusterd-3.2.0-workdir.patch 1651 RMD160 9986cb7035cf62c1c38e74668c36d29ecb4d1ed4 SHA1 df422a386cbff7c463ceb4ac003fb6a22b0c2a46 SHA256 019fd1418041b98bcb5d841d19ef90a7d63483b801843876d7c5fdf54189cc80
 AUX glusterd-workdir.patch 1528 RMD160 c18b1407bcf02e6504afca8aaf1dba894856dc11 SHA1 6d7a428df9e6dfc8da75831ca64dbc84253b3a36 SHA256 b614c90279fd0546d353f017616dff798e73a20c45fa846d57a35bf4569389df
 AUX glusterd.initd 833 RMD160 e26b0924ede76d50625c46c051cfd50d663277d7 SHA1 d8c456643d15f7605ec97b9ca1c21d9adc60e41b SHA256 cd6d277236a9bc22cb3872269d1454c2c5a140cea6a9badb3b6ba2d88ae52232
 AUX glusterfs-3.1.0-parallel-build.patch 659 RMD160 a5127f529387a0f9a543c666d139beac6f8b306c SHA1 bf1d566d9b306b44f0a26db7d2c9ddaa10f8a872 SHA256 7aeb616d41bf898d1df2cf4773802e88e41e13271184eab03c46034a9c22027c
@@ -11,14 +12,16 @@ AUX glusterfs.initd 3134 RMD160 6606d3c3ee825e1af9624d66f5a46e30270e73a3 SHA1 68
 AUX glusterfs.vim 139 RMD160 17a4589550934fd8fd3523d0075af7686fc8f905 SHA1 8aa880c49a7bd1a0e185539acede53840b138746 SHA256 f214c1c8a01c9184b535fa7ae307200a8a1dc83fd42e92bdd57a7b1cae1dc099
 DIST glusterfs-3.1.2.tar.gz 2086469 RMD160 f9e744ef999f82b70f173930f1f1cee96fe61e84 SHA1 ccae6965595abf8af881b736a3fe4873fc6b28e4 SHA256 9a4e910431f572aa180a3ad1821f7524773ec1e8f06342c4040f26619f832838
 DIST glusterfs-3.1.4.tar.gz 2173373 RMD160 dc7db013790dc2366f574e6e8a4fca6a67078cdc SHA1 1166063b4a3fa25927b16c88025cc1186c73f420 SHA256 a3d284e63b4d5fcbd1e8df99350b7254dd7e877476206a32f6b5877515f5fe04
+DIST glusterfs-3.2.0.tar.gz 2307276 RMD160 a69f47efd396a413ffb350e1711345ff49557325 SHA1 a8095e04feedce81aa21634639f278b3810398b8 SHA256 143e93dd1bbd0131748e9e64791185c3870d34c7760e97a35293909c7f7d826d
 EBUILD glusterfs-3.1.2.ebuild 3593 RMD160 e2c6261ee2c4118112f850d1b282c2e1863d1b8e SHA1 8918ee77e65bbab8b587753fb1421b2b94262918 SHA256 73c6236936f64983d3b115d878a207d42ab8836e2b110f23ce15b3c2f4e07424
 EBUILD glusterfs-3.1.4-r1.ebuild 3689 RMD160 6b670b27fe0b82c7723219a5f86841b693a62c48 SHA1 d97db4606d2da820f7a59c3b9df03f4d402fed4a SHA256 6b52f755d94a08ff66828248ae3d53c8c65f75443ec7184e0453148a3901c803
-MISC ChangeLog 4695 RMD160 0ef062276b474d29e0b05f9e61059d146bcaaf39 SHA1 6a5b3578aee14f6e30056c217c9cc336051170ea SHA256 adb6c4c828b0a18c8ae7e3719ead56f0dc979149d16ceea7da2c92c7c4d0f471
+EBUILD glusterfs-3.2.0.ebuild 3620 RMD160 2cc6539348d204ddeba5f5e59891505eadecf4b3 SHA1 cec52f2596f7a0638c701aebabd21c570e7f30df SHA256 c8bb8e248112a1a61f5fe434cc280a8086656389441a669d425a1de1346a3ce0
+MISC ChangeLog 4904 RMD160 c3a8f222e7146a49fae8f9692ed8a723f2ae10c2 SHA1 4830bad58335c4d53539b444beda2752a26af037 SHA256 c3c607721273bd6a22265b3a7b19e4198faf12762687fa5d9ca68729be4cfed6
 MISC metadata.xml 842 RMD160 2e8fccda5c50a0c64caf17ae528b59d4c41f5373 SHA1 9f10069f096be61a347ccdccc21f30a7411e4b5f SHA256 2a717e590d518af4d7eec71b92cacece17c0cb0c3283f37793e093b2def0ae04
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iF4EAREIAAYFAk263x0ACgkQKiQSS7ZY+hM7EwD9Ecx4SEtgRyjf2fRdwZEyXLx8
-7TvL6QxbPgyiSqE4wNIBAJH7dq6KdoSItr2cO7CPxcOMQJ9DQw+TXHghhBZnJN9N
-=W8eY
+iF4EAREIAAYFAk3Q+NwACgkQKiQSS7ZY+hOyaQD/frzjgZty1+pUUCAeD8pd+flv
++E2leoPLtCwRPGu9z8kA/i2YUq4gNJoZY0vfA/rpwk1zJ8RvgnUes0Fn3vMPsk3I
+=jV1P
 -----END PGP SIGNATURE-----
diff --git a/sys-cluster/glusterfs/files/glusterd-3.2.0-workdir.patch b/sys-cluster/glusterfs/files/glusterd-3.2.0-workdir.patch
new file mode 100644
index 000000000000..a312bdbc64d7
--- /dev/null
+++ b/sys-cluster/glusterfs/files/glusterd-3.2.0-workdir.patch
@@ -0,0 +1,49 @@
+Change the default workdir of the glusterd daemon to /var/lib/glusterd instead of /etc/glusterd.
+This directory is dynamically populated by glusterd via the gluster CLI so it does better
+belong into /var/lib/.
+
+Patch by Ultrabug.
+
+--- a/xlators/mgmt/glusterd/src/glusterd.h   2010-10-13 06:20:37.000000000 +0200
++++ b/xlators/mgmt/glusterd/src/glusterd.h   2010-10-26 10:47:52.747265444 +0200
+@@ -204,7 +204,7 @@
+         GLUSTERD_VOL_COMP_RJT,
+ };
+
+-#define GLUSTERD_DEFAULT_WORKDIR "/etc/glusterd"
++#define GLUSTERD_DEFAULT_WORKDIR "/var/lib/glusterd"
+ #define GLUSTERD_DEFAULT_PORT    GF_DEFAULT_BASE_PORT
+ #define GLUSTERD_INFO_FILE      "glusterd.info"
+ #define GLUSTERD_VOLUME_DIR_PREFIX "vols"
+--- a/doc/glusterd.vol  2010-10-13 06:20:36.000000000 +0200
++++ b/doc/glusterd.vol  2010-10-26 10:48:16.487931870 +0200
+@@ -1,6 +1,6 @@
+ volume management
+     type mgmt/glusterd
+-    option working-directory /etc/glusterd
++    option working-directory /var/lib/glusterd
+     option transport-type socket,rdma
+     option transport.socket.keepalive-time 10
+     option transport.socket.keepalive-interval 2
+--- a/doc/glusterd.8 2010-10-13 06:20:36.000000000 +0200
++++ b/doc/glusterd.8 2010-10-26 10:48:44.898729373 +0200
+@@ -70,7 +70,7 @@
+
+ .PP
+ .SH FILES
+-/etc/glusterd/*
++/var/lib/glusterd/*
+
+ .SH SEE ALSO
+ .nf
+--- a/doc/gluster.8     2011-04-22 19:37:28.000000000 +0200
++++ b/doc/gluster.8     2011-05-16 11:56:14.318682346 +0200
+@@ -121,7 +121,7 @@
+ Exit the gluster command line interface.
+
+ .SH FILES
+-/etc/glusterd/*
++/var/lib/glusterd/*
+ .SH SEE ALSO
+ .nf
+ \fBfusermount\fR(1), \fBmount.glusterfs\fR(8), \fBglusterfs\fR(8), \fBglusterd\fR(8)
\ No newline at end of file
diff --git a/sys-cluster/glusterfs/glusterfs-3.2.0.ebuild b/sys-cluster/glusterfs/glusterfs-3.2.0.ebuild
new file mode 100644
index 000000000000..770ab89af3f8
--- /dev/null
+++ b/sys-cluster/glusterfs/glusterfs-3.2.0.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/glusterfs/glusterfs-3.2.0.ebuild,v 1.1 2011/05/16 10:13:39 ultrabug Exp $
+
+EAPI=4
+
+inherit autotools elisp-common eutils multilib versionator
+
+DESCRIPTION="GlusterFS is a powerful network/cluster filesystem"
+HOMEPAGE="http://www.gluster.org/"
+SRC_URI="http://ftp.gluster.com/pub/gluster/${PN}/$(get_version_component_range '1-2')/${PV}/${P}.tar.gz"
+
+LICENSE="AGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="emacs extras +fuse infiniband static-libs vim-syntax"
+
+DEPEND="emacs? ( virtual/emacs )
+		fuse? ( >=sys-fs/fuse-2.7.0 )
+		infiniband? ( sys-infiniband/libibverbs )"
+RDEPEND="${DEPEND}"
+
+SITEFILE="50${PN}-mode-gentoo.el"
+
+src_prepare() {
+	epatch "${FILESDIR}/${PN}-3.1.0-parallel-build.patch" \
+		"${FILESDIR}/${PN}-docdir.patch" \
+		"${FILESDIR}/glusterd-3.2.0-workdir.patch"
+	sed -i -e "s/ -ggdb3//g" -e "s/ -m64//g" argp-standalone/configure.ac || die
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		$(use_enable fuse fuse-client) \
+		$(use_enable infiniband ibverbs) \
+		$(use_enable static-libs static) \
+		--enable-georeplication \
+		--disable-bdb \
+		--docdir=/usr/share/doc/${PF} \
+		--localstatedir=/var
+}
+
+src_compile() {
+	emake
+	if use emacs ; then
+		elisp-compile extras/glusterfs-mode.el || die
+	fi
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+
+	if use emacs ; then
+		elisp-install ${PN} extras/glusterfs-mode.el* || die
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+	fi
+
+	if use vim-syntax ; then
+		insinto /usr/share/vim/vimfiles/ftdetect; doins "${FILESDIR}/glusterfs.vim"
+		insinto /usr/share/vim/vimfiles/syntax; doins extras/glusterfs.vim
+	fi
+
+	if use extras ; then
+		newbin extras/backend-xattr-sanitize.sh glusterfs-backend-xattr-sanitize
+		newbin extras/backend-cleanup.sh glusterfs-backend-cleanup
+		newbin extras/migrate-unify-to-distribute.sh glusterfs-migrate-unify-to-distribute
+		newbin extras/disk_usage_sync.sh glusterfs-disk-usage-sync
+	fi
+
+	dodoc AUTHORS ChangeLog NEWS README THANKS
+
+	newinitd "${FILESDIR}/${PN}.initd" glusterfsd
+	newinitd "${FILESDIR}/glusterd.initd" glusterd
+	newconfd "${FILESDIR}/${PN}.confd" glusterfsd
+
+	keepdir /var/log/${PN}
+	keepdir /var/lib/glusterd
+}
+
+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
+	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
+	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
+	elog "For more information on how to mount exported GlusterFS filesystems visit:"
+	elog "http://www.gluster.org/docs/index.php/Mounting_a_GlusterFS_Volume"
+	elog
+	elog "If you are upgrading from glusterfs 3.0.x please read:"
+	elog "http://www.gluster.com/community/documentation/index.php/Gluster_3.0_to_3.1_Upgrade_Guide"
+	elog
+	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."
+
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}