Version bump wrt bug 340849. Fix parallel build issues wrt bug 323957. Thanks to Richard Scott <gentoo.bugs@pointb.co.uk> and Dennis Schridde <devurandom@gmx.net> respectively. Drop old.

(Portage version: 2.2_rc90/cvs/Linux x86_64)

5 files changed, 39 insertions, 116 deletions

diff --git a/sys-cluster/glusterfs/ChangeLog b/sys-cluster/glusterfs/ChangeLog
index 7dd24f0411fc..7143b4f99f5e 100644
--- a/sys-cluster/glusterfs/ChangeLog
+++ b/sys-cluster/glusterfs/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for sys-cluster/glusterfs
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/glusterfs/ChangeLog,v 1.11 2010/08/09 15:17:09 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/glusterfs/ChangeLog,v 1.12 2010/10/14 17:09:17 xarthisius Exp $
+
+*glusterfs-3.1.0 (14 Oct 2010)
+
+  14 Oct 2010; Kacper Kowalik <xarthisius@gentoo.org>
+  -files/glusterfs-2.0.8-parallel-make.patch, -glusterfs-3.0.4.ebuild,
+  -glusterfs-3.0.5.ebuild, +glusterfs-3.1.0.ebuild,
+  +files/glusterfs-3.1.0-parallel-build.patch:
+  Version bump wrt bug 340849. Fix parallel build issues wrt bug 323957.
+  Thanks to Richard Scott <gentoo.bugs@pointb.co.uk> and Dennis Schridde
+  <devurandom@gmx.net> respectively. Drop old.
 
 *glusterfs-3.0.5 (09 Aug 2010)
 
diff --git a/sys-cluster/glusterfs/files/glusterfs-2.0.8-parallel-make.patch b/sys-cluster/glusterfs/files/glusterfs-2.0.8-parallel-make.patch
deleted file mode 100644
index fbe63330f03f..000000000000
--- a/sys-cluster/glusterfs/files/glusterfs-2.0.8-parallel-make.patch
+++ /dev/null
@@ -1,11 +0,0 @@
-diff --git a/glusterfsd/src/Makefile.am b/glusterfsd/src/Makefile.am
-index 0609179..548ed3a 100644
---- a/glusterfsd/src/Makefile.am
-+++ b/glusterfsd/src/Makefile.am
-@@ -20,5 +20,6 @@ uninstall-local:
- install-data-local:
- 	$(INSTALL) -d -m 755 $(DESTDIR)$(localstatedir)/run
- 	$(INSTALL) -d -m 755 $(DESTDIR)$(localstatedir)/log/glusterfs
-+	$(INSTALL) -d -m 755 $(DESTDIR)$(sbindir)
- 	rm -f $(DESTDIR)$(sbindir)/glusterfs
- 	ln -s glusterfsd $(DESTDIR)$(sbindir)/glusterfs
diff --git a/sys-cluster/glusterfs/files/glusterfs-3.1.0-parallel-build.patch b/sys-cluster/glusterfs/files/glusterfs-3.1.0-parallel-build.patch
new file mode 100644
index 000000000000..9320c12ea7b1
--- /dev/null
+++ b/sys-cluster/glusterfs/files/glusterfs-3.1.0-parallel-build.patch
@@ -0,0 +1,22 @@
+--- glusterfsd/src/Makefile.am
++++ glusterfsd/src/Makefile.am
+@@ -20,5 +20,6 @@ uninstall-local:
+ install-data-local:
+ 	$(INSTALL) -d -m 755 $(DESTDIR)$(localstatedir)/run
+ 	$(INSTALL) -d -m 755 $(DESTDIR)$(localstatedir)/log/glusterfs
++	$(INSTALL) -d -m 755 $(DESTDIR)$(sbindir)
+ 	rm -f $(DESTDIR)$(sbindir)/glusterfs
+ 	ln -s glusterfsd $(DESTDIR)$(sbindir)/glusterfs
+--- libglusterfs/src/Makefile.am
++++ libglusterfs/src/Makefile.am
+@@ -15,7 +15,9 @@
+ graph.lex.c: graph.l y.tab.h
+ 	$(LEX) -t $(srcdir)/graph.l > $@
+ 
+-y.tab.c y.tab.h: graph.y
++y.tab.c: y.tab.h
++
++y.tab.h: graph.y
+ 	$(YACC) -d $(srcdir)/graph.y
+ 
+ CLEANFILES = graph.lex.c y.tab.c y.tab.h
diff --git a/sys-cluster/glusterfs/glusterfs-3.0.4.ebuild b/sys-cluster/glusterfs/glusterfs-3.0.4.ebuild
deleted file mode 100644
index 0014160ac7be..000000000000
--- a/sys-cluster/glusterfs/glusterfs-3.0.4.ebuild
+++ /dev/null
@@ -1,101 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/glusterfs/glusterfs-3.0.4.ebuild,v 1.1 2010/05/08 16:03:53 alexxy Exp $
-
-EAPI="2"
-
-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="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="emacs +fuse infiniband static vim-syntax extras"
-
-DEPEND="emacs? ( virtual/emacs )
-		fuse? ( >=sys-fs/fuse-2.7.0 )
-		infiniband? ( sys-infiniband/libibverbs )"
-RDEPEND="${DEPEND}
-		!net-fs/glusterfs"
-
-SITEFILE="50${PN}-mode-gentoo.el"
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-2.0.8-parallel-make.patch"
-	epatch "${FILESDIR}/${PN}-2.0.8-docdir.patch"
-	eautoreconf || die "eautoreconf failed"
-}
-
-src_configure() {
-	econf \
-		$(use_enable fuse fuse-client) \
-		$(use_enable infiniband ibverbs) \
-		$(use_enable static) \
-		--disable-bdb \
-		--docdir=/usr/share/doc/${PF} \
-		--localstatedir=/var || die
-#		$(use_enable berkdb bdb) \
-}
-
-src_compile() {
-	emake || die "Emake failed"
-	if use emacs ; then
-		elisp-compile extras/glusterfs-mode.el || die "elisp-compile failed"
-	fi
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-
-	if use emacs ; then
-		elisp-install ${PN} extras/glusterfs-mode.el* || die "elisp-install failed"
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-	fi
-
-	if use vim-syntax ; then
-		insinto /usr/share/vim/vimfiles/ftdetect; doins "${FILESDIR}/glusterfs.vim" || die
-		insinto /usr/share/vim/vimfiles/syntax; doins extras/glusterfs.vim || die
-	fi
-
-	if use extras ; then
-		newbin extras/volgen/glusterfs-volgen glusterfs-volgen || die "Failed to install bins"
-		newbin extras/backend-xattr-sanitize.sh glusterfs-backend-xattr-sanitize || die "Failed to install bins"
-		newbin extras/migrate-unify-to-distribute.sh glusterfs-migrate-unify-to-distribute || die "Failed to install bins"
-	fi
-
-	dodoc AUTHORS ChangeLog NEWS README THANKS || die "dodoc failed"
-
-	newinitd "${FILESDIR}/${PN}.initd" glusterfsd || die "newinitd failed"
-	newconfd "${FILESDIR}/${PN}.confd" glusterfsd || die "newconfd failed"
-
-	keepdir /var/log/${PN} || die "keepdir failed"
-}
-
-pkg_postinst() {
-	elog "The glusterfs startup script can be multiplexed."
-	elog "The default startup script uses /etc/conf.d/glusterfs to configure the"
-	elog "separate service.  To create additional instances of the glusterfs service"
-	elog "simply create a symlink to the glusterfs 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"
-	echo
-	elog "You can mount exported GlusterFS filesystems through /etc/fstab instead of"
-	elog "through a startup script instance.  For more information visit:"
-	elog "http://www.gluster.org/docs/index.php/Mounting_a_GlusterFS_Volume"
-	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."
-
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/sys-cluster/glusterfs/glusterfs-3.0.5.ebuild b/sys-cluster/glusterfs/glusterfs-3.1.0.ebuild
index ab613a5cc837..669bdb09f9f1 100644
--- a/sys-cluster/glusterfs/glusterfs-3.0.5.ebuild
+++ b/sys-cluster/glusterfs/glusterfs-3.1.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/glusterfs/glusterfs-3.0.5.ebuild,v 1.1 2010/08/09 15:17:09 xarthisius Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/glusterfs/glusterfs-3.1.0.ebuild,v 1.1 2010/10/14 17:09:17 xarthisius Exp $
 
 EAPI="2"
 
@@ -10,7 +10,7 @@ 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="GPL-3"
+LICENSE="AGPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="emacs +fuse infiniband static-libs vim-syntax extras"
@@ -23,7 +23,7 @@ RDEPEND="${DEPEND}"
 SITEFILE="50${PN}-mode-gentoo.el"
 
 src_prepare() {
-	epatch "${FILESDIR}/${PN}-2.0.8-parallel-make.patch" \
+	epatch "${FILESDIR}/${P}-parallel-build.patch" \
 		"${FILESDIR}/${PN}-2.0.8-docdir.patch"
 	eautoreconf
 }
@@ -87,6 +87,9 @@ pkg_postinst() {
 	elog "through a startup script instance.  For more information visit:"
 	elog "http://www.gluster.org/docs/index.php/Mounting_a_GlusterFS_Volume"
 	echo
+	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"
+	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."