gentoo resync 08.09.2018

4 files changed, 249 insertions, 2 deletions

diff --git a/sys-cluster/swift/Manifest b/sys-cluster/swift/Manifest
index df9d9b50f822..80923ffa975a 100644
--- a/sys-cluster/swift/Manifest
+++ b/sys-cluster/swift/Manifest
@@ -4,8 +4,11 @@ AUX swift-object.initd 862 BLAKE2B 2a062873ab613e7d98d78758ccae793d8d952cb66922d
 AUX swift-proxy.initd 1379 BLAKE2B 56453a557c0abfd6b07f65778ef14d8920bedc4133e0efa1aa4a5466a72103e9b57b361f481e0b5cb816471161196755de7794bd3ea3d6f5120cc1f159489c22 SHA512 dd32e4249686b51d2ed6add8e2e91eb9e520c662ebdf068f68b4e52faf4d508d3c87e996c6c2f7ba2a7d1f5fdf639d08e1e6878cd4c9918408e007ccbd7c84ec
 DIST swift-2.16.0.tar.gz 2466084 BLAKE2B 9077e9745628ebd87f998ae963d19420e0410e29e02f8671dfb95b764d2bc4e5d97bd985e6d5d40496d152c6b931a03a789b372f94ad1b39cd17d3f0a6c9e658 SHA512 db67ee43931872dae9c8f7ff5732d0e075922e73a3660815f1ccb11a2310b94f887e293e9e5d4b1dda13c687365b7433ea9c575b209892f488647aed1a6f9696
 DIST swift-2.17.0.tar.gz 2527561 BLAKE2B baf8d2363bfd39062263542ddd01702e5f5847f3bbd2d227234da44ba742fa7e2bb6954569aab12082de67cfd785496a5530a0fc7613a0ad28d88bd62dbec9f8 SHA512 d5b13a63f549f1118eb1a27505a7444e09bedb532eed8e1ea34d370163dde2ce3e3911b9e4d6bea0d96f0a5c7d99bb103ed80ee8a547051fa29e9b4a09cced16
+DIST swift-2.19.0.tar.gz 2977206 BLAKE2B 05f53e7deb7948924ed36f7fcef164dd72254a90329e88a20ffae1f97ca632967d2e4de34a95c29008f8d636ec95b6860238f77f28b2f9f7ebe78ddb8c784a6c SHA512 fa6f08bacb7488762efaf8dd067cacd82adbc0ca773ee9b9c4a23d05d448eea9d79af2c9fbd619f4a458634e0af3cc3ce8fb8eb0d7cf0c10c7d3c28955000afd
 EBUILD swift-2.16.0.ebuild 3698 BLAKE2B 971a44109dc7fbc2230be6db33db966eb1596969953bb1ce03d9133683223f9c17553602397d5555dc88515e6dc5c283f829903ffbfcef1cd63c2cf855c9d8ef SHA512 5fa5c18cd19412aae6e41a544058b29cde20c3a9d84c89c27767ec7f8bff4021a559562e44bbd11b722fd6950b3529734ec42ab9a8bee930e6200160b873953e
 EBUILD swift-2.17.0.ebuild 3698 BLAKE2B 4b120f81788a76de5a14012714fe0dc94d9d51cc6261737d6498cdbd1130c32e6553128ee8e268553c1fc8b51277ceba6b61c32cdcbf087647d806718e83c51e SHA512 d805c50cec482f3a76a283c7f604a8de8e0c3b580f0c43ab9d2ce7c0cb4e4735cfb4e08fdba05598625bc4dc4ab7e2157acaafc70bf568b5a8fb928cb94c91ea
+EBUILD swift-2.19.0.ebuild 3935 BLAKE2B c7da0c9c29298153080238ec91a5021bd71140773a27edc33d479b7c6488d55445a3a90e8a6a0fca71b365fc58b6a1b0ad1cbafd77ac05fa7c078db7b9fc88f5 SHA512 7f9277225660c53621b9f1199e37cf4bbc9cec846a4d223a233ba80bdbbf1ca2f695bdc9e764e4b1de9c3671faa3e6f48eca9474b2f0b444746cf210e6939844
 EBUILD swift-2017.2.9999.ebuild 3711 BLAKE2B 1ede70612136464f13d35f97decc571eb37b28e2bbb9a5414e0b0d74d14bdc5d68e54123e74e066fa4eaeb4071b19816415faccf524b4a4aef79aa7709b2ffc0 SHA512 9aaf45d59410e93fe55c9aacdd2c0de697ce6d076af71b703b7c51df14eecf5fb1edc0d0e62a95240092a624f586a7e79167b33688087a2363208f22f4191bff
-EBUILD swift-2018.1.9999.ebuild 3838 BLAKE2B ad33e64ef8a647ab8a253dca63cec07046180fcff33c75d0e117c13ac1ca6a0eb6610408199fef664d128ca69083431d72a4562cdcc7d8d529e1900f422afd94 SHA512 69e036871b6ed85745f6a88199554f3b3113c39e529a80a093b6675cc0a99ca243ee8f29daea5e620d7a03726e5c9317a47edac7df8e0a8fa0e99b806169ae04
+EBUILD swift-2018.1.9999.ebuild 3840 BLAKE2B 1a700bd807c4cc9e6e62da8f29f72e8d45877230d08f7d8fc2047c936c7bfac9788e50c69215f47b6e6b498a8f8fa065b8bbf8c830dc5c6bb1fe10e6fed500fa SHA512 7aff849abb17a19ec0f9feb5c1d1d26428aaa91a764617e662c9bb89c4760d6ab2a36550b60f2674a4867a681af69b79ba3b6d69d9122f335b1c10345eb4187c
+EBUILD swift-2018.2.9999.ebuild 3936 BLAKE2B 8aedceb1506d24c0a6f4c0d219c3d1a734eb220bb5528c1f4e71e036b78da65bb96a656ba1d253a2a2181362711ec3d121106b3bd2013f3db103f5a61f63745e SHA512 d14f2c823a0d900aab54f7d4c919874372f3f996a4dfcb54595564bc2bafdec9761c5fecb041c54308851b7a1ad1da0ccc3136a399ccf0dd9b94fd329c11918f
 MISC metadata.xml 898 BLAKE2B 3d502769ba44cdc1e3a500929d60a1ed82d8540297b2dfddb6d6745ec9b5b56bd9fe7130a738858b9bac653b49634efae1841600325194d69ec30222b2e8b3f2 SHA512 3f9d2cf7538fe32010b811d3a49802eb085dde793b29d9590fe3032d63a743f620e3c1dcf1226b59aa5938ea239f440997a3d4d489f9887816621879e19a0c4c
diff --git a/sys-cluster/swift/swift-2.19.0.ebuild b/sys-cluster/swift/swift-2.19.0.ebuild
new file mode 100644
index 000000000000..6e4ce71625c2
--- /dev/null
+++ b/sys-cluster/swift/swift-2.19.0.ebuild
@@ -0,0 +1,122 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1 eutils linux-info user
+
+DESCRIPTION="A highly available, distributed, and eventually consistent object/blob store"
+HOMEPAGE="https://launchpad.net/swift"
+if [[ ${PV} == *9999 ]];then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/openstack/swift.git"
+	EGIT_BRANCH="stable/pike"
+else
+	SRC_URI="https://tarballs.openstack.org/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~x86"
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="proxy account container object +memcached"
+REQUIRED_USE="|| ( proxy account container object )"
+
+CDEPEND=">=dev-python/pbr-1.8.0[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}"
+
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/dnspython-1.14.0:0[${PYTHON_USEDEP}]
+	>=dev-python/eventlet-0.17.4[${PYTHON_USEDEP}]
+	!~dev-python/eventlet-0.23.0[${PYTHON_USEDEP}]
+	>=dev-python/greenlet-0.3.1[${PYTHON_USEDEP}]
+	>=dev-python/netifaces-0.5[${PYTHON_USEDEP}]
+	!~dev-python/netifaces-0.10.0[${PYTHON_USEDEP}]
+	!~dev-python/netifaces-0.10.1[${PYTHON_USEDEP}]
+	>=dev-python/pastedeploy-1.3.3[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	dev-python/pyxattr[${PYTHON_USEDEP}]
+	>=dev-python/PyECLib-1.3.1[${PYTHON_USEDEP}]
+	>=dev-python/cryptography-1.6.0[${PYTHON_USEDEP}]
+	!~dev-python/cryptography-2.0[${PYTHON_USEDEP}]
+	>=dev-python/ipaddress-1.0.16[${PYTHON_USEDEP}]
+	memcached? ( net-misc/memcached )
+	net-misc/rsync[xattr]"
+
+pkg_pretend() {
+	linux-info_pkg_setup
+	CONFIG_CHECK="~EXT3_FS_XATTR ~SQUASHFS_XATTR ~CIFS_XATTR ~JFFS2_FS_XATTR
+	~TMPFS_XATTR ~UBIFS_FS_XATTR ~EXT2_FS_XATTR ~REISERFS_FS_XATTR ~EXT4_FS_XATTR
+	~ZFS"
+	if linux_config_exists; then
+		for module in ${CONFIG_CHECK}; do
+			linux_chkconfig_present ${module} || ewarn "${module} needs to be enabled"
+		done
+	fi
+}
+
+pkg_setup() {
+	enewuser swift
+	enewgroup swift
+}
+
+src_prepare() {
+	sed -i 's/xattr/pyxattr/g' requirements.txt || die
+	sed -i '/^hacking/d' test-requirements.txt || die
+	distutils-r1_python_prepare_all
+}
+
+src_test () {
+	# https://bugs.launchpad.net/swift/+bug/1249727
+	find . \( -name test_wsgi.py -o -name test_locale.py -o -name test_utils.py \) -delete || die
+	SKIP_PIP_INSTALL=1 PBR_VERSION=0.6.0 sh .unittests || die
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	keepdir /etc/swift
+	insinto /etc/swift
+
+	newins "etc/swift.conf-sample" "swift.conf"
+	newins "etc/rsyncd.conf-sample" "rsyncd.conf"
+	newins "etc/mime.types-sample" "mime.types-sample"
+	newins "etc/memcache.conf-sample" "memcache.conf-sample"
+	newins "etc/drive-audit.conf-sample" "drive-audit.conf-sample"
+	newins "etc/dispersion.conf-sample" "dispersion.conf-sample"
+
+	if use proxy; then
+		newinitd "${FILESDIR}/swift-proxy.initd" "swift-proxy"
+		newins "etc/proxy-server.conf-sample" "proxy-server.conf"
+		if use memcached; then
+			sed -i '/depend/a\
+    need memcached' "${D}/etc/init.d/swift-proxy"
+		fi
+	fi
+	if use account; then
+		newinitd "${FILESDIR}/swift-account.initd" "swift-account"
+		newins "etc/account-server.conf-sample" "account-server.conf"
+	fi
+	if use container; then
+		newinitd "${FILESDIR}/swift-container.initd" "swift-container"
+		newins "etc/container-server.conf-sample" "container-server.conf"
+	fi
+	if use object; then
+		newinitd "${FILESDIR}/swift-object.initd" "swift-object"
+		newins "etc/object-server.conf-sample" "object-server.conf"
+		newins "etc/object-expirer.conf-sample" "object-expirer.conf"
+	fi
+
+	fowners root:swift "/etc/swift" || die "fowners failed"
+	fperms 0750 /etc/swift
+}
+
+pkg_postinst() {
+	elog "Openstack swift will default to using insecure http unless a"
+	elog "certificate is created in /etc/swift/cert.crt and the associated key"
+	elog "in /etc/swift/cert.key.  These can be created with the following:"
+	elog "  * cd /etc/swift"
+	elog "  * openssl req -new -x509 -nodes -out cert.crt -keyout cert.key"
+}
diff --git a/sys-cluster/swift/swift-2018.1.9999.ebuild b/sys-cluster/swift/swift-2018.1.9999.ebuild
index 2cf086833fec..39349853cf67 100644
--- a/sys-cluster/swift/swift-2018.1.9999.ebuild
+++ b/sys-cluster/swift/swift-2018.1.9999.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://launchpad.net/swift"
 if [[ ${PV} == *9999 ]];then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/openstack/swift.git"
-	EGIT_BRANCH="stable/pike"
+	EGIT_BRANCH="stable/queens"
 else
 	SRC_URI="https://tarballs.openstack.org/${PN}/${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm64 ~x86"
diff --git a/sys-cluster/swift/swift-2018.2.9999.ebuild b/sys-cluster/swift/swift-2018.2.9999.ebuild
new file mode 100644
index 000000000000..fc811ca9d0e5
--- /dev/null
+++ b/sys-cluster/swift/swift-2018.2.9999.ebuild
@@ -0,0 +1,122 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1 eutils linux-info user
+
+DESCRIPTION="A highly available, distributed, and eventually consistent object/blob store"
+HOMEPAGE="https://launchpad.net/swift"
+if [[ ${PV} == *9999 ]];then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/openstack/swift.git"
+	EGIT_BRANCH="stable/rocky"
+else
+	SRC_URI="https://tarballs.openstack.org/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~x86"
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE="proxy account container object +memcached"
+REQUIRED_USE="|| ( proxy account container object )"
+
+CDEPEND=">=dev-python/pbr-1.8.0[${PYTHON_USEDEP}]"
+DEPEND="
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	${CDEPEND}"
+
+RDEPEND="
+	${CDEPEND}
+	>=dev-python/dnspython-1.14.0:0[${PYTHON_USEDEP}]
+	>=dev-python/eventlet-0.17.4[${PYTHON_USEDEP}]
+	!~dev-python/eventlet-0.23.0[${PYTHON_USEDEP}]
+	>=dev-python/greenlet-0.3.1[${PYTHON_USEDEP}]
+	>=dev-python/netifaces-0.5[${PYTHON_USEDEP}]
+	!~dev-python/netifaces-0.10.0[${PYTHON_USEDEP}]
+	!~dev-python/netifaces-0.10.1[${PYTHON_USEDEP}]
+	>=dev-python/pastedeploy-1.3.3[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	dev-python/pyxattr[${PYTHON_USEDEP}]
+	>=dev-python/PyECLib-1.3.1[${PYTHON_USEDEP}]
+	>=dev-python/cryptography-1.6.0[${PYTHON_USEDEP}]
+	!~dev-python/cryptography-2.0[${PYTHON_USEDEP}]
+	>=dev-python/ipaddress-1.0.16[${PYTHON_USEDEP}]
+	memcached? ( net-misc/memcached )
+	net-misc/rsync[xattr]"
+
+pkg_pretend() {
+	linux-info_pkg_setup
+	CONFIG_CHECK="~EXT3_FS_XATTR ~SQUASHFS_XATTR ~CIFS_XATTR ~JFFS2_FS_XATTR
+	~TMPFS_XATTR ~UBIFS_FS_XATTR ~EXT2_FS_XATTR ~REISERFS_FS_XATTR ~EXT4_FS_XATTR
+	~ZFS"
+	if linux_config_exists; then
+		for module in ${CONFIG_CHECK}; do
+			linux_chkconfig_present ${module} || ewarn "${module} needs to be enabled"
+		done
+	fi
+}
+
+pkg_setup() {
+	enewuser swift
+	enewgroup swift
+}
+
+src_prepare() {
+	sed -i 's/xattr/pyxattr/g' requirements.txt || die
+	sed -i '/^hacking/d' test-requirements.txt || die
+	distutils-r1_python_prepare_all
+}
+
+src_test () {
+	# https://bugs.launchpad.net/swift/+bug/1249727
+	find . \( -name test_wsgi.py -o -name test_locale.py -o -name test_utils.py \) -delete || die
+	SKIP_PIP_INSTALL=1 PBR_VERSION=0.6.0 sh .unittests || die
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+	keepdir /etc/swift
+	insinto /etc/swift
+
+	newins "etc/swift.conf-sample" "swift.conf"
+	newins "etc/rsyncd.conf-sample" "rsyncd.conf"
+	newins "etc/mime.types-sample" "mime.types-sample"
+	newins "etc/memcache.conf-sample" "memcache.conf-sample"
+	newins "etc/drive-audit.conf-sample" "drive-audit.conf-sample"
+	newins "etc/dispersion.conf-sample" "dispersion.conf-sample"
+
+	if use proxy; then
+		newinitd "${FILESDIR}/swift-proxy.initd" "swift-proxy"
+		newins "etc/proxy-server.conf-sample" "proxy-server.conf"
+		if use memcached; then
+			sed -i '/depend/a\
+    need memcached' "${D}/etc/init.d/swift-proxy"
+		fi
+	fi
+	if use account; then
+		newinitd "${FILESDIR}/swift-account.initd" "swift-account"
+		newins "etc/account-server.conf-sample" "account-server.conf"
+	fi
+	if use container; then
+		newinitd "${FILESDIR}/swift-container.initd" "swift-container"
+		newins "etc/container-server.conf-sample" "container-server.conf"
+	fi
+	if use object; then
+		newinitd "${FILESDIR}/swift-object.initd" "swift-object"
+		newins "etc/object-server.conf-sample" "object-server.conf"
+		newins "etc/object-expirer.conf-sample" "object-expirer.conf"
+	fi
+
+	fowners root:swift "/etc/swift" || die "fowners failed"
+	fperms 0750 /etc/swift
+}
+
+pkg_postinst() {
+	elog "Openstack swift will default to using insecure http unless a"
+	elog "certificate is created in /etc/swift/cert.crt and the associated key"
+	elog "in /etc/swift/cert.key.  These can be created with the following:"
+	elog "  * cd /etc/swift"
+	elog "  * openssl req -new -x509 -nodes -out cert.crt -keyout cert.key"
+}