Version bump wrt bug 330603. Thanks to Aleksandr Yakimov <yaleks@gentoo.ru> for report. Update metadata.xml and remove old.

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

4 files changed, 38 insertions, 30 deletions

diff --git a/sys-cluster/glusterfs/ChangeLog b/sys-cluster/glusterfs/ChangeLog
index 0564d7f5012a..7dd24f0411fc 100644
--- a/sys-cluster/glusterfs/ChangeLog
+++ b/sys-cluster/glusterfs/ChangeLog
@@ -1,6 +1,13 @@
 # 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.10 2010/05/08 16:03:53 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/glusterfs/ChangeLog,v 1.11 2010/08/09 15:17:09 xarthisius Exp $
+
+*glusterfs-3.0.5 (09 Aug 2010)
+
+  09 Aug 2010; Kacper Kowalik <xarthisius@gentoo.org>
+  -glusterfs-3.0.2.ebuild, +glusterfs-3.0.5.ebuild, metadata.xml:
+  Version bump wrt bug 330603. Thanks to Aleksandr Yakimov
+  <yaleks@gentoo.ru> for report. Update metadata.xml and remove old.
 
 *glusterfs-3.0.4 (08 May 2010)
 
diff --git a/sys-cluster/glusterfs/Manifest b/sys-cluster/glusterfs/Manifest
index bfa67613897a..edb0a33971d2 100644
--- a/sys-cluster/glusterfs/Manifest
+++ b/sys-cluster/glusterfs/Manifest
@@ -7,16 +7,18 @@ AUX glusterfs-2.0.8-parallel-make.patch 472 RMD160 62033a196373a90e522d323bea2e1
 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.2.tar.gz 1673684 RMD160 c76a1c2f02857b1398887144da897095c2bbd429 SHA1 ea833e06b6a6031fd3cb6bae77d922a34fa910d8 SHA256 b9c795df91aa42b899700d5579fd44e60e866dec15299aaf0e87143cce7b6d13
 DIST glusterfs-3.0.4.tar.gz 1687595 RMD160 7d59afe97532576c8afecbce044e7a1b7f31a2f2 SHA1 90bad8d372167ad91810f2981240e3a7c3a75e02 SHA256 487774ec8e012c5af94dd2bcbea06b57c9399d0a8a7ac729afbd183cb014cc2c
-EBUILD glusterfs-3.0.2.ebuild 3349 RMD160 2e6b6c4b07f736a9c521214066aacbfc039e451c SHA1 a34168fd812be2ac431812ede89e8cf18141d4c9 SHA256 2d6a5a111c46ab91fffbe02986191334bcd0168f36c067d1826cf08117a00d92
+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
-MISC ChangeLog 1726 RMD160 cc50025646187eca41203016edb24e6c81b9c1b5 SHA1 f80a131089b50f8e8a38fa3080e8127114faeea7 SHA256 11287bc0ef12102ca65f5ed13dfeba1e75ec5946fd1207748561a7b0a377959a
-MISC metadata.xml 841 RMD160 af0e9efe274b599905c51048f826016e78b2fc62 SHA1 45cc9a8e2a1fdfcf9eadaa79e00792bce0ed7d55 SHA256 e3eb8442866267d664a641b946a9d48b7116ec664af8d3c300d4d34f1b1958ec
+EBUILD glusterfs-3.0.5.ebuild 3077 RMD160 ef721431cb30e14f75644a83fee97152e3845f7c SHA1 440a4d241bb46275e3c1d6994fc0ba2fbbdbf47b SHA256 d8cd8af19733253af4b2e9cf8d9326605cae0920f762a5e1e2daba3584e30dad
+MISC ChangeLog 2011 RMD160 236797bfb32aeededf8d56dbdfc305a7616eed76 SHA1 e34d04162e2834cfbaeaa84b307a704a50236e08 SHA256 c3aab6b3e79b6af2050f669aeb163626db1b5fa82fbe1fd5c9435c571e467c36
+MISC metadata.xml 870 RMD160 2d192d007a7cc11d1e48a3a7cec97222edc56db0 SHA1 00de7154f1e433a946c7536f06cd022073e207a3 SHA256 c843086332cf2b41d0a6024eb534eb83efe4fa54c5944ff09a85b05a5b8d8fe7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.15 (GNU/Linux)
 
-iEYEARECAAYFAkvljCQACgkQ5BmOA85PVLiOLgCfX7xNaTRkBoS6HuPXR8SkxjMi
-jmUAoJ+u7uZ13ohKiJtCw3mFjgqLual8
-=9aEc
+iJwEAQECAAYFAkxgHAAACgkQIiMqcbOVdxT7iwP9GYv6WKKvStQwiBLEJvEEaB1r
+kL84hzxaI9107joJIUvHSChfKCrpqABlPRMGy2dNfIGS0D09hVFt2gwB9m79Dr+q
+rgSnQZ2HZiVt+n7KKnMdxv6M7grKAWAPp9WbrtLQaqZqnwbTUQjCGJk2xkGSSwr2
+9eZokFtuFm4lVeSfjDk=
+=7U+Q
 -----END PGP SIGNATURE-----
diff --git a/sys-cluster/glusterfs/glusterfs-3.0.2.ebuild b/sys-cluster/glusterfs/glusterfs-3.0.5.ebuild
index 04faedfcb8b3..ab613a5cc837 100644
--- a/sys-cluster/glusterfs/glusterfs-3.0.2.ebuild
+++ b/sys-cluster/glusterfs/glusterfs-3.0.5.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.2.ebuild,v 1.1 2010/02/22 22:31:39 alexxy Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/glusterfs/glusterfs-3.0.5.ebuild,v 1.1 2010/08/09 15:17:09 xarthisius Exp $
 
 EAPI="2"
 
@@ -13,37 +13,35 @@ SRC_URI="http://ftp.gluster.com/pub/gluster/${PN}/$(get_version_component_range
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="emacs +fuse infiniband static vim-syntax extras"
+IUSE="emacs +fuse infiniband static-libs vim-syntax extras"
 
 DEPEND="emacs? ( virtual/emacs )
 		fuse? ( >=sys-fs/fuse-2.7.0 )
 		infiniband? ( sys-infiniband/libibverbs )"
-RDEPEND="${DEPEND}
-		!net-fs/glusterfs"
+RDEPEND="${DEPEND}"
 
 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"
+	epatch "${FILESDIR}/${PN}-2.0.8-parallel-make.patch" \
+		"${FILESDIR}/${PN}-2.0.8-docdir.patch"
+	eautoreconf
 }
 
 src_configure() {
 	econf \
 		$(use_enable fuse fuse-client) \
 		$(use_enable infiniband ibverbs) \
-		$(use_enable static) \
+		$(use_enable static-libs static) \
 		--disable-bdb \
 		--docdir=/usr/share/doc/${PF} \
-		--localstatedir=/var || die
-#		$(use_enable berkdb bdb) \
+		--localstatedir=/var
 }
 
 src_compile() {
-	emake || die "Emake failed"
+	emake || die
 	if use emacs ; then
-		elisp-compile extras/glusterfs-mode.el || die "elisp-compile failed"
+		elisp-compile extras/glusterfs-mode.el || die
 	fi
 }
 
@@ -51,7 +49,7 @@ src_install() {
 	emake DESTDIR="${D}" install || die
 
 	if use emacs ; then
-		elisp-install ${PN} extras/glusterfs-mode.el* || die "elisp-install failed"
+		elisp-install ${PN} extras/glusterfs-mode.el* || die
 		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
 	fi
 
@@ -61,17 +59,17 @@ src_install() {
 	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"
+		newbin extras/volgen/glusterfs-volgen glusterfs-volgen || die
+		newbin extras/backend-xattr-sanitize.sh glusterfs-backend-xattr-sanitize || die
+		newbin extras/migrate-unify-to-distribute.sh glusterfs-migrate-unify-to-distribute || die
 	fi
 
-	dodoc AUTHORS ChangeLog NEWS README THANKS || die "dodoc failed"
+	dodoc AUTHORS ChangeLog NEWS README THANKS || die
 
-	newinitd "${FILESDIR}/${PN}.initd" glusterfsd || die "newinitd failed"
-	newconfd "${FILESDIR}/${PN}.confd" glusterfsd || die "newconfd failed"
+	newinitd "${FILESDIR}/${PN}.initd" glusterfsd || die
+	newconfd "${FILESDIR}/${PN}.confd" glusterfsd || die
 
-	keepdir /var/log/${PN} || die "keepdir failed"
+	keepdir /var/log/${PN} || die
 }
 
 pkg_postinst() {
diff --git a/sys-cluster/glusterfs/metadata.xml b/sys-cluster/glusterfs/metadata.xml
index b999e8effca6..be1e190439f2 100644
--- a/sys-cluster/glusterfs/metadata.xml
+++ b/sys-cluster/glusterfs/metadata.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>cluster</herd>
+	<herd>hp-cluster</herd>
+	<herd>ha-cluster</herd>
 	<maintainer>
 		<email>alexxy@gentoo.org</email>
 		<name>Alexey Shvetsov</name>
@@ -13,6 +14,6 @@
 		<flag name='fuse'>Add FUSE mount helper</flag>
 		<flag name='extras'>Install extra helper scripts</flag>
 		<flag name='infiniband'>Add support for Infiniband ibverbs transport.
-			Librarys can be found in science overlay</flag>
+			Libraries can be found in science overlay</flag>
 	</use>
 </pkgmetadata>