6 files changed, 30 insertions, 62 deletions
diff --git a/sys-cluster/Manifest.gz b/sys-cluster/Manifest.gz
index 9adbed3521b5..e83e23706763 100644
--- a/sys-cluster/Manifest.gz
+++ b/sys-cluster/Manifest.gz
diff --git a/sys-cluster/glusterfs/Manifest b/sys-cluster/glusterfs/Manifest
index 0f047b0b25b2..b3a3c70d2f27 100644
--- a/sys-cluster/glusterfs/Manifest
+++ b/sys-cluster/glusterfs/Manifest
@@ -2,7 +2,6 @@ AUX 50glusterfs-mode-gentoo.el 169 BLAKE2B 461afb9f17ef9dee79348279e861039193400
 AUX glusterd-r3.initd 755 BLAKE2B 6b402725a6a53839ff718ae19f4917b61330f78ae6657480a218f06657d5d7db1c4b57efa275159be76bc84fd5b600a22bd4b374a8a6fbb56576799650ce89fe SHA512 d6f46374f48cf78c4114c786fbba4412764527cec020f43ab2a46000fcada98bdb6dfb67ba9db2be3e39a851cba1db97a7154e4cab6df7ce541c0157c781706c
 AUX glusterfs-3.12.2-poisoned-sysmacros.patch 431 BLAKE2B 4446b2ba5aad48dfe54c24e0cf802196d6ee4898a77f7a6950e2c1971550deddc7ff232dab021b4bfcb962f4544fa6bebba314b07942228298a5c38758c38442 SHA512 fb9f56254a90325bfc92d60af41075b51460d179eac7149cf1d0dc218d7cc7c9102eaf0591c2763df2fa68d2595f87dd3427d810bc182b61103bd5f9588c77db
 AUX glusterfs-3.12.2-silent_rules.patch 632 BLAKE2B f9aa9dfb128b7ba2bf212b3b59f1092dd94f24f43c91ec416af9e6c157a9a165581fad83f926e60557a236ca54ae7e2611fc927cd022bf0f931472d6ae1fba1d SHA512 81ec26ad0385b3c9e94c918a720ecea606cf5adf9f28aa57bfcd8de179e24b4feb344573820528716d6530079553bd3df7ac1cea39e3893b35573990fe3ffd1c
-AUX glusterfs-3.12.3-libtirpc.patch 1416 BLAKE2B 3b71ef845ddfd6a3c1e3c1b804e9fed421c27e5b1ad68eda21dbcd039022531e54dd5881f2bc3bad0b1ccc3d94f13b5253ae98dd8c83d2792c71e5965ff35e85 SHA512 adad49a9e3c3d190ba5f193f7ed5078a8cd143149965ff137327908845ab985478bb1e799b712b095101bd7773384147928eb08aff4d5b5572a4859be5c61915
 AUX glusterfs-4.1.0-silent_rules.patch 500 BLAKE2B bd6812be1059f04bcb34e9408b6ef24f6bd0992cc432ff22da9f21970e11dd5394e1421a6967cae6c026207dcf1d7ae591afaa06e4a25a62c0e79f7f679cd22e SHA512 1cbdfd9f04a917387f0b3299f3ab04074c34e5a4911642ccf4274f1270a97acbf0e27f89c89ce6a1cd2e26238761f956cd1dfa3033d763ead32b0d0fd92a0798
 AUX glusterfs-TIRPC-config-summary.patch 1738 BLAKE2B 1155bd8e92c53c53f4e7e5467a798b1c0006064da367723cce609fc01e0383156ee2ec5884bc07c3bf26013f8704b11efa3bc3be3bda79c5d14548627080084e SHA512 86e2ecbb87a39bd31f1ddd9bfd07a6af9876912daa7feace7cca71db665ec00e86f39632ae33c557105a994d44bbe754d42db7aa860e2365055dc888e4f35994
 AUX glusterfs-r1.initd 3065 BLAKE2B 6bf49cfec1c6f685b4c72a79e956ca9823c742bca3d665f0bbffb59bbd2f81b314df62b8aab4eab5c4d23b9e88f43168160cb0faedece3307ddf2347f5282311 SHA512 28c5f401b2ff017d8faf7b290fa265cc5f1a9d60edf11dbae5801e943e7e0833fa8267880efa80c4fc07048d75afd446808c583d2b62a6c5a6bde25d317bde97
@@ -10,9 +9,9 @@ AUX glusterfs-without-ipv6-default.patch 1337 BLAKE2B a270569af9d54142b492149781
 AUX glusterfs.confd 129 BLAKE2B 17eeb707fe5ebeb335b0c64ce999268e5f5c6fb6d2ba48467f6f15e73f4c2e883b909da642e6144c637510302834c7c895ebf8b2558344c3bedc9cdc06a44766 SHA512 657c478dd3a60c144543821acd6a87f804d258d4679007aad5108790449e43eda7e0de8e8c0c8e13357a35afbb0d09065423101e5234285a9b96c9ac8b2e33b4
 AUX glusterfs.logrotate 611 BLAKE2B e79718d43b8123e8bcc63336977f972e58332536e0bccad84f3abb5e4afd87853d1c70ab689e2c454d94a8d74bb65122e7bf5a35150f60fb268c7757eea7b0d0 SHA512 568728fe77acecb686286b0be6c086fe3448d054d26da15c3846726a8f845ae963e6756c517b413a9eb4d6b646c61972887a35e89846d2d90d364b755e471791
 AUX glusterfs.vim 139 BLAKE2B 73fdcb49c0c252784718b461541d5483e118bf1b83f445a6ced3119600aa46c469291e19aa439e2c1e35ffc88c83a74977571d8ccfddf078f65c5c16a44ed3e0 SHA512 6ea3b56b71d7e206a57611dd68160b6b9242a19b5c927560f60881dc28d250f7958c50f788a7b9a41fb46010fdac2d67a8289b909ed1f05b793c900f37ccbfb7
-DIST glusterfs-3.12.3.tar.gz 7187644 BLAKE2B 736c6bb408b0bd289ce5ce0abcc7e8bf4b7f96e4e92a1e669f016b59fb16993b17f7cf50fed09a6eeb851b57054c7bf9e595b642c506b0aca567d7ae80de0e84 SHA512 f648b8324a69360b510c947e49918467c969dcc21b6a408b6916b780aa78c44abe027b6c84d696eed7d5f381b055edd3be1dfe4f3ea8f76d15d9319cd08cfa3d
 DIST glusterfs-4.0.0.tar.gz 7632629 BLAKE2B 9367d2c99452d261d889cf564f3a055e1459ee54377cbf8cf6cc46c8d7f153bb258892fb73fc492d1dc6c5bea156d204971256fefc96f9f4825583d9c1086563 SHA512 acd3c462a8e15fb31f4b30d2e217928488e32d66ae7d1061df3e166354a4ddcdeb0ba0bcc994b7563f83376c882800fad07e190e0086fda987915c195266421f
-EBUILD glusterfs-3.12.3.ebuild 6574 BLAKE2B 6d1248d9dbb68d21d3181bcce41f0da31f3ca94f9d55190c74e759f14587e1b4c6912a7df4976f4c1a4b075ee84f304a64bbf97f47e6f4facd996cca97a3c84e SHA512 b4a7578df685eaad9c0e98eebe7c85919879ecdbf78c2e00204c67da12d08c2e7c80f16c8945cc321e94946deca7ae34b87977e8463b9020a22fa27e99ca38e5
-EBUILD glusterfs-4.0.0-r1.ebuild 6835 BLAKE2B 89398ec37d7c3d570e96042f142efe29ede310536775d4db3a04bc769bae37d6d4ca7f7d84ddf3dc3830ca13b43e4f5da12f7ee39254e6f40eec0d3a314b292c SHA512 b5fca2b6d2b8c5b35b9e622ed98a56e6fd247e4f92db2c06b4f2dd21980dfca97ff4fd2bcfa4c58a130ac07997871fb3a9b961985ec1ae642bd805e450420be2
-EBUILD glusterfs-9999.ebuild 6836 BLAKE2B ab8183d34704788035ba7d95110304abceaedf6e999d5f51a2b172bb69cf4875041fd8635a47eb4e449a8f471a9126869d44f623d1edfb940696af2793642612 SHA512 d5967f5cf94dda9487b132c29a493feea86eb61449b9a33ea5ee70386b60fd109349336d5f5b8d1ac1d0bb9e4f0e255768bb47ac39910cdb426ac96301e4087e
+DIST glusterfs-4.0.2.tar.gz 7643713 BLAKE2B 6314f81fe1474bcf8c577aa68a32c46a6d1e586b32c698a9e30850080408958c0541c1afe72520574fcabebb0884cf3bf315b22582d932876bbb5a4393e167f0 SHA512 33afed4fb4f6d63f1d2b7caedae1ce41e7f6aa4299fb4a7ee2f5e4bc14c97d66f68097171fded6d1f2141dd7127eb408596cce4f5f7287038a14e387ad5ec5e6
+EBUILD glusterfs-4.0.0-r1.ebuild 6833 BLAKE2B 1cc152dd9040a1186f3948742141895e5465e8d0148f8bd613f1dc51fac107037358dd2cd26a1d0c6179ed3dc088be07304ebff577475c69ba9deed73ec4dd13 SHA512 71876a48177fb52e11ae3c33085fb5266e74e9e7e96fb24b558df125bcb2ad5d5fb2b68d0687a85bb551b15665d7042cc96732fb17cc8f930df3f0d0246cadb1
+EBUILD glusterfs-4.0.2.ebuild 6973 BLAKE2B 0120718997945fac6d71817264302b16fb49205b48fe36ab8d500b46ed6068f02f9dd9a4c1208db2d66aa887b10282b0f697b33caa8d1eca87785837da4e5c49 SHA512 75f08a1add41fcfaf9a0ad65051d5d8964081f7bf79bd6c86e54c35563d3f69447b2a4c7683d9b4a7c0e0d877055e8d5f969b0a853daaa0fc536138e974cd7e0
+EBUILD glusterfs-9999.ebuild 6958 BLAKE2B f7aae180dee4548b93b6c228d473bb335fd804a1e6af07c8fe929b91cbb69d0ea75788c866f7ada44d47ba9c0a426cc775fd6eccad83eb71d0c14725b097108a SHA512 ac0a9ba3d3c33a9c3e86dee2fa6a462e4790616ee535dd53f9f64af68a5172b328b8c7dada8f58966bb965ef117a5803d4ce31d3d124ce7fd42fc63971e4cffc
 MISC metadata.xml 1724 BLAKE2B 8d164da1feb4e49490543de9841ec60282199451f2dcd6920c6781bcff41cb1248fcea7895501db0501f01a1b87b27e91a068adacd87842630f17efebf4d8954 SHA512 5bc076910d574a03f1b29db15fe1933e1b9b6f0f2cde654a6934397f7fa6f10c5063dd0318248d522da508af1ce56d16f1a204bc4be8429430f189143baaf043
diff --git a/sys-cluster/glusterfs/files/glusterfs-3.12.3-libtirpc.patch b/sys-cluster/glusterfs/files/glusterfs-3.12.3-libtirpc.patch
deleted file mode 100644
index fdc1f1f95972..000000000000
--- a/sys-cluster/glusterfs/files/glusterfs-3.12.3-libtirpc.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-From 6394d8d8e90d5400b49005bf3005523b2e306b2c Mon Sep 17 00:00:00 2001
-From: James Le Cuirot <chewi@gentoo.org>
-Date: Mon, 20 Nov 2017 20:44:45 +0000
-Subject: [PATCH] build: Allow libtirpc to be explicitly requested
-
-Some distributions like Gentoo no longer include the RPC stuff in
-their glibc packages.
-
-Signed-off-by: James Le Cuirot <chewi@gentoo.org>
----
- configure.ac | 11 +++++++++++
- 1 file changed, 11 insertions(+)
-
-diff --git a/configure.ac b/configure.ac
-index ce689225c..90d2f98c8 100644
---- a/configure.ac
-+++ b/configure.ac
-@@ -291,6 +291,10 @@ else
-         CFLAGS="${CFLAGS} -g -rdynamic"
- fi
- 
-+AC_ARG_WITH([libtirpc],
-+        AS_HELP_STRING([--with-libtirpc], [Use libtirpc as RPC implementation (instead of sunrpc)]),
-+        [], [with_libtirpc=no])
-+
- AC_ARG_ENABLE([privport_tracking],
-               AC_HELP_STRING([--disable-privport_tracking],
-                              [Disable internal tracking of privileged ports.]))
-@@ -1050,6 +1054,13 @@ AC_SUBST(GF_DISTRIBUTION)
- GF_HOST_OS=""
- GF_LDFLAGS="-rdynamic"
- 
-+if test "x$with_libtirpc" = "xyes" ; then
-+    PKG_CHECK_MODULES([TIRPC], [libtirpc],
-+       [GF_CFLAGS="$GF_CFLAGS $TIRPC_CFLAGS"; GF_LDFLAGS="$GF_LDFLAGS $TIRPC_LIBS";],
-+       [AC_MSG_ERROR([libtirpc requested but library not found])]
-+    )
-+fi
-+
- dnl check for gcc -Werror=format-security
- saved_CFLAGS=$CFLAGS
- CFLAGS="-Wformat -Werror=format-security"
--- 
-2.15.0
-
diff --git a/sys-cluster/glusterfs/glusterfs-4.0.0-r1.ebuild b/sys-cluster/glusterfs/glusterfs-4.0.0-r1.ebuild
index 3d8dd7835072..b8c3d99fa8fd 100644
--- a/sys-cluster/glusterfs/glusterfs-4.0.0-r1.ebuild
+++ b/sys-cluster/glusterfs/glusterfs-4.0.0-r1.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV#9999} != ${PV} ]]; then
 	EGIT_REPO_URI="https://github.com/gluster/glusterfs.git"
 else
 	SRC_URI="https://download.gluster.org/pub/gluster/${PN}/$(get_version_component_range '1-2')/${PV}/${P}.tar.gz"
-	KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
+	KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 x86"
 fi
 
 DESCRIPTION="GlusterFS is a powerful network/cluster filesystem"
diff --git a/sys-cluster/glusterfs/glusterfs-3.12.3.ebuild b/sys-cluster/glusterfs/glusterfs-4.0.2.ebuild
index 04036b762ed8..0ee1825274ab 100644
--- a/sys-cluster/glusterfs/glusterfs-3.12.3.ebuild
+++ b/sys-cluster/glusterfs/glusterfs-4.0.2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -7,17 +7,24 @@ PYTHON_COMPAT=( python2_7 )
 
 inherit autotools elisp-common python-single-r1 systemd user versionator
 
+if [[ ${PV#9999} != ${PV} ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/gluster/glusterfs.git"
+else
+	SRC_URI="https://download.gluster.org/pub/gluster/${PN}/$(get_version_component_range '1-2')/${PV}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+fi
+
 DESCRIPTION="GlusterFS is a powerful network/cluster filesystem"
 HOMEPAGE="https://www.gluster.org/"
-SRC_URI="https://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 ~arm ~arm64 ppc ppc64 x86"
-IUSE="bd-xlator crypt-xlator debug emacs +fuse +georeplication glupy infiniband +libtirpc qemu-block rsyslog static-libs +syslog systemtap test +tiering vim-syntax +xml"
+IUSE="bd-xlator crypt-xlator debug emacs +fuse +georeplication glupy infiniband ipv6 +libtirpc qemu-block rsyslog static-libs +syslog systemtap test +tiering vim-syntax +xml"
 
 REQUIRED_USE="georeplication? ( ${PYTHON_REQUIRED_USE} )
-	glupy? ( ${PYTHON_REQUIRED_USE} )"
+	glupy? ( ${PYTHON_REQUIRED_USE} )
+	ipv6? ( libtirpc )"
 
 # the tests must be run as root
 RESTRICT="test"
@@ -60,7 +67,7 @@ SITEFILE="50${PN}-mode-gentoo.el"
 PATCHES=(
 	"${FILESDIR}/${PN}-3.12.2-poisoned-sysmacros.patch"
 	"${FILESDIR}/${PN}-3.12.2-silent_rules.patch"
-	"${FILESDIR}/${PN}-3.12.3-libtirpc.patch"
+	"${FILESDIR}/${PN}-TIRPC-config-summary.patch"
 )
 
 DOCS=( AUTHORS ChangeLog NEWS README.md THANKS )
@@ -94,6 +101,10 @@ src_prepare() {
 }
 
 src_configure() {
+	# --without-ipv6-default doesn't do what you think it does. Chewi
+	# has given up fighting with upstream about this.
+	# https://bugzilla.redhat.com/show_bug.cgi?id=1553926
+
 	econf \
 		--disable-dependency-tracking \
 		--disable-silent-rules \
@@ -113,6 +124,7 @@ src_configure() {
 		$(use_enable tiering) \
 		$(use_enable xml xml-output) \
 		$(use_with libtirpc) \
+		$(use ipv6 && echo --with-ipv6-default) \
 		--with-tmpfilesdir="${EPREFIX}"/etc/tmpfiles.d \
 		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
 		--localstatedir="${EPREFIX}"/var
@@ -172,7 +184,7 @@ src_install() {
 	newconfd "${FILESDIR}/${PN}.confd" glusterfsd
 
 	keepdir /var/log/${PN}
-	keepdir /var/lib/glusterd
+	keepdir /var/lib/glusterd/{events,glusterfind/.keys}
 
 	# QA
 	rm -r "${ED}/var/run/" || die
diff --git a/sys-cluster/glusterfs/glusterfs-9999.ebuild b/sys-cluster/glusterfs/glusterfs-9999.ebuild
index c48c92ed2f03..3284a29382b8 100644
--- a/sys-cluster/glusterfs/glusterfs-9999.ebuild
+++ b/sys-cluster/glusterfs/glusterfs-9999.ebuild
@@ -67,8 +67,6 @@ SITEFILE="50${PN}-mode-gentoo.el"
 PATCHES=(
 	"${FILESDIR}/${PN}-3.12.2-poisoned-sysmacros.patch"
 	"${FILESDIR}/${PN}-4.1.0-silent_rules.patch"
-	"${FILESDIR}/${PN}-without-ipv6-default.patch"
-	"${FILESDIR}/${PN}-TIRPC-config-summary.patch"
 )
 
 DOCS=( AUTHORS ChangeLog NEWS README.md THANKS )
@@ -102,6 +100,10 @@ src_prepare() {
 }
 
 src_configure() {
+	# --without-ipv6-default and --with-libtirpc don't do what you they
+	# do. Chewi has given up fighting with upstream about this.
+	# https://bugzilla.redhat.com/show_bug.cgi?id=1553926
+
 	econf \
 		--disable-dependency-tracking \
 		--disable-silent-rules \
@@ -120,8 +122,8 @@ src_configure() {
 		$(use_enable test cmocka) \
 		$(use_enable tiering) \
 		$(use_enable xml xml-output) \
-		$(use_with ipv6 ipv6-default) \
-		$(use_with libtirpc) \
+		$(use libtirpc || echo --without-libtirpc) \
+		$(use ipv6 && echo --with-ipv6-default) \
 		--with-tmpfilesdir="${EPREFIX}"/etc/tmpfiles.d \
 		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
 		--localstatedir="${EPREFIX}"/var