From d934827bf44b7cfcf6711964418148fa60877668 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Wed, 25 Nov 2020 22:39:15 +0000 Subject: gentoo resync : 25.11.2020 --- sys-cluster/swift/Manifest | 8 +- sys-cluster/swift/swift-2.25.0.ebuild | 113 ----------------------------- sys-cluster/swift/swift-2.25.1.ebuild | 113 +++++++++++++++++++++++++++++ sys-cluster/swift/swift-2.26.0.ebuild | 8 +- sys-cluster/swift/swift-2020.2.9999.ebuild | 8 +- 5 files changed, 123 insertions(+), 127 deletions(-) delete mode 100644 sys-cluster/swift/swift-2.25.0.ebuild create mode 100644 sys-cluster/swift/swift-2.25.1.ebuild (limited to 'sys-cluster/swift') diff --git a/sys-cluster/swift/Manifest b/sys-cluster/swift/Manifest index 3a751aca0982..8b8e14929c34 100644 --- a/sys-cluster/swift/Manifest +++ b/sys-cluster/swift/Manifest @@ -2,10 +2,10 @@ AUX swift-account.initd 867 BLAKE2B 12a01902f520b2c25261a229e1239c3f85ba05dd708e AUX swift-container.initd 877 BLAKE2B f45f04d6d6d4fefdf153d40d1480535cb6552daa812854328e845ff8afb96ffd4f947a0a38437ec401a10c493701f328667e1b7e314ea39510c957ec3e7be2bc SHA512 46ae66806db3cb8b9416ccde1a08f0f8af5dd1bbeeda23fc547f8ed29f979c554b47ff0c9ca13f8944ec8c3f4c2d0ffd0616bead4ac9b42078ffaf0ba238d52b AUX swift-object.initd 862 BLAKE2B 2a062873ab613e7d98d78758ccae793d8d952cb66922d900353a516738014cfe72f98a6830d0af523757e15b432b88f991753572a3e1b8e248af8e1bf43d2b70 SHA512 a977e3d81e22785b4999e5dbe6c51c020f98fe4ba08d52ff971477fca606a7fbd8e80f4c45ac6ba6afa213ddca7b81acc6238d91bb5c45635cc68c174575aa05 AUX swift-proxy.initd 1379 BLAKE2B 56453a557c0abfd6b07f65778ef14d8920bedc4133e0efa1aa4a5466a72103e9b57b361f481e0b5cb816471161196755de7794bd3ea3d6f5120cc1f159489c22 SHA512 dd32e4249686b51d2ed6add8e2e91eb9e520c662ebdf068f68b4e52faf4d508d3c87e996c6c2f7ba2a7d1f5fdf639d08e1e6878cd4c9918408e007ccbd7c84ec -DIST swift-2.25.0.tar.gz 3183764 BLAKE2B 865cfcc832edb1f30a4529b0ff550c987a7413c841b9f1ef0d0a145f5be55762963b32ea332aa6f51690a871124e84dc7fb036309f38d4120a1e095e60bfaa34 SHA512 60cbc4bae61bb287e93d9a6a4e9a58a9c97f407d07927dde99c923d1ee7ab4ef79350c7c0cdcaab8aa0944aee09c27da549f3ebf86eb9bb92766b2b301d593a2 +DIST swift-2.25.1.tar.gz 3161690 BLAKE2B 985bcb884f4de9a7a4fbb8e2e76ff416035ac4554d3135c04d679c1d88a8443b988b5a18b4f3f1864542c93109020bb77eef72836fd40e705a9293c8a481e4f0 SHA512 4943949a420fa174e30c178b07797af4dceb89174c2e13ac9db35ff66a648024c907b52b9cdba2f730bc587b4d712efa3da09e77ccca51bd537703fc3c17144b DIST swift-2.26.0.tar.gz 3235050 BLAKE2B 33b46ebc3bd57b6ca6ccb65e96dd11a754fa1b4d314c60eafd23ad8b6bb7b8fee42ce26ccf0f388ad33599520a049a2d36832ba3d1ea01b0a07a8bee3f803569 SHA512 5e4620831bfc75f231fa468ce68438a23ad7b013eef4173aa596fd2e42bd4eb7e6b4182026fa71b6f4dd31d2cfccc4e70480a42a77f93b15bf6e50e9287ea460 -EBUILD swift-2.25.0.ebuild 3567 BLAKE2B 79524bfd15b08c165957bac7e4f97c5d031299d9c10842ff684773e4f4e00b097fff48b30b63d75f063053d8ba3b05b3013439d480be1920e16ac7e4f6eb9bc3 SHA512 e73ff05580f793393e50df4b8f63e243b1a5e565650d5c32e5b261bd49f9bb473a341223dc324b8dfd1294400ab4ea251be3aa0650c6333120142da4e89aed62 -EBUILD swift-2.26.0.ebuild 3571 BLAKE2B 4415527a7b925556b0804a544cae5a0b739c0f63b62fdd4da7649fbaa157a90934feb68187268c9cbf098ca76651627d6a240130a506ec46b8eaeb5fa38110e2 SHA512 675bac0bc5aab5506298219fdf94aa61aeaf4dd693f338c5e9610dfb3ae7be90d3eb82674d82e031cc7954f1672375f147cbf5862cc2b26de4acd4340ddc5a1e +EBUILD swift-2.25.1.ebuild 3567 BLAKE2B 79524bfd15b08c165957bac7e4f97c5d031299d9c10842ff684773e4f4e00b097fff48b30b63d75f063053d8ba3b05b3013439d480be1920e16ac7e4f6eb9bc3 SHA512 e73ff05580f793393e50df4b8f63e243b1a5e565650d5c32e5b261bd49f9bb473a341223dc324b8dfd1294400ab4ea251be3aa0650c6333120142da4e89aed62 +EBUILD swift-2.26.0.ebuild 3558 BLAKE2B 599a618cf171cd36ff6a54bd42c9eb11722c9bf903a7658873b38ddd1dec12291db724958e331f887b2ff10fe6a87a65f9447908e240aa778eb6601c47d5a846 SHA512 dd80a0ced28bbc0798269393e3efbd58fc6117c709f2bfe86fcb5452bd295fad52cc2985394666ab3f122db13b29c9451a2ad3394e368f436de30068ca8f61a2 EBUILD swift-2020.1.9999.ebuild 3569 BLAKE2B 901731709a4ca6289693213aad24d1c0192fbf3c86010a4ed30576171431444801d192d901a93b343cfb20d64c2a1eb88d9f65c08b08de43ccc31d0beb240f43 SHA512 0626d00a366fe4e9888a6d11fa8cfc4d14118b935168a702927e970b202c7ca29c7af792720631ea5caf814b220b552f779a403c1f6edcacb1a11bc50c06e0e9 -EBUILD swift-2020.2.9999.ebuild 3571 BLAKE2B 12c3ed054683ee1aa51a89cde71014d974d6c09866548edf3893819c3e810718fa1183e4ca096014213d82f08a43f2566499f7f43fd440e3e0231e40559bcccd SHA512 4ee1b8fe2119f80de4ff6de9ad0a296e57164cfb98f315f825f98d7175d41743be93c7aa3f9e65513533a195abd92a1d66312c764d503e1cce47f41755f38465 +EBUILD swift-2020.2.9999.ebuild 3560 BLAKE2B 9c19277d049c3dc95727055588316c32c0e117502bc9063af06232b90b1f4931dd7750fc3c127cdf2742ff0a95302610a18a3d26663c525eddd7effea52a3350 SHA512 5442fa9054960255a79a8c59bef410c1bcdc512ba8dce13ed9c1022bd52eece85c1298ca89123fd8a3f6942a92b0d5f461b0e2489066029abef9685351a7dc1d MISC metadata.xml 758 BLAKE2B 8b1f494e6c40f469c01b494154d32702dc9b848939ea67005d8065c39661fcb97b5ca9cdee524ca66f0e74af5f9c522ca236b628a9b0289eef4f808e5f32461e SHA512 94a6af6b29a7f968d1e23a70decb908b9de10f792f1bd0711b95ea18abf59595d42017da6f278ed4991695ebbe0941d8907c160412e20758697597179fc3bb19 diff --git a/sys-cluster/swift/swift-2.25.0.ebuild b/sys-cluster/swift/swift-2.25.0.ebuild deleted file mode 100644 index aa8c6a1c6e5b..000000000000 --- a/sys-cluster/swift/swift-2.25.0.ebuild +++ /dev/null @@ -1,113 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -PYTHON_COMPAT=( python3_6 python3_7 ) - -inherit distutils-r1 eutils linux-info - -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/ussuri" -else - SRC_URI="https://tarballs.openstack.org/${PN}/${P}.tar.gz" - KEYWORDS="amd64 ~arm64 x86" -fi - -LICENSE="Apache-2.0" -SLOT="0" -IUSE="account container doc +memcached +object proxy" -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/eventlet-0.25.0[${PYTHON_USEDEP}] - >=dev-python/greenlet-0.3.2[${PYTHON_USEDEP}] - >=dev-python/netifaces-0.8[${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.10.0[${PYTHON_USEDEP}] - dev-python/pyxattr[${PYTHON_USEDEP}] - >=dev-python/PyECLib-1.3.1[${PYTHON_USEDEP}] - >=dev-python/cryptography-2.0.2[${PYTHON_USEDEP}] - memcached? ( net-misc/memcached ) - net-misc/rsync[xattr] - acct-user/swift - acct-group/swift" - -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 -} - -src_prepare() { - sed -i 's/xattr/pyxattr/g' requirements.txt || die - sed -i '/^hacking/d' test-requirements.txt || die - distutils-r1_python_prepare_all -} - -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 - - if use doc; then - doman doc/manpages/* - dodoc -r doc/{s3api,saio,source} - fi - - fowners root:swift "/etc/swift" - 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-2.25.1.ebuild b/sys-cluster/swift/swift-2.25.1.ebuild new file mode 100644 index 000000000000..aa8c6a1c6e5b --- /dev/null +++ b/sys-cluster/swift/swift-2.25.1.ebuild @@ -0,0 +1,113 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 +PYTHON_COMPAT=( python3_6 python3_7 ) + +inherit distutils-r1 eutils linux-info + +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/ussuri" +else + SRC_URI="https://tarballs.openstack.org/${PN}/${P}.tar.gz" + KEYWORDS="amd64 ~arm64 x86" +fi + +LICENSE="Apache-2.0" +SLOT="0" +IUSE="account container doc +memcached +object proxy" +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/eventlet-0.25.0[${PYTHON_USEDEP}] + >=dev-python/greenlet-0.3.2[${PYTHON_USEDEP}] + >=dev-python/netifaces-0.8[${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.10.0[${PYTHON_USEDEP}] + dev-python/pyxattr[${PYTHON_USEDEP}] + >=dev-python/PyECLib-1.3.1[${PYTHON_USEDEP}] + >=dev-python/cryptography-2.0.2[${PYTHON_USEDEP}] + memcached? ( net-misc/memcached ) + net-misc/rsync[xattr] + acct-user/swift + acct-group/swift" + +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 +} + +src_prepare() { + sed -i 's/xattr/pyxattr/g' requirements.txt || die + sed -i '/^hacking/d' test-requirements.txt || die + distutils-r1_python_prepare_all +} + +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 + + if use doc; then + doman doc/manpages/* + dodoc -r doc/{s3api,saio,source} + fi + + fowners root:swift "/etc/swift" + 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-2.26.0.ebuild b/sys-cluster/swift/swift-2.26.0.ebuild index 2ea038c24b43..b31a3f9eed76 100644 --- a/sys-cluster/swift/swift-2.26.0.ebuild +++ b/sys-cluster/swift/swift-2.26.0.ebuild @@ -3,6 +3,7 @@ EAPI=7 PYTHON_COMPAT=( python3_7 python3_8 ) +DISTUTILS_USE_SETUPTOOLS=rdepend inherit distutils-r1 eutils linux-info @@ -14,7 +15,7 @@ if [[ ${PV} == *9999 ]];then EGIT_BRANCH="stable/victoria" else SRC_URI="https://tarballs.openstack.org/${PN}/${P}.tar.gz" - KEYWORDS="~amd64 ~arm64 ~x86" + KEYWORDS="amd64 ~arm64 x86" fi LICENSE="Apache-2.0" @@ -23,10 +24,7 @@ IUSE="account container doc +memcached +object proxy" REQUIRED_USE="|| ( proxy account container object )" CDEPEND=">=dev-python/pbr-1.8.0[${PYTHON_USEDEP}]" -DEPEND=" - dev-python/setuptools[${PYTHON_USEDEP}] - ${CDEPEND}" - +DEPEND="${CDEPEND}" RDEPEND=" ${CDEPEND} >=dev-python/eventlet-0.25.0[${PYTHON_USEDEP}] diff --git a/sys-cluster/swift/swift-2020.2.9999.ebuild b/sys-cluster/swift/swift-2020.2.9999.ebuild index 68cffb20f363..084afc372ec6 100644 --- a/sys-cluster/swift/swift-2020.2.9999.ebuild +++ b/sys-cluster/swift/swift-2020.2.9999.ebuild @@ -2,7 +2,8 @@ # Distributed under the terms of the GNU General Public License v2 EAPI=7 -PYTHON_COMPAT=( python3_6 python3_7 ) +PYTHON_COMPAT=( python3_7 python3_8 ) +DISTUTILS_USE_SETUPTOOLS=rdepend inherit distutils-r1 eutils linux-info @@ -23,10 +24,7 @@ IUSE="account container doc +memcached +object proxy" REQUIRED_USE="|| ( proxy account container object )" CDEPEND=">=dev-python/pbr-1.8.0[${PYTHON_USEDEP}]" -DEPEND=" - dev-python/setuptools[${PYTHON_USEDEP}] - ${CDEPEND}" - +DEPEND="${CDEPEND}" RDEPEND=" ${CDEPEND} >=dev-python/eventlet-0.25.0[${PYTHON_USEDEP}] -- cgit v1.2.3