From 59ab450e7a612e0215ecb7a5acb9de4c414b255d Mon Sep 17 00:00:00 2001 From: Matthew Thode Date: Tue, 17 Mar 2020 08:49:11 -0500 Subject: sys-cluster/swift: migration to user packages Package-Manager: Portage-2.3.89, Repoman-2.3.20 RepoMan-Options: --force Signed-off-by: Matthew Thode --- sys-cluster/swift/metadata.xml | 4 - sys-cluster/swift/swift-2.23.1-r1.ebuild | 123 ------------------------------- sys-cluster/swift/swift-2.23.1-r2.ebuild | 119 ++++++++++++++++++++++++++++++ 3 files changed, 119 insertions(+), 127 deletions(-) delete mode 100644 sys-cluster/swift/swift-2.23.1-r1.ebuild create mode 100644 sys-cluster/swift/swift-2.23.1-r2.ebuild (limited to 'sys-cluster') diff --git a/sys-cluster/swift/metadata.xml b/sys-cluster/swift/metadata.xml index 14aa35f3e4a6..6a12c88d2a76 100644 --- a/sys-cluster/swift/metadata.xml +++ b/sys-cluster/swift/metadata.xml @@ -16,10 +16,6 @@ openstack@gentoo.org Openstack - - Swift is a highly available, distributed, eventually consistent object/blob - store. - swift diff --git a/sys-cluster/swift/swift-2.23.1-r1.ebuild b/sys-cluster/swift/swift-2.23.1-r1.ebuild deleted file mode 100644 index 81130d620e21..000000000000 --- a/sys-cluster/swift/swift-2.23.1-r1.ebuild +++ /dev/null @@ -1,123 +0,0 @@ -# Copyright 1999-2020 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 -PYTHON_COMPAT=( python3_6 python3_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/train" -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]" - -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 - - 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.23.1-r2.ebuild b/sys-cluster/swift/swift-2.23.1-r2.ebuild new file mode 100644 index 000000000000..0209967c131d --- /dev/null +++ b/sys-cluster/swift/swift-2.23.1-r2.ebuild @@ -0,0 +1,119 @@ +# 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/train" +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 +} + +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 + + 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" +} -- cgit v1.2.3-65-gdbad