[sys-cluster/glusterfs] Version bump & clean up

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

4 files changed, 25 insertions, 119 deletions

diff --git a/sys-cluster/glusterfs/ChangeLog b/sys-cluster/glusterfs/ChangeLog
index 71b7005facbc..a2caf191f5db 100644
--- a/sys-cluster/glusterfs/ChangeLog
+++ b/sys-cluster/glusterfs/ChangeLog
@@ -1,6 +1,12 @@
 # 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.24 2011/04/17 14:57:06 fauli Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/glusterfs/ChangeLog,v 1.25 2011/04/27 12:06:59 alexxy Exp $
+
+*glusterfs-3.1.4 (27 Apr 2011)
+
+  27 Apr 2011; Alexey Shvetsov <alexxy@gentoo.org> -glusterfs-3.1.1.ebuild,
+  -glusterfs-3.1.3-r1.ebuild, +glusterfs-3.1.4.ebuild:
+  Version bump & clean up
 
   17 Apr 2011; Christian Faulhammer <fauli@gentoo.org>
   glusterfs-3.1.2.ebuild:
diff --git a/sys-cluster/glusterfs/Manifest b/sys-cluster/glusterfs/Manifest
index 1c08223d2678..aae74a9302c0 100644
--- a/sys-cluster/glusterfs/Manifest
+++ b/sys-cluster/glusterfs/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX 50glusterfs-mode-gentoo.el 169 RMD160 406c0dd2d79d054f059fcae29961fb6b7950e367 SHA1 5cb956b94b2704d244a4031093305de3243a7a86 SHA256 2467d044665d16dd95f78f7a7a104099ce00849cd0a2a86b110fe4c91b316a9d
 AUX glusterd-workdir.patch 1528 RMD160 c18b1407bcf02e6504afca8aaf1dba894856dc11 SHA1 6d7a428df9e6dfc8da75831ca64dbc84253b3a36 SHA256 b614c90279fd0546d353f017616dff798e73a20c45fa846d57a35bf4569389df
@@ -9,18 +9,26 @@ AUX glusterfs-docdir.patch 1644 RMD160 6961d29068c6b556f195615b789188f28e80b181
 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.1.1.tar.gz 2072508 RMD160 339747da11800dae0e80feaa9ec10ed899dc85cd SHA1 4cbdb6381aadc5b8053487fabd2cedb1bf0af0ce SHA256 5844d30a804c96c62d4c88072c0eaa73b28a597e51dd1bf6570bc3e7dd3f5d8a
 DIST glusterfs-3.1.2.tar.gz 2086469 RMD160 f9e744ef999f82b70f173930f1f1cee96fe61e84 SHA1 ccae6965595abf8af881b736a3fe4873fc6b28e4 SHA256 9a4e910431f572aa180a3ad1821f7524773ec1e8f06342c4040f26619f832838
-DIST glusterfs-3.1.3.tar.gz 2119808 RMD160 39764f42f3cf7ccd759f76cc4aba1e5a9a13b3e3 SHA1 f5940ac33caea4fe82379ed89fdf3cf872176423 SHA256 323421c4b973c81657ccb8b934cb18d394301611d47c3b7920b2f0ac8048a73f
-EBUILD glusterfs-3.1.1.ebuild 3536 RMD160 981f8ecc457fefb27c327fc9fbeeda5c3c12c2e3 SHA1 5e7ec67db0fddf6a52f52b0d2f136bf98076d12b SHA256 cf965c883641c5bbef20ae4d2703aba3dcb5e375985eeb226692f539f274118d
+DIST glusterfs-3.1.4.tar.gz 2173373 RMD160 dc7db013790dc2366f574e6e8a4fca6a67078cdc SHA1 1166063b4a3fa25927b16c88025cc1186c73f420 SHA256 a3d284e63b4d5fcbd1e8df99350b7254dd7e877476206a32f6b5877515f5fe04
 EBUILD glusterfs-3.1.2.ebuild 3593 RMD160 e2c6261ee2c4118112f850d1b282c2e1863d1b8e SHA1 8918ee77e65bbab8b587753fb1421b2b94262918 SHA256 73c6236936f64983d3b115d878a207d42ab8836e2b110f23ce15b3c2f4e07424
-EBUILD glusterfs-3.1.3-r1.ebuild 3673 RMD160 8da12129123dfd5f42c53cb34de89cc690c79b50 SHA1 11b8b82cf558a01410de2888d624bd58b71789f5 SHA256 90657e0f8b40fb3c89ed174eef42868fc14731759184f6a53aee2497033c47ba
-MISC ChangeLog 4262 RMD160 7a8086afc90bb91ab4f8f95e790dfa2567a53c40 SHA1 afbc542ebfb3f866586dfaec32d330c4dec32217 SHA256 387e35419577f9919d146c192d8288d65b211fdc0fb43030f7e05d6aa7f44864
+EBUILD glusterfs-3.1.4.ebuild 3668 RMD160 0e942f629e4377482f84ce92128e55a43048236d SHA1 f3b47d31cacd05fd0c517306299a9fc33f829b05 SHA256 d899ce47462847548a015dec8fc061aaec2ca3a719a70b0c758d2f144e75f282
+MISC ChangeLog 4453 RMD160 94b50572e91181377e877bfc8f3687d8235c53cf SHA1 ff4d2ab6040e927cae84b9e494b8fd99f9547274 SHA256 71f0f4172172c01ca264621b9f39098c9aaf4058b7040145c12c0dd1e76dd53d
 MISC metadata.xml 842 RMD160 2e8fccda5c50a0c64caf17ae528b59d4c41f5373 SHA1 9f10069f096be61a347ccdccc21f30a7411e4b5f SHA256 2a717e590d518af4d7eec71b92cacece17c0cb0c3283f37793e093b2def0ae04
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk2q/8cACgkQNQqtfCuFneOUnQCdH7j95U3uIfhKrcd54QlYKObr
-w14AnAqqupmybpXP43++3elgrEt7IBzp
-=VE2k
+iQIcBAEBCAAGBQJNuAbbAAoJEOf+E+/4L5LmTi8P/jcK7+BOUHhPzoAacic30cFx
+iSYRsorRCSuihkKt1mQ6XbwnZcYWSuZPP2mkVPka40OYIK+uxNVk/SboKSIMam33
+uUJ7+Nb2AUf5H5D0B1W6QPjz3e86pt9XbGtfk6q5XY6Ek9NRdso2FjahKqpCqgOg
+JdaPkr0tHaxlMKs7SzMQ9dLQhm+B7I2uBY1hNcQy96b44NDkZtGkHLPMqYpZreRj
+D7Y7YoYkGFWPErGBSJ829ximfgwnbr7PLBl4jC6WmYXLIztkhFlWIjPPXKrZmgPG
+aUzmPuScqo6jiY42zz6pDtuyJyM27Sccr+c1DKx3K7MbXzjl2dvDyqzI/s8BroeK
+Sb4P5JzDeVUkSmJsU8k/jLCgVm2uF0C6jZBTTmPCVSU/bwlzkG0HiPpV06/+gLcg
+osu4dBbuMQqPgS1oTiEeHWj6FEItjmexr0wmo1QYhy+qvdRhYp7Yv6WKvbUqB5aj
+Pv00aUHzI63sNLJzXxb5UBbiVzFux9W8cwphazDb4V2eZmG8dflHHoYsapcbipK/
+WH7DiNy4H2VeTS6Vs9bCMBxq4FfcuVoUWUTMVsaaRQfJkBVWW6zmawaCjFWGEfWh
+FW1NCCEB8UIRaHeswLsOVP+8LDmnVpAFPpoZoGAbunLdPmwsZcFt7MMVP99iGd9p
+Fxn6vofQ5r+v5vXP8ycs
+=reAq
 -----END PGP SIGNATURE-----
diff --git a/sys-cluster/glusterfs/glusterfs-3.1.1.ebuild b/sys-cluster/glusterfs/glusterfs-3.1.1.ebuild
deleted file mode 100644
index 84eb59892f43..000000000000
--- a/sys-cluster/glusterfs/glusterfs-3.1.1.ebuild
+++ /dev/null
@@ -1,108 +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.1.1.ebuild,v 1.3 2010/12/31 20:43:50 phajdan.jr Exp $
-
-EAPI="3"
-
-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="AGPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="emacs extras +fuse infiniband static-libs vim-syntax"
-
-DEPEND="emacs? ( virtual/emacs )
-		fuse? ( >=sys-fs/fuse-2.7.0 )
-		infiniband? ( sys-infiniband/libibverbs )"
-RDEPEND="${DEPEND}"
-
-SITEFILE="50${PN}-mode-gentoo.el"
-
-src_prepare() {
-	epatch "${FILESDIR}/${PN}-3.1.0-parallel-build.patch" \
-		"${FILESDIR}/${PN}-docdir.patch" \
-		"${FILESDIR}/glusterd-workdir.patch"
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable fuse fuse-client) \
-		$(use_enable infiniband ibverbs) \
-		$(use_enable static-libs static) \
-		--disable-bdb \
-		--docdir=/usr/share/doc/${PF} \
-		--localstatedir=/var
-}
-
-src_compile() {
-	emake || die
-	if use emacs ; then
-		elisp-compile extras/glusterfs-mode.el || die
-	fi
-}
-
-src_install() {
-	emake DESTDIR="${D}" install || die
-
-	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" || 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
-		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
-
-	newinitd "${FILESDIR}/${PN}.initd" glusterfsd || die
-	newinitd "${FILESDIR}/glusterd.initd" glusterd || die
-	newconfd "${FILESDIR}/${PN}.confd" glusterfsd || die
-
-	keepdir /var/log/${PN} || die
-	keepdir /var/lib/glusterd || die
-}
-
-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
-	elog "For more information on how to mount exported GlusterFS filesystems visit:"
-	elog "http://www.gluster.org/docs/index.php/Mounting_a_GlusterFS_Volume"
-	elog
-	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"
-	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."
-
-	use emacs && elisp-site-regen
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/sys-cluster/glusterfs/glusterfs-3.1.3-r1.ebuild b/sys-cluster/glusterfs/glusterfs-3.1.4.ebuild
index 8bc1ddb4c807..029d6b77e095 100644
--- a/sys-cluster/glusterfs/glusterfs-3.1.3-r1.ebuild
+++ b/sys-cluster/glusterfs/glusterfs-3.1.4.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/glusterfs/glusterfs-3.1.3-r1.ebuild,v 1.1 2011/03/21 14:43:05 ultrabug Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/glusterfs/glusterfs-3.1.4.ebuild,v 1.1 2011/04/27 12:06:59 alexxy Exp $
 
 EAPI="3"