version bump fix #499704

Package-Manager: portage-2.2.8/cvs/Linux x86_64
Manifest-Sign-Key: 0xB658FA13

3 files changed, 158 insertions, 6 deletions

diff --git a/sys-cluster/glusterfs/ChangeLog b/sys-cluster/glusterfs/ChangeLog
index 3c471c762cef..8a72a031703d 100644
--- a/sys-cluster/glusterfs/ChangeLog
+++ b/sys-cluster/glusterfs/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-cluster/glusterfs
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/glusterfs/ChangeLog,v 1.51 2013/12/31 09:04:47 ultrabug Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/glusterfs/ChangeLog,v 1.52 2014/01/31 13:23:02 ultrabug Exp $
+
+*glusterfs-3.4.2 (31 Jan 2014)
+
+  31 Jan 2014; Ultrabug <ultrabug@gentoo.org> +glusterfs-3.4.2.ebuild:
+  version bump fix #499704 thx to Rodrigo Severo and László Szalma
 
 *glusterfs-3.4.1 (31 Dec 2013)
 
diff --git a/sys-cluster/glusterfs/Manifest b/sys-cluster/glusterfs/Manifest
index b0c2ea379d6b..04157743940d 100644
--- a/sys-cluster/glusterfs/Manifest
+++ b/sys-cluster/glusterfs/Manifest
@@ -28,18 +28,20 @@ DIST glusterfs-3.3.0.tar.gz 2599586 SHA256 76d80ded9ecc5146131e9d59b03cbe09a1833
 DIST glusterfs-3.3.1.tar.gz 2636698 SHA256 19aaefe3a0f9059ae831b44c92944503cf439da82da23467101ac13da8b77519 SHA512 c32e95a0e4568a62fabcf0c52ad3d6a173b62c5536006c3680e3efd1240e2a68177e14891e11d1d16eff5eb67bf60108dbd44151c26241203d8ddb58f0270c69 WHIRLPOOL 30316bbdb7087dd32d35f0f017ea461711830f5450984edb6d6c527d7f9cae5ee307601887cf489a2d675180d1f21a77ac7901f37f44cc860cccbe510c5a18bf
 DIST glusterfs-3.4.0.tar.gz 3774842 SHA256 2a2a43fb52a7f6b8b00331acc5ea2c86a067a2f2901cca886a2348e919c0cbd8 SHA512 5eb08225c0dde5d2e7ea3de1531fdc155249647a0ffe8a472825cc5ca54762462811903e164dfb12f825dd569f7c1786275f843acf04f0668c0e6e7615a47381 WHIRLPOOL 05b194c94ede704631a7c8071b8857c38b01700c3b3cbfeb06708c026b8b18913cd233bee8508c04116ed0f9a15c919aec604927e9cd77566c6c633118347a25
 DIST glusterfs-3.4.1.tar.gz 3811931 SHA256 b5f1b4e3c6b86ecdfc5ff1b870ae3d3384bb2e3943565d6907c29ee6e21ab739 SHA512 94662dfef5e3060539d39adbde351489cb2b05bdfa76a54d9bbb628ddc897446b07175d8e22b126141833b4801d0357c897aa259803f2bc1921111f6b374ecc2 WHIRLPOOL 73ac2146be973d92304ec345ae63b746003f05803fc0ceeb03b4983f71034c329d35f9c023a6e8ab7cfe948f6d003ac93b59fdee7520686c3857eeef4d5f023b
+DIST glusterfs-3.4.2.tar.gz 3856046 SHA256 4fcd42b13b60a67587de98e60ff679803433bbb0c11aa2b40c4135e2358cedef SHA512 5d207e2d9437dacc5c53a205684419fb627c70870f7d2c4851b5a48f705886a04180a90a456bf6d7789b2a62fb6039c80a632d08629224b9594565b453085f50 WHIRLPOOL 8af9e92880b8c378d7329225666ef3347ba5a5510f3a6a513e340dd3b897339ab0817b93e50b20bd04c1b9438b3c5337b750737a2f51f1c76a727c110809b488
 EBUILD glusterfs-3.1.2.ebuild 3647 SHA256 e2835d83bf6e03f4b0bb9d4f7dd2749d0454204e401444a357fb4371d90c9be3 SHA512 ba02e24cc76ab53059ec76ce9f84aafdd2e1ea47ba9e34390f4f73bfc170a4037e65795af3d17315c19d5cb50f1e784d095cf2129d8debc102fb2305c1637def WHIRLPOOL f0f4285e4c3dbf0704c2e3770891f5997dd4468ff8b9e944f3a14e0e607744382451edd9afc05b6d485efef69d54a48b8ae20b3efb7103b6dee8ecf33a3d2122
 EBUILD glusterfs-3.2.7.ebuild 3702 SHA256 2a32929580fad41bf449a79bc4e5d195bbab6c8560f0a937b9bdadb790fe7ff3 SHA512 2a9530fb240f220d9e3581053edf4fe18f1545223386c03e2b4f1a36fe2832cd8abc33110d234160bfc4a07f2532e1f2a7f4c976253b5fb45ef3a71b99833dde WHIRLPOOL 5a3d7d1b6349a266d2bdeb9be3061610c99bf8338cc724dba70d9db55e37b2a1fb10e798ae13130f010cc88445f58aa3006b459bf502184898de3c36cd21c3c5
 EBUILD glusterfs-3.3.0.ebuild 3796 SHA256 bc7ebd431067f8e8b8c7c15ab16a2701e6d5e1b45935ec48216c516c2c8ae7c6 SHA512 af2a53e1e3786e7366a88a1d9191e3fc66204163e25b497668bbbee7b96e64d28212362bcb9ab6807ee229f6469eeee70e10919f9453161ae4423fc62445bf30 WHIRLPOOL 851ffce2dce2dd372a0a5e1af9f147ec517e5ba2118fe2ea33ba6c013b3ae4ddb0e4fa3332c3a8e4f3dc629bb88a5faa540e479425366cb1780485558572fcd6
 EBUILD glusterfs-3.3.1-r2.ebuild 4071 SHA256 688fac9b91eacff4ebde95f0e60ee48bd3e0c0063f3603186e6f902e85b81d3d SHA512 e510359e5ea465cc1c8b3545b88b204671ed0d4b0bf2739ed8a5a324c12a1b04855c5fee5c8f1153b2916eb180fc9d225282af4982b3ff831d997ce90e8f8896 WHIRLPOOL dc55997fc5b0d8d9f59bb54406bab2c5699f9ce4f244b0465899906235a95942cc2f502e174a694c5a42206939195712dcddd2c8750417f5a7a4d04881e19924
 EBUILD glusterfs-3.4.0-r1.ebuild 4807 SHA256 d139f9afdb9bbac0a266c4b8f23ca52ea44eaac238e52334ac53ac3ed964adf9 SHA512 6a20785b9fc54051eb21be72a46e91d26e6ee600868652c5fbc6a34eeecb46c20b639e7d4b09b589a240b9ad90a64f8834bb347de131aa063f0772c773d2febc WHIRLPOOL d7e39699cd19f4ed7d96588bc6192f85a5fa53a5b2dcb5bcfb48a1ab95ef1376ef773999c8edee49ea2adab57fed11d321b100e9ad39682feaf5c1cfdd90968e
 EBUILD glusterfs-3.4.1.ebuild 4638 SHA256 52de73867da9937b29f954711716abe6662d6ac193b067a228d23df5ca25dbfe SHA512 5391f790471f0e22339302324335eb7a5c5e9c8366f2cce9047d5716eda6a0a19374c11b8af6d2534065e9592bb5f931209abd06af6b5938087962b8f6263ecb WHIRLPOOL 4ea3f7564ab94b02da6450e1871fe89cb54ee726a48067797c6aafada85d0960fd6fac129578250dd14a813f0dedfba4d3af4730632065fb7223c3df03638f10
-MISC ChangeLog 10078 SHA256 40182ed79b06ad9182d3bd3c682fc24c5061816180a887ca4c030141c167c40f SHA512 60b69b7a8c92cb0fc6410202b451138711d442d89cf4c3a35d14ef1ad5d27141b35b35c833c930d7bcd3c0a79feafaa4ffb15b4afe9c49fcb346b0d91289dbf2 WHIRLPOOL 73ca77d7b2718f19ad0fa622bec915f3bf0ad051eef9f00ca45c95a1b3550defd5624c76950d37d883aaa5934d38d7631d2d66c24f0d5625d7b90dacaae3a883
+EBUILD glusterfs-3.4.2.ebuild 4638 SHA256 8219d6c8ef1ecd239c5220b6ab2e69cd0afecb0720a771444fd03b7312b59b45 SHA512 8b8a86101a9db80d9462938461e51ae7a2e300ec6090a695873cf4ffd0d26f1e5394ec28e73bdbc134ef5eb75cc3973fbdd07b6ef5d7a7b6a58ab907bf0df75d WHIRLPOOL ef996f38923d941a171defa242fdecc4a1aca844f5720f6954a0e608a0cb9c532bc8f548a2eaa592e99a4880163aa245843acaf1ff67f75efda534a2059db41e
+MISC ChangeLog 10251 SHA256 c1d3ce3e7d0e565d41cec51d6ff85c10e91b9dd1b136640d7c8e2de8e94750eb SHA512 85ec4a0ff6c37da3d26e2f89a6c6cb35b86c36d03c9cc6e34535c6b0ebecffce230545591c6d8a82195fdc435992dd053b59bf728903dd73cf8caa9e9d40932f WHIRLPOOL f87282dcc2e58dd7be78771773c21eca2f9845af7bec0cca8d4f99aec08fea41760febca42f16a5e1cdf65d80f6d4b47d31c0ff55ab8df881f0f1ab71c50e33a
 MISC metadata.xml 1037 SHA256 82d258e1fbfe283fdf38d31124dff45c25f0fd457952d3a06c46bbe14b3e21f3 SHA512 b25f18244e5d026360570769c64f547b2ccb94b7ee780190c800b83350a5ae8577e7a00413935abb84d3765b42b90edb9b4dee35bb8772ec97f1a9f8dca5c297 WHIRLPOOL 79c89cd1e212f341778d51db8144bab8fe144ef3ad6701312f3399cf55fd9c543bc4623b5c7827e6010f89e33b2661f42f127b7ec8e7ed39727c5987510cc631
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iF4EAREIAAYFAlLCiLcACgkQKiQSS7ZY+hOT8gEAsfmNz52a9GeMLTwqfACu6z0x
-hvSHJgZNri+mIHOSWoMBAL5qXfmPusVwcFwSAf00O+iwc0n4EABc3AYH0bmKRTKw
-=+u/v
+iF4EAREIAAYFAlLro7sACgkQKiQSS7ZY+hMSrQEAjukLf9weQmg1uGHCT76EvN8y
+cDFxgwdnInX+8FKCMn0BAIDB4oUXWSbZqjFa3HwT+kK5bec86z+U/TyrW6d4OTzZ
+=CpKH
 -----END PGP SIGNATURE-----
diff --git a/sys-cluster/glusterfs/glusterfs-3.4.2.ebuild b/sys-cluster/glusterfs/glusterfs-3.4.2.ebuild
new file mode 100644
index 000000000000..110b65efae7f
--- /dev/null
+++ b/sys-cluster/glusterfs/glusterfs-3.4.2.ebuild
@@ -0,0 +1,145 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/glusterfs/glusterfs-3.4.2.ebuild,v 1.1 2014/01/31 13:23:02 ultrabug Exp $
+
+EAPI=5
+
+PYTHON_COMPAT=( python{2_6,2_7} )
+AUTOTOOLS_AUTORECONF=1
+
+inherit autotools-utils elisp-common eutils multilib python-single-r1 versionator
+
+DESCRIPTION="GlusterFS is a powerful network/cluster filesystem"
+HOMEPAGE="http://www.gluster.org/"
+SRC_URI="http://download.gluster.org/pub/gluster/${PN}/$(get_version_component_range '1-2')/${PV}/${P}.tar.gz"
+
+LICENSE="|| ( GPL-2 LGPL-3+ )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="bd-xlator debug emacs extras +fuse +georeplication infiniband static-libs systemtap vim-syntax"
+
+REQUIRED_USE="georeplication? ( ${PYTHON_REQUIRED_USE} )"
+
+RDEPEND="bd-xlator? ( sys-fs/lvm2 )
+	emacs? ( virtual/emacs )
+	fuse? ( >=sys-fs/fuse-2.7.0 )
+	georeplication? ( ${PYTHON_DEPS} )
+	infiniband? ( sys-infiniband/libibverbs sys-infiniband/librdmacm )
+	systemtap? ( dev-util/systemtap )
+	sys-libs/readline
+	dev-libs/libaio
+	dev-libs/libxml2
+	dev-libs/openssl
+	|| ( sys-libs/glibc sys-libs/argp-standalone )"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	sys-devel/bison
+	sys-devel/flex"
+
+SITEFILE="50${PN}-mode-gentoo.el"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-3.4.0-silent_rules.patch"
+	"${FILESDIR}/${PN}-3.4.0-build-shared-only.patch"
+	"${FILESDIR}/${PN}-3.4.0-nfs-exit-when-all-volumes-are-disabled.patch"
+)
+
+DOCS=( AUTHORS ChangeLog NEWS README THANKS )
+
+# Maintainer notes:
+# * The build system will always configure & build argp-standalone but it'll never use it
+#   if the argp.h header is found in the system. Which should be the case with
+#   glibc or if argp-standalone is installed.
+
+pkg_setup() {
+	 use georeplication && python-single-r1_pkg_setup
+}
+
+src_configure() {
+	local myeconfargs=(
+		--disable-dependency-tracking
+		--disable-silent-rules
+		--disable-fusermount
+		$(use_enable debug)
+		$(use_enable bd-xlator )
+		$(use_enable fuse fuse-client)
+		$(use_enable georeplication fuse-client)
+		$(use_enable infiniband ibverbs)
+		$(use_enable static-libs static)
+		$(use_enable systemtap)
+		--docdir=/usr/share/doc/${PF}
+		--localstatedir=/var
+	)
+	autotools-utils_src_configure
+}
+
+src_compile() {
+	autotools-utils_src_compile
+
+	use emacs && elisp-compile extras/glusterfs-mode.el
+}
+
+src_install() {
+	autotools-utils_src_install
+
+	rm "${D}/etc/glusterfs/glusterfs-logrotate" || die "removing false logrotate failed"
+	insinto /etc/logrotate.d
+	newins extras/glusterfs-logrotate glusterfs
+
+	if use emacs ; then
+		elisp-install ${PN} extras/glusterfs-mode.el*
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+	fi
+
+	if use vim-syntax ; then
+		insinto /usr/share/vim/vimfiles/ftdetect; doins "${FILESDIR}"/${PN}.vim
+		insinto /usr/share/vim/vimfiles/syntax; doins extras/${PN}.vim
+	fi
+
+	if use extras ; then
+		sed -i -e "s|quota-remove-xattr.sh|${PN}-quota-remove-xattr|" extras/quota-metadata-cleanup.sh || die "sed failed"
+		for e in backend-xattr-sanitize backend-cleanup migrate-unify-to-distribute quota-metadata-cleanup quota-remove-xattr ; do
+			newbin extras/${e}.sh ${PN}-${e}
+		done
+		newbin extras/disk_usage_sync.sh ${PN}-disk-usage-sync
+	fi
+
+	newinitd "${FILESDIR}/${PN}-r1.initd" glusterfsd
+	newinitd "${FILESDIR}/glusterd-r1.initd" glusterd
+	newconfd "${FILESDIR}/${PN}.confd" glusterfsd
+
+	keepdir /var/log/${PN}
+	keepdir /var/lib/glusterd
+
+	use georeplication && python_fix_shebang "${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."
+
+	elog
+	elog "If you are upgrading from a previous version of ${PN}, please read:"
+	elog "  https://vbellur.wordpress.com/2013/07/15/upgrading-to-glusterfs-3-4/"
+
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}