summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatt Thode <prometheanfire@gentoo.org>2015-04-28 20:33:44 +0000
committerMatt Thode <prometheanfire@gentoo.org>2015-04-28 20:33:44 +0000
commit823f38ec8aa0ff902480d85b8c8908fd4eef4722 (patch)
tree0a2327a654b482c4fbbb47e8adb58a22c6c7904d /sys-cluster
parentVersion bump (bug 546510, thanks Jeremy Murphy). (diff)
downloadhistorical-823f38ec8aa0ff902480d85b8c8908fd4eef4722.tar.gz
historical-823f38ec8aa0ff902480d85b8c8908fd4eef4722.tar.bz2
historical-823f38ec8aa0ff902480d85b8c8908fd4eef4722.zip
removing swift based on git master (because keeping up to date on deps sucks)
Package-Manager: portage-2.2.14/cvs/Linux x86_64 Manifest-Sign-Key: 0x33ED3FD25AFC78BA
Diffstat (limited to 'sys-cluster')
-rw-r--r--sys-cluster/swift/ChangeLog5
-rw-r--r--sys-cluster/swift/Manifest29
-rw-r--r--sys-cluster/swift/swift-9999.ebuild112
3 files changed, 18 insertions, 128 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/Manifest b/sys-cluster/swift/Manifest
index 1516b436a02e..272e8f90e11b 100644
--- a/sys-cluster/swift/Manifest
+++ b/sys-cluster/swift/Manifest
@@ -8,23 +8,22 @@ AUX swift-object.initd 986 SHA256 e53fd0e15faad19da10258d9857f24ceb0c589d06bff57
AUX swift-proxy.initd 1502 SHA256 65e8d40f51324e7c61121ea0d38b607084d9d1bec0859cdefb8b09a86ba993cb SHA512 17e9875b3e7f5dfaa1681279cb59708dfa12fdd866a5fb9c3968dd081a4c95d0bc51ab652916073b0b42b2ce9cfbf997093ce9c0e5d4c66b43242ef4f6dd7387 WHIRLPOOL d800071bd7e44e97ef97f4beff5f4aa8c932a01c8ddd067b3f5b1d7256554cb1d9d8eac80b738198cb3870fb88b7cf11ef41e8b842b8b898e510a11b376c6570
DIST swift-2.2.2.tar.gz 1038850 SHA256 d97ff8e3c1381611ca2f9cd3eb13000e3339166e06d67ec079ce9ec958d1a088 SHA512 5abe34679305df18dabf49e6e9a6ddf7b890718a4586b1a33cadf0eb47412861a4af53d6124d2a238e463603d11b134a5afa2867939cb3cea49774ae9601d8e6 WHIRLPOOL 57f7364c0e2fa9094837b7127d4380df52a263150be05d84142e1d1256911d0466e7098a7f2a0380b087fb5da313d5a65a973f42b1e39bc102be46f21000c8ef
EBUILD swift-2.2.2-r1.ebuild 4091 SHA256 e636fc3daf38751da971e52573888bbf9a13713effff418ef71945dc0d542f04 SHA512 018521764c18349ba0e9d32a0418103c861bb1576ea57c080ae7656cb6839bf10c9d40bbedbf7b6a99d25dfef194aa16fdf82e38297a59a0ffa9a5417a81b333 WHIRLPOOL 076d22eb72af072f882f018e9c42e95e84b898c2a43b19c743413dbb36eb449deebf46be4966bdd43c1370a4cfdf10852edcab69874bcd243c85aad83a077a3d
-EBUILD swift-9999.ebuild 3995 SHA256 0e9b13e7327e541b2afd5cce0b25118452d2df36a0b00355b4a1bf78af07ea8f SHA512 b9dfadc3a915c5c24c6ed34415023f06ce0e736f5a892b8266311eb79a7c81f722750f5356aa7fbf2709594517df61fd1c78cb6816b98bc8f15efdfb16f73f61 WHIRLPOOL 9319a30f1c3320a81fb6c13770ca7852f2eda5f1d589a3c6d02d9c4154af6d35d6c5609a86affaf602f15774dcb4302b12ee29aa64420a114630b321ed9b194b
-MISC ChangeLog 7585 SHA256 1b2625d827c7ce2aef9782734e091a41debc7eb03444a9e5ee0b90d95b34485f SHA512 60328354b7ddc3dfec7e747c85a1a9269bf4929d3b833b6f8f3ae1b4eeb2fd43dd1f796ce5d3cb9ddae8a36b8971bcb004756d715b62a1958082a03544e3de41 WHIRLPOOL 30ffbe351e2a0c151ef842d8e470e3761adc6368a19b624b83db6f08d393fad846d6f27e358fe36bd3d7c379cb189dd1026a11897e8c63630e897dd6fa27f80f
+MISC ChangeLog 7743 SHA256 bfeb17a5d173bbfbe41ea4fa5d91ec8e54a0b649c0addc5425806c7fa9322f7b SHA512 8a22f97bee85b5ee5d0063d2e8a58cd5a1767e40f63ec307764f7c7c23dd7e6a3ec593d697bf0e05fcf890d90daf3a04161cb9b9d24cf2ae9f5df53df343b8f1 WHIRLPOOL 1f7ec2ebc2cf1227b0fd218c686e9b386ae7c4b2f5c355c15f44a5cf990c10024f1b0e54e033fbda0e4cca1b9f2664ee5a090617925b96839b6b1c4c356a0634
MISC metadata.xml 718 SHA256 3b5950b308bb7bff9c0b1e1df0ec6d2616a42225c6a60f8d23f8774cf3dcb0d8 SHA512 e86d128b5c6ccacfcb8032d33cc1a7e00ecfaa1d0e1fe325ef067f0073a5d411e27e84f89e7f843a7d242d8aca2163978f08f71f91bef43675adb5156d4716df WHIRLPOOL 8fdfc74a8b54c32edc06618e7ac59227a79ab24b32ee8757f14cd2dbed49786422bed58b4dce1808397856604027d0a148f74bb0d0e97cbaa232030fb93e0454
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2
-iQIcBAEBCAAGBQJVLTF/AAoJEGSje+quGaToa98P/RWdW4HVC6LvdfprUVAdj2Kn
-XZk0EirQZDUH6zSslzoKnSLaC0jZTjII8r+edVoXpwkYB3g5C7/DZTmbHPvrsPo0
-txIAd5LS9tAQdO3NurqAGs++w/B13wYz7Of0Jz+fVJPfLEV5HrtSEqQ/67FdSLWD
-Hpe8aBcZQHYQhzdMlupEVXcPzxHyJAOEsWVqo0xiQtqVqitM6EcPcGfufshr7jkQ
-sK0OMVtBVt8sdHfSDaLESsnTSU3M+WjOiNdunW+3mUpF8syih0pocBEbxYsvMVPX
-5dZV30t7y6HNNRN1luBrDjAD6er4iXhfST6SI9b9JNBzqBvPYN9JZ3RQ8JCPn8s2
-zqHJRRyU81Hf+on8fKQapfbkC5XNgqtC1M7BZDPf4LBGjDC28tV/iwTw9ZLsZ//V
-o7XYU0g/jWvpMV8gnn0TpJDsLX38jSMJsilA2tPZHLwsxNA40U0alNRIjtv96yN9
-sBX95TXoH66ZT0oLGgAjIDpg31JvmnfNdXLfs4GKMhPsr7oQfq48u6BjR77dyJY0
-6uxHcVEnl0BmFUPdDD5U/8s7e7/BaUyvgN5fz3YISzBMJm+QK44KEhdQiEHzWUsI
-VX8HqOCOhOwdptHnzaH/jLy6n6E93ZSolOAOt9uc4I7w3l9S+DpkCbQ6my5hunEq
-+dqDTHJu/rZA2mStR1GP
-=tCrv
+iQIcBAEBCAAGBQJVP+65AAoJEGSje+quGaTo9r0P/ix+sRYr5YTJEhmLTZ6gMGIw
+M9e0Ylhgft3IKcXp2R3hmvFM9y/omOOIJZffYJYts3+oNBMPSyYiQ3DysbFTrMCo
+ZOlHryiElc1+CRofBAxUbRGTT9BgNdshrDrzfdhQ4OfOB4N0rkCk3GxEzVklKN1t
+3w2CwkEJDkApDQJip1hp6/fgoHzaLdH6BLhdRBuCs2468p77nqtxT3kO8/HiiBfK
+/d/6sGB0XRRXcv/ouJMN01p2pTeqxBCIkBkntDhtX9rkfgziHQFLsLTkbnF1kARW
+xWxR3iMg4onK9diB/TCjUgHacLekHQLOLSNKfC3/eq84sv/BrFEhFv/KC2oza3qe
+lQb4PUQyJZ2c3VHdSYsQ+ZcEKliPy1lVgODD630sARhlHlZk/c3X0dU7epTNIphF
+GYAWFARo+SEORzEq1sOW76KKOs8nLwZrLh0SHq9UEd8DO9zxv2G0XZKaZlwulqor
+qHD0N6JPx328I0r1ejcsG5mHQyGZli8l5t688xU7y3RR+iqEC/oHS3/F8K0cJXqz
+nuwquy65E46OvNEPVcJb9aNmx39vYMHYUWOe4tKqP0IAwgkUNiOhN5/EDmzOWml7
+DmjjtOCOeTD7txYBFjwxg/QaRVfSy9DNBxtooCuBms173HzmTv/7WQ+x87ZzV/rn
+43Jkq/vBAIc7IWJVLLJX
+=kLtM
-----END PGP SIGNATURE-----
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"
-}