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.

Package-Manager: portage-2.2_rc90/cvs/Linux x86_64

6 files changed, 48 insertions, 127 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/Manifest b/sys-cluster/glusterfs/Manifest
index 5b26af786ba6..2c0bd96b0cfa 100644
--- a/sys-cluster/glusterfs/Manifest
+++ b/sys-cluster/glusterfs/Manifest
@@ -3,22 +3,20 @@ Hash: SHA1
 
 AUX 50glusterfs-mode-gentoo.el 169 RMD160 406c0dd2d79d054f059fcae29961fb6b7950e367 SHA1 5cb956b94b2704d244a4031093305de3243a7a86 SHA256 2467d044665d16dd95f78f7a7a104099ce00849cd0a2a86b110fe4c91b316a9d
 AUX glusterfs-2.0.8-docdir.patch 1644 RMD160 6961d29068c6b556f195615b789188f28e80b181 SHA1 4ff29870fae0039f390945ccaee3bcd25c87ae70 SHA256 d2922af3e15faae8ae06102a757b158b510b27cc11ad9ffe643ca67e2046ba07
-AUX glusterfs-2.0.8-parallel-make.patch 472 RMD160 62033a196373a90e522d323bea2e1cb0ce27b5c9 SHA1 a18c9cfe9e72438baef0b24faa67f8eb94d9e08d SHA256 761fea76024bdc811c3af08af1cc3d9959e549990662705df0e9cf3588f52d49
+AUX glusterfs-3.1.0-parallel-build.patch 659 RMD160 a5127f529387a0f9a543c666d139beac6f8b306c SHA1 bf1d566d9b306b44f0a26db7d2c9ddaa10f8a872 SHA256 7aeb616d41bf898d1df2cf4773802e88e41e13271184eab03c46034a9c22027c
 AUX glusterfs.confd 129 RMD160 ba0a6f22452b70cb3a7eb6f3bdd2b06e7c441b04 SHA1 c83f9e5c0becaf798b30b1709ea7086b56dd2992 SHA256 a9023ba1112ceb4597c654228f0beb0053ed695aeb32c65e0749a7157fab563d
 AUX glusterfs.initd 3134 RMD160 6606d3c3ee825e1af9624d66f5a46e30270e73a3 SHA1 68fcfa5b64dc6b133036b645c64ba75a7afbc126 SHA256 ffa622d26add72dafc1b1f8e6de716b14a6d99911888a344dc7d236fb7667d6e
 AUX glusterfs.vim 139 RMD160 17a4589550934fd8fd3523d0075af7686fc8f905 SHA1 8aa880c49a7bd1a0e185539acede53840b138746 SHA256 f214c1c8a01c9184b535fa7ae307200a8a1dc83fd42e92bdd57a7b1cae1dc099
-DIST glusterfs-3.0.4.tar.gz 1687595 RMD160 7d59afe97532576c8afecbce044e7a1b7f31a2f2 SHA1 90bad8d372167ad91810f2981240e3a7c3a75e02 SHA256 487774ec8e012c5af94dd2bcbea06b57c9399d0a8a7ac729afbd183cb014cc2c
-DIST glusterfs-3.0.5.tar.gz 1698376 RMD160 2316dd43e7d4db98a8a619414cbe3d0546e678b4 SHA1 15ff9777cc23afa61f253bcbea2ebdd7a65ef82a SHA256 f1967a3cc4eb0269404980fe2e45a348ade1f8d2d0caa82c5dfea4341e0d6396
-EBUILD glusterfs-3.0.4.ebuild 3349 RMD160 fe1cb17f0fc5a7b00446b03d7bc3a56de3f3311d SHA1 bd9a07d1142fbc73117a362896547be539e0cb8a SHA256 eca7a718ff1aea793d94793c2e4949d046c61cbf5c029ce7dd0ff9ab42f3558a
-EBUILD glusterfs-3.0.5.ebuild 3077 RMD160 ef721431cb30e14f75644a83fee97152e3845f7c SHA1 440a4d241bb46275e3c1d6994fc0ba2fbbdbf47b SHA256 d8cd8af19733253af4b2e9cf8d9326605cae0920f762a5e1e2daba3584e30dad
-MISC ChangeLog 2011 RMD160 236797bfb32aeededf8d56dbdfc305a7616eed76 SHA1 e34d04162e2834cfbaeaa84b307a704a50236e08 SHA256 c3aab6b3e79b6af2050f669aeb163626db1b5fa82fbe1fd5c9435c571e467c36
+DIST glusterfs-3.1.0.tar.gz 2043401 RMD160 96f8944cfe41f7d5a7971010ea47283c26998821 SHA1 b783b7be68f890684fbdc45b96bc30b092de692c SHA256 47c7d8f53f46c0a9c77bad7c1e098b63be2a9c128b379e409c81a1f37ec17da7
+EBUILD glusterfs-3.1.0.ebuild 3239 RMD160 0741ef3bb4630e9e05b5ecdf43e830b2890c9677 SHA1 909091cd21c9c03557e66e25632c5f3ba866845f SHA256 52ebd46d341c069276d8680c9cc611964a54c4788a0f2e21147d2c300001ac8d
+MISC ChangeLog 2461 RMD160 1271b297605cb794bab32e39d3763773d932a680 SHA1 36213cb633e36711f348f573e029c4b4b1e96746 SHA256 d5d3b9789ab3e805c8ef5a447c08cc62dd49dde24ea4ff1f5c00cde7aa577a49
 MISC metadata.xml 842 RMD160 2e8fccda5c50a0c64caf17ae528b59d4c41f5373 SHA1 9f10069f096be61a347ccdccc21f30a7411e4b5f SHA256 2a717e590d518af4d7eec71b92cacece17c0cb0c3283f37793e093b2def0ae04
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iJwEAQECAAYFAkyKjSIACgkQIiMqcbOVdxSZ4QP+JUg9lwGLaUWdRxDU98oD6XVX
-JAmbw4oCBdvGHJelLDAKDoceLcjMXADdHt06QCD5G5KT5u8nffmjccBfIZU2pcqH
-bBu5myt/9k26ec82CGWPIzlXFevpMWDpoI5cdhBtGhsnMU/Em7ZCSX5GPJZORXJq
-HC8jXH6tCBMZCc/vEks=
-=YdTk
+iJwEAQECAAYFAky3OUkACgkQIiMqcbOVdxRJ8AP/ZKEhVir1jgpGwMO/uAK1XOWD
+iCXcvkqc4v041NUI1JNCyi70Fgd8/wBDDY6Ad0E9EwGaOeo92NUNvgIFv5Wkz+JV
+0OZGWwhL7o9cCciRyOhI5MfcyVyymLUQz/C++qyrGHvfECdWSKLY+UojJcBYn8A4
+Z1fPQER+gEGzssDEZmo=
+=ATV/
 -----END PGP SIGNATURE-----
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."