commit: d2102b9db7f10ca6c2d9be818c8264eefee5a6b5 Author: Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com> AuthorDate: Fri Mar 18 09:47:37 2022 +0000 Commit: Alessandro Barbieri <lssndrbarbieri <AT> gmail <DOT> com> CommitDate: Fri Mar 18 09:49:06 2022 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=d2102b9d
sys-cluster/swift: new version Closes: https://bugs.gentoo.org/817851 Signed-off-by: Alessandro Barbieri <lssndrbarbieri <AT> gmail.com> sys-cluster/swift/Manifest | 3 +- sys-cluster/swift/metadata.xml | 1 + sys-cluster/swift/swift-2.26.0.ebuild | 111 --------------------- .../{swift-2.27.0.ebuild => swift-2.28.0.ebuild} | 59 ++++++----- 4 files changed, 37 insertions(+), 137 deletions(-) diff --git a/sys-cluster/swift/Manifest b/sys-cluster/swift/Manifest index a74f3c0e4..5de73db63 100644 --- a/sys-cluster/swift/Manifest +++ b/sys-cluster/swift/Manifest @@ -1,2 +1 @@ -DIST swift-2.26.0.tar.gz 3235050 BLAKE2B 33b46ebc3bd57b6ca6ccb65e96dd11a754fa1b4d314c60eafd23ad8b6bb7b8fee42ce26ccf0f388ad33599520a049a2d36832ba3d1ea01b0a07a8bee3f803569 SHA512 5e4620831bfc75f231fa468ce68438a23ad7b013eef4173aa596fd2e42bd4eb7e6b4182026fa71b6f4dd31d2cfccc4e70480a42a77f93b15bf6e50e9287ea460 -DIST swift-2.27.0.tar.gz 3464571 BLAKE2B 9495abc39b150615a8f7f1900573c643b4f2edd5c187c4d525c4ad7d7e0c2d54eeec0f9b3d8711ed2028cf4d606dee532bd8e4af4b3e1527f3cee5bcc8e62835 SHA512 c9abfa16cfb4964bd774a3dd50c847bf1912e5f87edc8693746e2dcb5863289b9afd2b69b0cc0940aa3fbb49694851b0b6418462367078d0c40d2b724b135467 +DIST swift-2.28.0.tar.gz 3535718 BLAKE2B 437cc8d7958b2bd16d936c980204fe313855831720c875082cf7552dc9a0f96d9d09835bc0e65926cd3ff304fe7cf21fb942f9c3d879384e858501acc5b0ad13 SHA512 ab9e8222263dd8bb93481617252cf0858b443835906ce7080c9f21170fcb4fa51af5c7b9184893fc65081a5d3b721a7897320a9d1cb828f9f9910a4872128126 diff --git a/sys-cluster/swift/metadata.xml b/sys-cluster/swift/metadata.xml index 8108567f9..73eabd2b6 100644 --- a/sys-cluster/swift/metadata.xml +++ b/sys-cluster/swift/metadata.xml @@ -15,5 +15,6 @@ </use> <upstream> <remote-id type="launchpad">swift</remote-id> + <remote-id type="github">openstack/swift</remote-id> </upstream> </pkgmetadata> diff --git a/sys-cluster/swift/swift-2.26.0.ebuild b/sys-cluster/swift/swift-2.26.0.ebuild deleted file mode 100644 index 9451c2cad..000000000 --- a/sys-cluster/swift/swift-2.26.0.ebuild +++ /dev/null @@ -1,111 +0,0 @@ -# Copyright 1999-2021 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 -PYTHON_COMPAT=( python3_8 ) -DISTUTILS_USE_SETUPTOOLS=rdepend - -inherit distutils-r1 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/victoria" -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="${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.27.0.ebuild b/sys-cluster/swift/swift-2.28.0.ebuild similarity index 75% rename from sys-cluster/swift/swift-2.27.0.ebuild rename to sys-cluster/swift/swift-2.28.0.ebuild index 35794a21e..779394c24 100644 --- a/sys-cluster/swift/swift-2.27.0.ebuild +++ b/sys-cluster/swift/swift-2.28.0.ebuild @@ -1,48 +1,60 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI=7 -PYTHON_COMPAT=( python3_8 python3_9 ) -DISTUTILS_USE_SETUPTOOLS=rdepend +EAPI=8 + +PYTHON_COMPAT=( python3_{8..9} ) inherit distutils-r1 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/victoria" -else - SRC_URI="https://tarballs.openstack.org/${PN}/${P}.tar.gz"; - KEYWORDS="~amd64 ~arm64 ~x86" -fi +HOMEPAGE=" + https://github.com/openstack/swift + https://launchpad.net/swift +" +SRC_URI="https://tarballs.openstack.org/${PN}/${P}.tar.gz"; +KEYWORDS="~amd64" 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="${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/pastedeploy-2.0.0[${PYTHON_USEDEP}] >=dev-python/lxml-3.4.1[${PYTHON_USEDEP}] >=dev-python/requests-2.14.2[${PYTHON_USEDEP}] >=dev-python/six-1.10.0[${PYTHON_USEDEP}] - dev-python/pyxattr[${PYTHON_USEDEP}] + >=dev-python/xattr-0.4[${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" + acct-group/swift + + memcached? ( net-misc/memcached ) +" +DEPEND="${RDEPEND}" +BDEPEND=" + test? ( + >=dev-python/nosexcover-1.0.10[${PYTHON_USEDEP}] + >=dev-python/nosehtmloutput-0.0.3[${PYTHON_USEDEP}] + >=dev-python/mock-2.0[${PYTHON_USEDEP}] + >=dev-python/python-swiftclient-3.2.0[${PYTHON_USEDEP}] + >=dev-python/python-keystoneclient-2.0.0[${PYTHON_USEDEP}] + >=dev-python/boto-2.32.1[${PYTHON_USEDEP}] + >=dev-python/boto3-1.9[${PYTHON_USEDEP}] + >=dev-python/botocore-1.12[${PYTHON_USEDEP}] + >=dev-python/requests-mock-1.2.0[${PYTHON_USEDEP}] + >=dev-python/keystonemiddleware-4.17.0[${PYTHON_USEDEP}] + ) +" + +REQUIRED_USE="|| ( proxy account container object )" + +distutils_enable_tests nose pkg_pretend() { linux-info_pkg_setup @@ -57,7 +69,6 @@ pkg_pretend() { } src_prepare() { - sed -i 's/xattr/pyxattr/g' requirements.txt || die sed -i '/^hacking/d' test-requirements.txt || die distutils-r1_python_prepare_all }
