Version bump, fixes bug 402543 by Bernd Feige <Bernd.Feige@gmx.net>

Package-Manager: portage-2.2.0_alpha85/cvs/Linux x86_64

3 files changed, 146 insertions, 7 deletions

diff --git a/sys-cluster/glusterfs/ChangeLog b/sys-cluster/glusterfs/ChangeLog
index b3bb7c28957e..46cc9a7fb591 100644
--- a/sys-cluster/glusterfs/ChangeLog
+++ b/sys-cluster/glusterfs/ChangeLog
@@ -1,6 +1,11 @@
 # 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.34 2011/12/21 08:44:17 floppym Exp $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/glusterfs/ChangeLog,v 1.35 2012/02/07 16:27:31 xarthisius Exp $
+
+*glusterfs-3.2.5 (07 Feb 2012)
+
+  07 Feb 2012; Kacper Kowalik <xarthisius@gentoo.org> +glusterfs-3.2.5.ebuild:
+  Version bump, fixes bug 402543 by Bernd Feige <Bernd.Feige@gmx.net>
 
   21 Dec 2011; Mike Gilbert <floppym@gentoo.org> glusterfs-3.2.4.ebuild:
   Force python2 usage. Should resolve bug 372689. Patch by Ian Delaney.
diff --git a/sys-cluster/glusterfs/Manifest b/sys-cluster/glusterfs/Manifest
index 13e7539ac934..4f85abd9e187 100644
--- a/sys-cluster/glusterfs/Manifest
+++ b/sys-cluster/glusterfs/Manifest
@@ -12,14 +12,26 @@ 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.2.4.tar.gz 2386706 RMD160 15c2a6407d8c9bf799c8adcf8c3f8540b1c8ecfb SHA1 7102ce8ea497cad61844d60e5b374869fa51da02 SHA256 8a30fb1fa4aa3d745521b1667e40b9bc8404ced99e519992d8c18a3c883dafb5
+DIST glusterfs-3.2.5.tar.gz 2413509 RMD160 13d0f8c1a2a1e7d39a43899bc9d09f7f13fea844 SHA1 10f2e81ec7f118432c279236509fc3d89ab8f690 SHA256 561c8ab00f8f4613f5be0737d3182f549ab07e24330f2cdc7a698b9dfedba7b5
 EBUILD glusterfs-3.1.2.ebuild 3652 RMD160 ff4adc4517cbe293d61edf2e72cf8ab690229d44 SHA1 6e850fc8894da152512ee49ae9f70fe2e0375702 SHA256 c7c607c87492fe366f805eaad997d30debd0062a668dede08c8d5749cb594836
 EBUILD glusterfs-3.2.4.ebuild 3700 RMD160 0cbf0736bff357371d10c2fe23a096b663a9feda SHA1 7c00eae0c809938921389b38c7a1f2b6a11b68fa SHA256 1737e4caddc2306769316a3836dfdc4380944d44ae15dadae4f504b1cc50df88
-MISC ChangeLog 6097 RMD160 c0288e8120629619bc9f550b05b0294022f9c5d5 SHA1 8270ec52b53f9f43eee441c209ee5e8dce4a8240 SHA256 2a45a08e630186f5ec54022be00597256778e1f5b4824d4555c7a972f416b532
+EBUILD glusterfs-3.2.5.ebuild 3703 RMD160 03a90c676ccf2de740b3634e62ea48f082498068 SHA1 d6a1032d36815ac9014d6ec86daa8b4eb9dbca61 SHA256 720b377b6524b9473b6abcec8c58823f5ecfa3b5c88004c5c1deeb45819ed09f
+MISC ChangeLog 6282 RMD160 ba18cd3386d16390bba1c8c393cb4a81e6d50b24 SHA1 8bf418fd59671038cd95cf0d794999c6f950c7d6 SHA256 62cb9eff756b41396fe57f5a8bfecf57de64bcf2b447e77fcf3e8bf0718a7b7b
 MISC metadata.xml 842 RMD160 2e8fccda5c50a0c64caf17ae528b59d4c41f5373 SHA1 9f10069f096be61a347ccdccc21f30a7411e4b5f SHA256 2a717e590d518af4d7eec71b92cacece17c0cb0c3283f37793e093b2def0ae04
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.18 (GNU/Linux)
 
-iF4EAREIAAYFAk7xnGYACgkQC77qH+pIQ6TRhgEAhn+theU8VLm+eqMVb3wbF3Zj
-ffmxLhMWFzEvBudOKvAA/RTkmjgAJsstN7rn+dbDnjvPdlhZxsA/lzN+tBqr9eaj
-=XbQ7
+iQIcBAEBCAAGBQJPMVD9AAoJEF0huFKJUZL5smMP/AuCmveC8oGdA8/N4SPU71sl
+sgANhq8nFYOZbkoU6bne6mh8bMUhY3XFlNI/PQu6NEn617oYoRx8V6Kzb2/4NcUW
+OoheZBRiK3brAXLJ+lyEPhBtEUXU6vy7uLsn7SPYICBKTk8SPtiOI7WWw7uHBH1V
+3yrnUmRiyHs/eou/vRvVgXIZQGDYlvA4wc477m1AcetuAoox3N8m2g85GjoU5tpd
+MWCWWHT7ocUzIsv6pqeThwZJ2YLSG0IaVVkrFtX2zSL7wb+38oamzsFL46tX58a5
+CtB5KZDjjDcaTpjfB0dhE8btq0/EHs+hKAPdDCLR2/Q6LoBo99ptEdFLPeWu7Wfk
+eQJvc0xzMzEununc2eZ/dNKvgxy+RzOZcYiGWn4tt07KLslOoum08CWl4ad2pIsH
+hKnKtK/h2fJpiz8aUCJD7FlCUYn8i73kFS2sibbMagwqQGs5C0rzf8saZb7hgdhk
+Iv4e6hkeaNp1oSr491dwyOOiBKbdcqyRss6Px/DzenkgybcEcumFophKKL7S5Qbd
+INTd8cjKnFb255WOa4PLFShAdoTeiHSGBHOKy9M7kMtBLGB13rhvY8Y4nr4DKtAC
+ccqLmmqGbDDMS9MeWuSBLT6gwaqRq1gxhYCROO9FK63CpFWCyGwnaD2gl4OAAqsv
+y9PETU1nmcMn62hHXQXP
+=Mox8
 -----END PGP SIGNATURE-----
diff --git a/sys-cluster/glusterfs/glusterfs-3.2.5.ebuild b/sys-cluster/glusterfs/glusterfs-3.2.5.ebuild
new file mode 100644
index 000000000000..f329d600939d
--- /dev/null
+++ b/sys-cluster/glusterfs/glusterfs-3.2.5.ebuild
@@ -0,0 +1,122 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/glusterfs/glusterfs-3.2.5.ebuild,v 1.1 2012/02/07 16:27:31 xarthisius Exp $
+
+EAPI=4
+
+PYTHON_DEPEND="2"
+inherit autotools elisp-common eutils multilib python 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"
+
+RDEPEND="emacs? ( virtual/emacs )
+		fuse? ( >=sys-fs/fuse-2.7.0 )
+		infiniband? ( sys-infiniband/libibverbs )"
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	sys-devel/bison
+	sys-devel/flex"
+
+SITEFILE="50${PN}-mode-gentoo.el"
+
+pkg_setup() {
+	python_set_active_version 2
+	python_pkg_setup
+}
+
+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
+
+	python_convert_shebangs -r 2 "${ED}"
+}
+
+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
+	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."
+
+	if [[ ${REPLACING_VERSIONS} < 3.1 ]]; then
+		elog
+		elog "You are upgrading from a previous version of ${PN}, please read:"
+		elog "http://www.gluster.com/community/documentation/index.php/Gluster_3.0_to_3.2_Upgrade_Guide"
+	fi
+
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}