gentoo resync : 10.03.2018

10 files changed, 106 insertions, 222 deletions

diff --git a/sys-cluster/Manifest.gz b/sys-cluster/Manifest.gz
index dccd2aa2d244..2ee720202edf 100644
--- a/sys-cluster/Manifest.gz
+++ b/sys-cluster/Manifest.gz
diff --git a/sys-cluster/cinder/Manifest b/sys-cluster/cinder/Manifest
index 20468a3ce34c..86e7f08cf505 100644
--- a/sys-cluster/cinder/Manifest
+++ b/sys-cluster/cinder/Manifest
@@ -1,12 +1,10 @@
 AUX cinder.initd 494 BLAKE2B f919de45b8e39b65d355f627fcd71a4c23a7bb550157d25811c1d1f3a84b9f1c1e7c596361ec5d2aab650f1ebf3f0f053e313f2e15be64995d1309a6eafc8a69 SHA512 be3c2e6798b08527487cfd2b1cd66a03d891526a45f52c97a536b15a08d46a4162e3b036dcae86911c7dba25c5d7f02e73a089d4dd720526bf38ecd0f44c59b0
 AUX cinder.sudoersd 86 BLAKE2B 1ea49d3cf3bc134ea0a2d5512c6e258f117187267bfa408fea0d2449a091068e5404812a0e693f226d895ec23766ed73aca36128d6f7b968ae44dc38b8ad948a SHA512 c158be54e721abc6916db2e710092ca75aac65ac88b19849ccd0f3ebbb7c8879aab6b73aba36537e806abd5b8b5e8fbc24fca79d00015d3308198d5270e51fe1
-DIST cinder-11.0.2.tar.gz 5794973 BLAKE2B a7b59afbe3e27a2fde28a3dcb2ba3707c67223ae7e98cb34d0ac92beb16ab8f10c07f22fda091c9db9a02fd2eff4769a6e574a94cb19df1e9506c36321a12014 SHA512 6340150aa010a4372a7e51dc976974839f89b180eef61c9307c5b477dae98c8629a3f54cbc3d114dca28ca75c715930357cfc96d08f80acaabacee8f8c0bf3a6
 DIST cinder-11.1.0.tar.gz 5813863 BLAKE2B 467ebe47d92b8a9c612b6d2c30ca9a3b737b33cf999c3612079cb6d6886ee986e60f9eb15bc6cd3e2adc7ab9c4e956ca41c9324c23f8892cdea9aedd1e1e035c SHA512 193914d69144afba54bda7b3d05a8140501368c2fd44dd203dff5006228dad47602c4da244dc844781cff36581987ee236fc5238c7d78062e7cb78b8795b1f28
 DIST cinder-12.0.0.tar.gz 5359294 BLAKE2B 85a7422ba3a562546cb192cabd6d9614adf8e4daa5cd86d98b6c3a49bd3ecea71027ce9e075f297f998d6539803f02505153fb09586928a159fce7683db6f680 SHA512 dbc65a0231ae584734a9cb9b29429a5ebecb15caf340237e8c3064b7e4c02793e6ec988554588aff46b825a44eac75fb748b25001ac28667752acc8fe199022d
 DIST pike-cinder.conf.sample 185310 BLAKE2B 6f6a626537098107d63cd33ef6f8cc63dd5064711fcab3b6a7ebd0bb4170d3cc18e1cc414491859c63ca02d39602f496068823975f1cd5de731402696ade0868 SHA512 12c44b7a31888fbf4c70e037a2f5d0b778018e10bd0fc1cb97391bbe2fc6f97bbe4bec0d1504513ee0235ce50decda6883fe64a7d8fd5e329d8ad73e6bb74654
 DIST queens-cinder.conf.sample 179467 BLAKE2B 00c229a6d9882740460c633db69bf3f5ff3d77a2a8e78f38528f1b5e6e03c2371141ba219c24b8dc82e51c20a5e784af142c1a0192791ff356e5841a9991d713 SHA512 346f9ad4ddcfed26dd3b9b34e65c2edaf08a7d649d4af5bd3a5ebf1047c78d6cdc4e4712666e022f56acd3b2a0b323850b40cc4d0008f2c140507342a00b2908
-EBUILD cinder-11.0.2.ebuild 7748 BLAKE2B fee1f56d529fd4aa3969d4af66d793c419f1c2215d4e8715d8a4faa0c4cc82c5af2e125ea8de35e3496354c323bf0fbd55159fde814ff070415b025c0a435a34 SHA512 ff37f6b3906eba212691312b9c689d62a848e2db4c05e20acf233edf502423b4ac466639f9c073d9c70e08e570e8a411513b224c881b227fae52f0cedb72fd7d
-EBUILD cinder-11.1.0.ebuild 7750 BLAKE2B f391a804393ff866dcc5f18047bee443b0c11a5706992e738a5b91e455b1b1ab963158d9c782db0347e5f3df5ad68224eb4f828c74b1f78a55b33c28ef85e837 SHA512 fc1efdbc184d3f8ecc3a630a615f5fc7cfd654bf25aa5a99ec2553cec889a8f5c783fa165177d1de9bb52fcdd7011f0914fae5279b75c444ff92dfc993f23fbf
+EBUILD cinder-11.1.0.ebuild 7748 BLAKE2B fee1f56d529fd4aa3969d4af66d793c419f1c2215d4e8715d8a4faa0c4cc82c5af2e125ea8de35e3496354c323bf0fbd55159fde814ff070415b025c0a435a34 SHA512 ff37f6b3906eba212691312b9c689d62a848e2db4c05e20acf233edf502423b4ac466639f9c073d9c70e08e570e8a411513b224c881b227fae52f0cedb72fd7d
 EBUILD cinder-12.0.0.ebuild 8062 BLAKE2B d7b7ee7a2d552288c8cd69598dad60d9e3b0432f59fbe330b187de7e2c46f9ac581aa3ee6a205b10d94d50454afa64291a1695cde00e8929d730578cfeb04298 SHA512 3f9a25e897baba087f8206a4348ba41fa36d60bb4bbd32e5e5292f0415a9585396a74ed095c42ed24d4086e9c0039d21a13af99f782afb71cf42c14852b7c791
 EBUILD cinder-2017.2.9999.ebuild 7772 BLAKE2B 354ea7431e2e7d3bf9f5322f5b4f313de076977b0b33ef812cdeb9133983d7cbd50b569cf7c1451fc49857023e29741708fbd6a43c5e941c6a107771563ed9dd SHA512 c8a6db8c3d8c3c4ebca2d121250a6dde400a9cfd1092b17e2510e12656c4b945f4ffa8292f9893d06a29f4b1c5eac36202eb08d2b5d28997343070678d973c91
 EBUILD cinder-2018.1.9999.ebuild 8064 BLAKE2B 7fa795367871db689ddabf456eeab9d59b67d6b76195efc7e66fe9370017f043412c1945129b74afa43d8f12e1e96b1f16dbad5f9440498539053998d8f47bc2 SHA512 62c9b7d4dc3b72edb659db5130ecde8502346b1a253e7ae3a62bc1447559fafb0f5ee74672f52307a2257c49fdef37dc1f803cf5742f353525678f906b622888
diff --git a/sys-cluster/cinder/cinder-11.0.2.ebuild b/sys-cluster/cinder/cinder-11.0.2.ebuild
deleted file mode 100644
index b0f15626d2d7..000000000000
--- a/sys-cluster/cinder/cinder-11.0.2.ebuild
+++ /dev/null
@@ -1,209 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-PYTHON_COMPAT=( python2_7 python3_{4,5} )
-
-inherit distutils-r1 eutils linux-info user
-
-DESCRIPTION="Cinder is the OpenStack Block storage service, a spin out of nova-volumes"
-HOMEPAGE="https://launchpad.net/cinder"
-SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/openstack/cinder/pike/cinder.conf.sample -> pike-cinder.conf.sample
-https://tarballs.openstack.org/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
-IUSE="+api +scheduler +volume infiniband iscsi lvm mysql +memcached postgres rdma sqlite +tcp test +tgt"
-REQUIRED_USE="|| ( mysql postgres sqlite ) iscsi? ( tgt ) infiniband? ( rdma )"
-
-CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
-	!~dev-python/pbr-2.1.0"
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-	${CDEPEND}
-	app-admin/sudo"
-
-RDEPEND="
-	${CDEPEND}
-	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
-	!~dev-python/Babel-2.4.0[${PYTHON_USEDEP}]
-	>=dev-python/decorator-3.4.0[${PYTHON_USEDEP}]
-	dev-python/enum34[$(python_gen_usedep 'python2_7')]
-	>=dev-python/eventlet-0.18.4[${PYTHON_USEDEP}]
-	!~dev-python/eventlet-0.20.1[${PYTHON_USEDEP}]
-	<dev-python/eventlet-0.21.0[${PYTHON_USEDEP}]
-	>=dev-python/greenlet-0.3.2[${PYTHON_USEDEP}]
-	>=dev-python/httplib2-0.7.5[${PYTHON_USEDEP}]
-	>=dev-python/iso8601-0.1.11[${PYTHON_USEDEP}]
-	virtual/python-ipaddress[${PYTHON_USEDEP}]
-	>=dev-python/keystoneauth-3.1.0[${PYTHON_USEDEP}]
-	>=dev-python/keystonemiddleware-4.12.0[${PYTHON_USEDEP}]
-	>=dev-python/lxml-2.3[${PYTHON_USEDEP}]
-	!~dev-python/lxml-3.7.0[${PYTHON_USEDEP}]
-	>=dev-python/oauth2client-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-config-4.0.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-config-4.3.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-config-4.4.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-concurrency-3.8.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-context-2.14.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-db-4.24.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-log-3.22.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-messaging-5.24.2[${PYTHON_USEDEP}]
-	!~dev-python/oslo-messaging-5.25.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-middleware-3.27.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-policy-1.23.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-privsep-1.9.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-privsep-1.17.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-reports-0.6.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-rootwrap-5.0.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-serialization-1.10.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-serialization-2.19.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-service-1.10.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-utils-3.20.0[${PYTHON_USEDEP}]
-	>=dev-python/oslo-versionedobjects-1.17.0[${PYTHON_USEDEP}]
-	>=dev-python/osprofiler-1.4.0[${PYTHON_USEDEP}]
-	>=dev-python/paramiko-2.0[${PYTHON_USEDEP}]
-	dev-python/paste[${PYTHON_USEDEP}]
-	>=dev-python/pastedeploy-1.5.0[${PYTHON_USEDEP}]
-	>=dev-python/psutil-3.2.2[${PYTHON_USEDEP}]
-	>=dev-python/pyparsing-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/python-barbicanclient-4.0.0[${PYTHON_USEDEP}]
-	!~dev-python/python-barbicanclient-4.5.0[${PYTHON_USEDEP}]
-	!~dev-python/python-barbicanclient-4.5.1[${PYTHON_USEDEP}]
-	>=dev-python/python-glanceclient-2.8.0[${PYTHON_USEDEP}]
-	>=dev-python/python-keystoneclient-3.8.0[${PYTHON_USEDEP}]
-	>=dev-python/python-novaclient-6.0.0[${PYTHON_USEDEP}]
-	!~dev-python/python-novaclient-7.0.0[${PYTHON_USEDEP}]
-	>=dev-python/python-swiftclient-3.2.0[${PYTHON_USEDEP}]
-	>=dev-python/pytz-2013.6[${PYTHON_USEDEP}]
-	>=dev-python/requests-2.14.2[${PYTHON_USEDEP}]
-	>=dev-python/retrying-1.2.3[${PYTHON_USEDEP}]
-	!~dev-python/retrying-1.3.0[${PYTHON_USEDEP}]
-	>=dev-python/routes-2.3.1[${PYTHON_USEDEP}]
-	>=dev-python/taskflow-2.7.0[${PYTHON_USEDEP}]
-	>=dev-python/rtslib-fb-2.1.43[${PYTHON_USEDEP}]
-	!~dev-python/rtslib-fb-2.1.60[${PYTHON_USEDEP}]
-	!~dev-python/rtslib-fb-2.1.61[${PYTHON_USEDEP}]
-	>=dev-python/simplejson-2.2.0[${PYTHON_USEDEP}]
-	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
-	sqlite? (
-		>=dev-python/sqlalchemy-1.0.10[sqlite,${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.5[sqlite,${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.6[sqlite,${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.7[sqlite,${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.8[sqlite,${PYTHON_USEDEP}]
-	)
-	mysql? (
-		>=dev-python/pymysql-0.7.6[${PYTHON_USEDEP}]
-		!~dev-python/pymysql-0.7.7[${PYTHON_USEDEP}]
-		>=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.5[${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.6[${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.7[${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.8[${PYTHON_USEDEP}]
-	)
-	postgres? (
-		>=dev-python/psycopg-2.5.0[${PYTHON_USEDEP}]
-		>=dev-python/sqlalchemy-1.0.10[${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.5[${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.6[${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.7[${PYTHON_USEDEP}]
-		!~dev-python/sqlalchemy-1.1.8[${PYTHON_USEDEP}]
-	)
-	>=dev-python/sqlalchemy-migrate-0.11.0[${PYTHON_USEDEP}]
-	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
-	~dev-python/suds-0.6[${PYTHON_USEDEP}]
-	>=dev-python/webob-1.7.1[${PYTHON_USEDEP}]
-	>=dev-python/oslo-i18n-2.1.0[${PYTHON_USEDEP}]
-	!~dev-python/oslo-i18n-3.15.2[${PYTHON_USEDEP}]
-	>=dev-python/oslo-vmware-2.17.0[${PYTHON_USEDEP}]
-	>=dev-python/os-brick-1.15.2[${PYTHON_USEDEP}]
-	>=dev-python/os-win-2.0.0[${PYTHON_USEDEP}]
-	>=dev-python/tooz-1.47.0[${PYTHON_USEDEP}]
-	>=dev-python/google-api-python-client-1.4.2[${PYTHON_USEDEP}]
-	>=dev-python/castellan-0.7.0[${PYTHON_USEDEP}]
-	>=dev-python/cryptography-1.6[${PYTHON_USEDEP}]
-	!~dev-python/cryptography-2.0[${PYTHON_USEDEP}]
-	iscsi? (
-		tgt? ( sys-block/tgt )
-		sys-block/open-iscsi
-	)
-	lvm? ( sys-fs/lvm2 )
-	memcached? ( net-misc/memcached )
-	app-emulation/qemu
-	sys-fs/sysfsutils"
-# qemu is needed for image conversion
-
-#PATCHES=(
-#)
-
-pkg_pretend() {
-	linux-info_pkg_setup
-	CONFIG_CHECK_MODULES=""
-	if use tcp; then
-		CONFIG_CHECK_MODULES+="SCSI_ISCSI_ATTRS ISCSI_TCP "
-	fi
-	if use rdma; then
-		CONFIG_CHECK_MODULES+="INFINIBAND_ISER "
-	fi
-	if use infiniband; then
-		CONFIG_CHECK_MODULES+="INFINIBAND_IPOIB INFINIBAND_USER_MAD INFINIBAND_USER_ACCESS"
-	fi
-	if linux_config_exists; then
-		for module in ${CONFIG_CHECK_MODULES}; do
-			linux_chkconfig_present ${module} || ewarn "${module} needs to be enabled"
-		done
-	fi
-}
-
-pkg_setup() {
-	enewgroup cinder
-	enewuser cinder -1 -1 /var/lib/cinder cinder
-}
-
-python_prepare_all() {
-	sed -i '/^hacking/d' test-requirements.txt || die
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	# Let's track progress of this # https://bugs.launchpad.net/swift/+bug/1249727
-	nosetests -I test_wsgi.py cinder/tests/ || die "tests failed under python2.7"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	keepdir /etc/cinder
-	dodir /etc/cinder/rootwrap.d
-
-	for svc in api scheduler volume; do
-		newinitd "${FILESDIR}/cinder.initd" cinder-${svc}
-	done
-
-	insinto /etc/cinder
-	insopts -m0640 -o cinder -g cinder
-	doins "etc/cinder/api-httpd.conf"
-	doins "etc/cinder/logging_sample.conf"
-	doins "etc/cinder/rootwrap.conf"
-	doins "etc/cinder/api-paste.ini"
-	doins "etc/cinder/policy.json"
-	doins "etc/cinder/resource_filters.json"
-	newins "${DISTDIR}/pike-cinder.conf.sample" "cinder.conf.sample"
-	insinto /etc/cinder/rootwrap.d
-	doins "etc/cinder/rootwrap.d/volume.filters"
-
-	dodir /var/log/cinder
-	fowners cinder:cinder /var/log/cinder
-
-	#add sudoers definitions for user nova
-	insinto /etc/sudoers.d/
-	insopts -m 0440 -o root -g root
-	newins "${FILESDIR}/cinder.sudoersd" cinder
-}
-
-pkg_postinst() {
-	if use iscsi ; then
-		elog "Cinder needs tgtd to be installed and running to work with iscsi"
-		elog "it also needs 'include /var/lib/cinder/volumes/*' in /etc/tgt/targets.conf"
-	fi
-}
diff --git a/sys-cluster/cinder/cinder-11.1.0.ebuild b/sys-cluster/cinder/cinder-11.1.0.ebuild
index 36fac78bde8e..b0f15626d2d7 100644
--- a/sys-cluster/cinder/cinder-11.1.0.ebuild
+++ b/sys-cluster/cinder/cinder-11.1.0.ebuild
@@ -13,7 +13,7 @@ https://tarballs.openstack.org/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 x86"
 IUSE="+api +scheduler +volume infiniband iscsi lvm mysql +memcached postgres rdma sqlite +tcp test +tgt"
 REQUIRED_USE="|| ( mysql postgres sqlite ) iscsi? ( tgt ) infiniband? ( rdma )"
 
diff --git a/sys-cluster/glusterfs/Manifest b/sys-cluster/glusterfs/Manifest
index 72bc72f283ae..1411f4f5d3de 100644
--- a/sys-cluster/glusterfs/Manifest
+++ b/sys-cluster/glusterfs/Manifest
@@ -4,13 +4,15 @@ AUX glusterfs-3.12.2-poisoned-sysmacros.patch 431 BLAKE2B 4446b2ba5aad48dfe54c24
 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
+AUX glusterfs-without-ipv6-default.patch 1337 BLAKE2B a270569af9d54142b4921497817355c032e6a028d292330508e97c916615113fdc8e2fcd0f9fc2954a114c49b1c15aa6413541e19cea7ef7d211a07c1af6ffab SHA512 a64fb5690c3241cd2ac87e8d1139de568d3c2ce232333d5d8d3e89c04b294eda233c39806b4ca7570c6c644caf8090bef97173d561d964ab4bd77dac4fb4fc9b
 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.ebuild 6720 BLAKE2B 54da1d93469e39627cfdd2c7ae03770bc2cff3ad4c07ea8842625a2f59ec27522fced73a9e8a874022d3783556f15257e11ca09d7d72d82db98142a3a1c7b6af SHA512 bc14e6cfbed7435e71143fca4d6f648747f16d4078a378f5ba264714746007740c5039080ca4f3cd192dbf4091e600d7501b8da78c9ccf6764b9f9aefe7d8c8c
-EBUILD glusterfs-9999.ebuild 6719 BLAKE2B d5c3f53841c5384359396f9290602c72bca14b1f4a51c31584d0c02aadebd6fac33c3783ddc8c3a880e3934d720bd28c106469c3692cb8fc7aaca0d939b695c3 SHA512 43f211871bbb4e560f737b9488f06bbcdc5d394ddf95f8a01c9d0412e156c7cefe98967514abd9bcdd9a4dc9bc45c4bc00d9622a956e59f08ee9280942fb5569
-MISC metadata.xml 1658 BLAKE2B 8bddb420e7ff711d3de6270eb1a3e9c8fcc9e67ea36d567543a8e22699dc0011affcc9ca39fc01b3ee6bec0a59341d2305f3de94a986ec7afec736db54092550 SHA512 173e9829db764acf7effd75cbc057ad05238b04481a6a6622045740dd885f54a97e17238f60ac893b35322ad711eed88b6cb791c067054f4cfaa81d56df8795d
+EBUILD glusterfs-4.0.0-r1.ebuild 6837 BLAKE2B 3bdb0878761893a526d37ab0fc6a74b9dd61bcfee5a3c78d287bd9bb6959e6362cfb097a1485960f2489e843b0249b6044584b729f906c72c854100fa75bbfc6 SHA512 feaeeac875dcb2cd46932be0c6a9bbb33a2466de19964282c891105fd5fa815057d4f77e7618e852b04de8ead98f5cbd73139ce1b281658c54893cbf6e819d5c
+EBUILD glusterfs-9999.ebuild 6836 BLAKE2B ab8183d34704788035ba7d95110304abceaedf6e999d5f51a2b172bb69cf4875041fd8635a47eb4e449a8f471a9126869d44f623d1edfb940696af2793642612 SHA512 d5967f5cf94dda9487b132c29a493feea86eb61449b9a33ea5ee70386b60fd109349336d5f5b8d1ac1d0bb9e4f0e255768bb47ac39910cdb426ac96301e4087e
+MISC metadata.xml 1724 BLAKE2B 8d164da1feb4e49490543de9841ec60282199451f2dcd6920c6781bcff41cb1248fcea7895501db0501f01a1b87b27e91a068adacd87842630f17efebf4d8954 SHA512 5bc076910d574a03f1b29db15fe1933e1b9b6f0f2cde654a6934397f7fa6f10c5063dd0318248d522da508af1ce56d16f1a204bc4be8429430f189143baaf043
diff --git a/sys-cluster/glusterfs/files/glusterfs-TIRPC-config-summary.patch b/sys-cluster/glusterfs/files/glusterfs-TIRPC-config-summary.patch
new file mode 100644
index 000000000000..c19ac7667b00
--- /dev/null
+++ b/sys-cluster/glusterfs/files/glusterfs-TIRPC-config-summary.patch
@@ -0,0 +1,48 @@
+From 1e1c3cc0761879e8a2e4d4a884dacc555bbe7fa0 Mon Sep 17 00:00:00 2001
+From: James Le Cuirot <chewi@gentoo.org>
+Date: Fri, 9 Mar 2018 23:06:43 +0000
+Subject: [PATCH 2/2] build: Fix misleading TIRPC result in configure summary
+
+Requesting ipv6-default even if you explicitly disable libtirpc will
+then implicitly enable libtirpc because that is required. That is fine
+but the configure summary should not then show TIRPC as disabled when
+it is not.
+
+The result has also been made clearer by stating that TIRPC is
+"missing" when it has been tried but not found.
+
+BUG: 1553938
+Change-Id: I945bd6859aaf3defa682b0d05ee34a9827b9c45f
+Signed-off-by: James Le Cuirot <chewi@gentoo.org>
+---
+ configure.ac | 9 ++++-----
+ 1 file changed, 4 insertions(+), 5 deletions(-)
+
+diff --git a/configure.ac b/configure.ac
+index d42179182..9571dac76 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -1097,16 +1097,15 @@ AC_SUBST(GF_DISTRIBUTION)
+ GF_HOST_OS=""
+ GF_LDFLAGS="-rdynamic"
+ 
+-DISABLE_LIBTIRPC=no
+ dnl include tirpc for IPv6 builds
+ if test "x$with_libtirpc" = "xyes" || test "x$with_ipv6_default" = "xyes" ; then
+     PKG_CHECK_MODULES([TIRPC], [libtirpc],
+-       [GF_CFLAGS="$GF_CFLAGS $TIRPC_CFLAGS"; GF_LDFLAGS="$GF_LDFLAGS $TIRPC_LIBS";],
+-       [DISABLE_LIBTIRPC=yes])
++       [with_libtirpc=yes; GF_CFLAGS="$GF_CFLAGS $TIRPC_CFLAGS"; GF_LDFLAGS="$GF_LDFLAGS $TIRPC_LIBS";],
++       [with_libtirpc=missing])
+ fi
+ 
+-if test "x$DISABLE_LIBTIRPC" = "xyes" ; then
+-    with_libtirpc=no; with_ipv6_default=no
++if test "x$with_libtirpc" = "xmissing" ; then
++    with_ipv6_default=no
+     AC_CHECK_HEADERS([rpc/rpc.h],[
+         AC_MSG_WARN([
+             ---------------------------------------------------------------------------------
+-- 
+2.16.1
+
diff --git a/sys-cluster/glusterfs/files/glusterfs-without-ipv6-default.patch b/sys-cluster/glusterfs/files/glusterfs-without-ipv6-default.patch
new file mode 100644
index 000000000000..ed30a6a293f2
--- /dev/null
+++ b/sys-cluster/glusterfs/files/glusterfs-without-ipv6-default.patch
@@ -0,0 +1,38 @@
+From c77b8f23af7d285fd82dbd3e4db3fa2c09899e58 Mon Sep 17 00:00:00 2001
+From: James Le Cuirot <chewi@gentoo.org>
+Date: Fri, 9 Mar 2018 22:39:41 +0000
+Subject: [PATCH 1/2] build: Fix configure --without-ipv6-default behaviour
+
+The current behaviour disables ipv6-default when no switch is given at
+all but otherwise checks if libtirpc was requested, regardless of
+whether you have given --with-ipv6-default or --without-ipv6-default.
+
+I believe the intention was to enable when libtirpc is requested by
+default but otherwise respect the switch given.
+
+This is important because ipv6-default breaks Gluster for systems that
+have IPv6 disabled.
+
+BUG: 1553926
+Change-Id: I76b91ae2699574b2e5b777453732bb5cbd79bbca
+Signed-off-by: James Le Cuirot <chewi@gentoo.org>
+---
+ configure.ac | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/configure.ac b/configure.ac
+index 827ec0518..d42179182 100644
+--- a/configure.ac
++++ b/configure.ac
+@@ -315,7 +315,7 @@ AC_ARG_WITH([libtirpc],
+ 
+ AC_ARG_WITH([ipv6-default],
+         AC_HELP_STRING([--with-ipv6-default], [Set IPv6 as default.]),
+-        [with_ipv6_default=$with_libtirpc], [with_ipv6_default=no])
++        [], [with_ipv6_default=$with_libtirpc])
+ 
+ if test "x$ac_cv_file__etc_redhat_release" = "xyes"; then
+         if rpm -qa centos-release | grep centos; then
+-- 
+2.16.1
+
diff --git a/sys-cluster/glusterfs/glusterfs-4.0.0.ebuild b/sys-cluster/glusterfs/glusterfs-4.0.0-r1.ebuild
index a4a5bf36143e..9d29f16de072 100644
--- a/sys-cluster/glusterfs/glusterfs-4.0.0.ebuild
+++ b/sys-cluster/glusterfs/glusterfs-4.0.0-r1.ebuild
@@ -20,10 +20,11 @@ HOMEPAGE="https://www.gluster.org/"
 
 LICENSE="|| ( GPL-2 LGPL-3+ )"
 SLOT="0"
-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"
@@ -66,6 +67,8 @@ 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}-without-ipv6-default.patch"
+	"${FILESDIR}/${PN}-TIRPC-config-summary.patch"
 )
 
 DOCS=( AUTHORS ChangeLog NEWS README.md THANKS )
@@ -117,7 +120,7 @@ src_configure() {
 		$(use_enable test cmocka) \
 		$(use_enable tiering) \
 		$(use_enable xml xml-output) \
-		$(use_with libtirpc ipv6-default) \
+		$(use_with ipv6 ipv6-default) \
 		$(use_with libtirpc) \
 		--with-tmpfilesdir="${EPREFIX}"/etc/tmpfiles.d \
 		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
diff --git a/sys-cluster/glusterfs/glusterfs-9999.ebuild b/sys-cluster/glusterfs/glusterfs-9999.ebuild
index 2733e7788033..c48c92ed2f03 100644
--- a/sys-cluster/glusterfs/glusterfs-9999.ebuild
+++ b/sys-cluster/glusterfs/glusterfs-9999.ebuild
@@ -20,10 +20,11 @@ HOMEPAGE="https://www.gluster.org/"
 
 LICENSE="|| ( GPL-2 LGPL-3+ )"
 SLOT="0"
-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"
@@ -66,6 +67,8 @@ 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 )
@@ -117,7 +120,7 @@ src_configure() {
 		$(use_enable test cmocka) \
 		$(use_enable tiering) \
 		$(use_enable xml xml-output) \
-		$(use_with libtirpc ipv6-default) \
+		$(use_with ipv6 ipv6-default) \
 		$(use_with libtirpc) \
 		--with-tmpfilesdir="${EPREFIX}"/etc/tmpfiles.d \
 		--docdir="${EPREFIX}"/usr/share/doc/${PF} \
diff --git a/sys-cluster/glusterfs/metadata.xml b/sys-cluster/glusterfs/metadata.xml
index bc97470af6ab..ce2361e3e3ea 100644
--- a/sys-cluster/glusterfs/metadata.xml
+++ b/sys-cluster/glusterfs/metadata.xml
@@ -16,6 +16,7 @@
 		<flag name="georeplication">Enable support for georeplication (requires <pkg>dev-lang/python</pkg>)</flag>
 		<flag name="infiniband">Add support for Infiniband ibverbs transport.
 			Libraries can be found in science overlay</flag>
+		<flag name="ipv6">Use IPv6 by default, requires libtirpc</flag>
 		<flag name="libtirpc">Build against <pkg>net-libs/libtirpc</pkg> for RPC support</flag>
 		<flag name="rsyslog">Install configuration snippet for <pkg>app-admin/rsyslog</pkg></flag>
 		<flag name="qemu-block">Transparently create files as QCow2/QED images in the backend, including the possibility to snapshot.</flag>