diff options
author | Matthew Thode <prometheanfire@gentoo.org> | 2015-04-28 20:33:39 +0000 |
---|---|---|
committer | Matthew Thode <prometheanfire@gentoo.org> | 2015-04-28 20:33:39 +0000 |
commit | 5a0a78bed4c3847463d3c1e65e92031036bace6d (patch) | |
tree | 4914e1ab917a73c6dd9ec43ba4fb6079e2f4f81a | |
parent | Version bump (bug 546510, thanks Jeremy Murphy). (diff) | |
download | gentoo-2-5a0a78bed4c3847463d3c1e65e92031036bace6d.tar.gz gentoo-2-5a0a78bed4c3847463d3c1e65e92031036bace6d.tar.bz2 gentoo-2-5a0a78bed4c3847463d3c1e65e92031036bace6d.zip |
removing swift based on git master (because keeping up to date on deps sucks)
(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key 0x33ED3FD25AFC78BA)
-rw-r--r-- | sys-cluster/swift/ChangeLog | 5 | ||||
-rw-r--r-- | sys-cluster/swift/swift-9999.ebuild | 112 |
2 files changed, 4 insertions, 113 deletions
diff --git a/sys-cluster/swift/ChangeLog b/sys-cluster/swift/ChangeLog index 94783dd6c9b5..e0607424b33d 100644 --- a/sys-cluster/swift/ChangeLog +++ b/sys-cluster/swift/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for sys-cluster/swift # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-cluster/swift/ChangeLog,v 1.42 2015/04/14 15:25:39 prometheanfire Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-cluster/swift/ChangeLog,v 1.43 2015/04/28 20:33:39 prometheanfire Exp $ + + 28 Apr 2015; Matthew Thode <prometheanfire@gentoo.org> -swift-9999.ebuild: + removing swift based on git master (because keeping up to date on deps sucks) *swift-2.2.2-r1 (14 Apr 2015) diff --git a/sys-cluster/swift/swift-9999.ebuild b/sys-cluster/swift/swift-9999.ebuild deleted file mode 100644 index a8551793908d..000000000000 --- a/sys-cluster/swift/swift-9999.ebuild +++ /dev/null @@ -1,112 +0,0 @@ -# Copyright 1999-2014 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-cluster/swift/swift-9999.ebuild,v 1.8 2014/08/01 04:53:23 prometheanfire Exp $ - -EAPI=5 -PYTHON_COMPAT=( python2_7 ) - -inherit distutils-r1 eutils git-2 linux-info user - -DESCRIPTION="A highly available, distributed, eventually consistent object/blob store" -HOMEPAGE="https://launchpad.net/swift" -EGIT_REPO_URI="https://github.com/openstack/swift.git" - -LICENSE="Apache-2.0" -SLOT="0" -KEYWORDS="" -IUSE="proxy account container object test +memcache" -REQUIRED_USE="|| ( proxy account container object )" - -DEPEND="dev-python/setuptools[${PYTHON_USEDEP}] - >=dev-python/pbr-0.6.0[${PYTHON_USEDEP}] - <dev-python/pbr-1.0[${PYTHON_USEDEP}] - test? ( >=dev-python/hacking-0.8.0[${PYTHON_USEDEP}] - <dev-python/hacking-0.9[${PYTHON_USEDEP}] - dev-python/coverage[${PYTHON_USEDEP}] - dev-python/nose[${PYTHON_USEDEP}] - dev-python/nosexcover[${PYTHON_USEDEP}] - dev-python/openstack-nose-plugin[${PYTHON_USEDEP}] - dev-python/nosehtmloutput[${PYTHON_USEDEP}] - >=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}] - <dev-python/sphinx-1.2[${PYTHON_USEDEP}] - >=dev-python/mock-0.8.0[${PYTHON_USEDEP}] - dev-python/python-swiftclient[${PYTHON_USEDEP}] )" - -RDEPEND=">=dev-python/dnspython-1.9.4[${PYTHON_USEDEP}] - >=dev-python/eventlet-0.9.15[${PYTHON_USEDEP}] - >=dev-python/greenlet-0.3.1[${PYTHON_USEDEP}] - >=dev-python/netifaces-0.5[${PYTHON_USEDEP}] - >=dev-python/pastedeploy-1.3.3[${PYTHON_USEDEP}] - >=dev-python/simplejson-2.0.9[${PYTHON_USEDEP}] - dev-python/pyxattr[${PYTHON_USEDEP}] - memcache? ( net-misc/memcached ) - net-misc/rsync[xattr]" - -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" - -#PATCHES=( "${FILESDIR}/CVE-2014-0006-master.diff" ) - -pkg_setup() { - enewuser swift - enewgroup swift -} - -src_prepare() { - sed -i 's/xattr/pyxattr/g' "${S}/swift.egg-info/requires.txt" - sed -i 's/xattr/pyxattr/g' "${S}/requirements.txt" - 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() { - distutils-r1_python_install - keepdir /etc/swift - insinto /etc/swift - - newins "etc/swift.conf-sample" "swift.conf" -# newins "etc/swift-bench.conf-sample" "swift-bench.conf-sample" - 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 memcache; 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 swift:swift "/etc/swift" || die "fowners failed" -} - -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" -} |