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

(Portage version: 2.2.0_alpha85/cvs/Linux x86_64)

2 files changed, 129 insertions, 2 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/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
+}