removing the old and jankey

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0x2471EB3E40AC5AC3

5 files changed, 39 insertions, 278 deletions

diff --git a/sys-cluster/swift/ChangeLog b/sys-cluster/swift/ChangeLog
index c570f6c15f73..bd0c732bdb6a 100644
--- a/sys-cluster/swift/ChangeLog
+++ b/sys-cluster/swift/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-cluster/swift
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/swift/ChangeLog,v 1.32 2014/07/08 23:30:31 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/swift/ChangeLog,v 1.33 2014/08/01 04:53:23 prometheanfire Exp $
+
+  01 Aug 2014; Matthew Thode <prometheanfire@gentoo.org>
+  -swift-1.13.0-r1.ebuild, -swift-2013.2.9999.ebuild, swift-9999.ebuild:
+  removing the old and jankey
 
 *swift-2.0.0 (08 Jul 2014)
 
diff --git a/sys-cluster/swift/Manifest b/sys-cluster/swift/Manifest
index 5a6ffbd3e26c..e7cdc6a75eb9 100644
--- a/sys-cluster/swift/Manifest
+++ b/sys-cluster/swift/Manifest
@@ -9,31 +9,28 @@ AUX swift-account.initd 995 SHA256 f1d4594504b53de480abc69ccb72d37e002ad85118b9d
 AUX swift-container.initd 1007 SHA256 aba09a5e3396f79c5e49a258c283d37652e182ac62ef8952618ad32b4df1db86 SHA512 1202212955a6a0836abee2c8a2190e359c910037c2f38dbf6874253b21c0739548d9f48c75e3333d0d73376e35c43866b8d0dc38990d4d3b99c04efaab2407c2 WHIRLPOOL d1dc6e468fdd3ab616a53b5357dad09ef089927347a59b95961e7e6b395eec43dedef059fed8eed06f8f324ff0ec7121023953156dcf2266e00dc947aeb8da98
 AUX swift-object.initd 989 SHA256 19a252739dca026435b0a861eea10ff76c22a41ec71d94cc6ce3dddd70b5df58 SHA512 1982f2f76df5d279c51a0a2fd5619dd12a6899559761ac7c0013aa5e5098058430e1a8dcc7cf46d5081bd6dffa17e4223de9b6a85bea4cddaf495b3ca91bacc9 WHIRLPOOL d2a16db387e6d3ff3452854672b5a9c64f03f485d3ddf7e2e67aa51dcb4aa4ab80fd375158dac99943f6c52fefc233cce503be26617110765fc859d82d6b01ab
 AUX swift-proxy.initd 1505 SHA256 8e1ee2051116e869f5e51de426d640c7f57278f1fc2681bd80ec9393fa834c92 SHA512 a030a5b8ceedb69f89fca93abdd08d9f527d2789ed9983f7cca616b4a318176f84913e1d01ed09d5a1a9e55bd0d697d501f5698ea5b3f8ccce7f76b95984dff1 WHIRLPOOL e8653ceb1e19fead4b0941d158661fe6e81d66c71f032aa1be7aa56dd839d43a82adb090a7e509142bfa9a341c49fdf82c8f86e3a9159be63b538b588cca6e66
-DIST swift-1.13.0.tar.gz 779440 SHA256 2c2203678cb67e2e8249db1265c68ec901edfaaceeb759e1ac427324a74b6918 SHA512 8a8b55c2881f2ec1888f9182e47dca317c25af5c5ab58072f649f7bd73653fc12fabe0a4f3ede45fd83f6673193f93feab88b8314b618fdea5eb62e6c5f13311 WHIRLPOOL 38c74986d8aa0ca14b984b64d3863403b104c19e558d54f4d7628b078a9006b97441608f35cbbeff41aec9eb6ca7312f06af854199e77f6cbdf3f49e38c02426
 DIST swift-1.13.1.tar.gz 802273 SHA256 cbe6e807c0c0115570fc3da4dd7e3f3c2477fb48f865f29d648fb5714734eabd SHA512 3a18df9bb440723ff88429bea215b25b2d3790193bb1e0bef155c8cb9c260db79099794145ab7bd3a99eb25e8441cf527c82a803408078212ca0145cab8c2258 WHIRLPOOL ba10c6e110eb6b7de99b6f6733e05bb092837ce3e6aefdc0a74a9fc693625dbf3f182e8c637dbfc07d3f6ecca8fa26aebc89ba65917d952551793b28689f9523
 DIST swift-2.0.0.tar.gz 947369 SHA256 2dbe98186d6c78ab3e57708dfd46416f3a33001d94322b33e8f7a0c722a976b4 SHA512 c7f81771ae76d2b86da80d3c199a4bea84f2fe9968adaac658d56c4717c3f33f0de9e01e8bceaaa1875762ce28a943eee80f33d84e1bbe966e0e95750c01bc72 WHIRLPOOL 5db150dd48611eacc179066b633a8fe3ecd2d7e76b3dd8a76438027a79729df07ef0b189b88623505e645efd3d146a6b1b1e74dd7a2c57acee1fb88f239addfd
-EBUILD swift-1.13.0-r1.ebuild 4131 SHA256 5dd8d29e570607506a7453d63087fc54f989f277d644a715574287851e9f5b7e SHA512 da959f690bea57129e21858cc6e9d2456f7d72413fead13584fe311823e359f5eaf873118c1c8dba0f50ef8fc785a0637d5ab98f51257c3556d1e16f8d70b744 WHIRLPOOL 2ca30bb23dcc07e752853c4769043fea3aeaac6f9c5377ad4abf72cb0c7dc99ed48a744d17e56e4a786051420ec220f8b8545a80d8e001e4a418f448d2f1ec8e
 EBUILD swift-1.13.1-r1.ebuild 4015 SHA256 e4d8f924f067ac8f6061d895e05cad1797d4556bbe642eb9257a29702a929a83 SHA512 4ff489f2a40719d5b3663cf8d353ded1238a11820744130a5c035b91fb5d55a0651ba09f8ae91bf5bceb5ac7a2f38b22118c0b63266ae882ada8c0eeb8e8ce2a WHIRLPOOL cd07326709cfa9d3e3036b21713e29ecb162115c0025a2fbb8c01d814c7864a6dd13620683e435699da24598771a1b28aae86bb07c6b6d94fef32ea366c1aaa1
 EBUILD swift-2.0.0.ebuild 4073 SHA256 b4f1b6e9b412562df4425d69164c68601cef9cacde83d4cded98f6e50b7ee367 SHA512 8cdfd3e297103699e3a6105575aff6a70c7eba93cba938ec1af59b7db9cd6641e5ff5747d6391ee6ad9a917231ae8a1344734ac865bd22bf4c8e34d187d27015 WHIRLPOOL 1893469bd42290b058a6b0824d6e3fdce0508214e0621185c61d75b3cfae19f023ed5bd8b2b266fdd75c4fec54a69c0340726a7adc5fd03e02a3ecc5749f69e1
-EBUILD swift-2013.2.9999.ebuild 4014 SHA256 3de1990c02c1f41f69c87444e0bf0fcb236a3ed35294ebd6b341c8a652aed127 SHA512 fbc8f06d994609217c6944e02f58a49a0f2c483ed3fa59690eb14a6410c7781d99d0ecdcab0cd4e0de2ecbd80b0836931b4b7112e786a15f5b6e89a6e2448c7d WHIRLPOOL d7ea0b53bdb30ac1b0fafc45a419f129a3e1245ff65804673ddf64f101e310b0769344a2fdfd6240cc094654935bb2425780ef1374c3bce181d285d764346ba6
 EBUILD swift-2014.1.9999.ebuild 4032 SHA256 320e03538a0367f7bde7818d66e2e6b6989204e3b0cc126ba60ec22c09695390 SHA512 78822409e7eb54934325428a55222c134d800911ae4b61a90038e5ec0b986028a426cc89a82148d77ed2b97022c956ddaf21b359449a4a480218d41e40ba6037 WHIRLPOOL e6f0b10e8ea003d0973100e2eee2d735654d397ed6c3e2d9e40cdc1451c8c59e151a28412c6a7810bf1406ae5024429188d476f54dbd0c168b1182fb0d8ebc60
-EBUILD swift-9999.ebuild 4115 SHA256 e7065fa4019f26a41180adb3074aa02dbb8a7fa88f1d4e3a09eedeb363e083c1 SHA512 88ca4c3bef9ba4a26cf103c89fc72d69618a8e5148d8055b0209585312f9be6edc16c9b6d3988cef482db4df6c9847de1ce2d21f87ad3ec88ddfb24b419e19f2 WHIRLPOOL aa7525858153ad4107115841b035d2c6cc321eadbfe2f500c0e1e180e5c609267628f9ac309e0cc8a62aeaee9fda477e20d8376b878ca2dcff76e17bb3b376a0
-MISC ChangeLog 6022 SHA256 fadf745041d75e668adf7c36e8a6f67534ee54f247de0bb9c1b0357237f6d225 SHA512 b1d6d7036ee80705f1d6bd9e3a60c0277568ff91951d7411540b88097be12e717f4c314f423c38db695bbe4df30df6125b3ea6403ac3d2cbf037a31977dcacd3 WHIRLPOOL a3db3526c8e8087319b2684c9665b0c1f256f2b95473cab35fd96e9b9cdd0abb738578bc4d773286d8c6e6ecd643d9050ce78e681a8e0e11e5db342650603252
+EBUILD swift-9999.ebuild 3995 SHA256 0e9b13e7327e541b2afd5cce0b25118452d2df36a0b00355b4a1bf78af07ea8f SHA512 b9dfadc3a915c5c24c6ed34415023f06ce0e736f5a892b8266311eb79a7c81f722750f5356aa7fbf2709594517df61fd1c78cb6816b98bc8f15efdfb16f73f61 WHIRLPOOL 9319a30f1c3320a81fb6c13770ca7852f2eda5f1d589a3c6d02d9c4154af6d35d6c5609a86affaf602f15774dcb4302b12ee29aa64420a114630b321ed9b194b
+MISC ChangeLog 6183 SHA256 f9c7e5921038375097f2341557a6f80e1371cdc12563d881d0aaac1930c8e72c SHA512 9ba81362c33428c67dbf591332d4f094ff48fc290dcfd14ce93a1b1fb4f58f680ce8557e573393a49de4330808d1a43a12ef2494301d75d4651a80a9602a06ad WHIRLPOOL 19980dc462546d2e17eaf7d9753b5fe18e3571aa578cbc5318f68570af487f5f3af31a70dc684d2e426b2162219c53818e19d602b3a1622b874b02c0c2056eba
 MISC metadata.xml 718 SHA256 3b5950b308bb7bff9c0b1e1df0ec6d2616a42225c6a60f8d23f8774cf3dcb0d8 SHA512 e86d128b5c6ccacfcb8032d33cc1a7e00ecfaa1d0e1fe325ef067f0073a5d411e27e84f89e7f843a7d242d8aca2163978f08f71f91bef43675adb5156d4716df WHIRLPOOL 8fdfc74a8b54c32edc06618e7ac59227a79ab24b32ee8757f14cd2dbed49786422bed58b4dce1808397856604027d0a148f74bb0d0e97cbaa232030fb93e0454
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.22 (GNU/Linux)
+Version: GnuPG v2
 
-iQIcBAEBCAAGBQJTvH8oAAoJECRx6z5ArFrDrQ8P/i+/AcadvbTMhSyCx8w8WBV8
-Fup53+aNrzdiiu7/ijL4TYK2RP4YOivS9wW84zm0s75RM7mlu6smNFop9aCq3G9z
-MyiAiSieXxt+6OvZ7rvENYHwDF68sUnzglE599/aZC070TJiY12s1fjupCvrFgjr
-/9zRZjm8BJlqTgfW6CTwzNlV6qFGfP+P8AVFxIMR6nWnTM4Abt9VR2nU5f4HI3wf
-+hWwJRapjn/9gQwwjXGDGA+pYdz7Z/P321q6eZyZEuOqcS27s2M7rTAj/FUO+ofM
-qlyNC2HljG0Pt7O/pUvR1Sy1xujHA5XzD7UqH68l7sJEVTWbEyEw9bwNGQgCb2za
-0qqXmrbCkqmnzHSy98aj/TBApkRN7PZtFuq+uwPrqOTNjzdg+R6WWjK0DCu3ylQ6
-2shbXmuepZ5P9sHYeeHouCfpIt10TdJqVwVUJKvGza1GmgOHP3B6wvX9uuKoXPX/
-QwQL83KtxGhS8nfv7uxYxsYTO5F/UN/9k1XkNasI/gcInvf8HkQWtcKbB8fHnE0a
-dgd8W3+IfA/hC0KAaYmIKacmEfMnvL09GI+j5VqH3Zk8w3V0fC2pdt3WhrTOq9PF
-TCB4TUjiomEZ/YV7CSuVtFAs+AU1g35DYD2HGEb+zF/y4IrTDFxI6s9cJIeX55OU
-N/MVTW4Vu2ggjQMX+xXL
-=YbT+
+iQIcBAEBCAAGBQJT2x1kAAoJECRx6z5ArFrDtwkP/jLf/7wIbFgzMTgbRhNjA5Kw
+DwcfIGR0yEWjcWRm2Q6QQAyKlkX7wWqkXHZKT6XLnWEpieV9KumgIwVdpibWAcZ9
+GwLXUKRy+1fzawStBbc8oidKhqrUhfLdWG3nJjN+EI/rA6+h15LNiYrnHq0yUaT1
+TxudTWDyeKXtPU/HHDxKMUzd8ZBOSUc4/EoMxO2Gvy4M8O7f+jZCCgs1A1zIV0II
+Jb3Fy+z+HR8seJnAW09TfkVb46dXVjZWWl+dC0fynAxIaTt2bQSnJG/d9RaJsPcu
++UejbF+ucFCWfzlDFKZoqWwiqJL9jXzHgbrBMhbZamYvyJzswsGvxUyoapLk57os
+pZF8x8sHl6rS3HFKIwNtWwxv93bfEtyDqGdlQKLaJAaoSbfgbwvBo9irFw2yccRc
+8EVrutkm219xbCtaGa9DdRWfYtWj7fU0kxfS/cWmI7P73k8d68apO9gnIoNF0b5Q
+a6fGDGbKcWMnIeiN1e11FpoN/AN3vCwqZpIHDfvnbQ5NQxDaEmb8rbREQC2vS8DI
+dMJMWmfxQP7vrbO+hvPB+ZmnQx1aG8NP8BjN6rYCUTkjbjNO7iDxa6WqiImcANiu
+4QPsRf7mB0KmUXX66NixeSYxD1qtaODGfCt7G5Fe/LO/gOAEaFFQWsTYR+Rz+dR9
+acSPLDUWY9dwg65VnxKQ
+=n50o
 -----END PGP SIGNATURE-----
diff --git a/sys-cluster/swift/swift-1.13.0-r1.ebuild b/sys-cluster/swift/swift-1.13.0-r1.ebuild
deleted file mode 100644
index ff9b0701705c..000000000000
--- a/sys-cluster/swift/swift-1.13.0-r1.ebuild
+++ /dev/null
@@ -1,115 +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-1.13.0-r1.ebuild,v 1.1 2014/06/24 09:49:27 idella4 Exp $
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1 eutils linux-info user
-
-DESCRIPTION="A highly available, distributed, eventually consistent object/blob store"
-HOMEPAGE="https://launchpad.net/swift"
-SRC_URI="http://launchpad.net/${PN}/icehouse/${PV}/+download/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="proxy account container object test +memcache"
-REQUIRED_USE="|| ( proxy account container object )"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-		>=dev-python/pbr-0.5.21[${PYTHON_USEDEP}]
-		<dev-python/pbr-1.0[${PYTHON_USEDEP}]
-		test? ( ~dev-python/pep8-1.4.5[${PYTHON_USEDEP}]
-				~dev-python/pyflakes-0.7.2[${PYTHON_USEDEP}]
-				~dev-python/flake8-2.0[${PYTHON_USEDEP}]
-				>=dev-python/hacking-0.5.6[${PYTHON_USEDEP}]
-				<dev-python/hacking-0.6[${PYTHON_USEDEP}]
-				dev-python/nose[${PYTHON_USEDEP}]
-				dev-python/coverage[${PYTHON_USEDEP}]
-				dev-python/nosexcover[${PYTHON_USEDEP}]
-				dev-python/openstack-nose-plugin[${PYTHON_USEDEP}]
-				dev-python/nosehtmloutput[${PYTHON_USEDEP}]
-				>=dev-python/mock-0.8.0[${PYTHON_USEDEP}]
-				>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
-				<dev-python/sphinx-1.2[${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}]
-		dev-python/python-swiftclient[${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-3497-1.13.patch )
-
-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 \) -delete || die
-	SKIP_PIP_INSTALL=1 PBR_VERSION=0.5.23 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"
-}
diff --git a/sys-cluster/swift/swift-2013.2.9999.ebuild b/sys-cluster/swift/swift-2013.2.9999.ebuild
deleted file mode 100644
index 900260a94620..000000000000
--- a/sys-cluster/swift/swift-2013.2.9999.ebuild
+++ /dev/null
@@ -1,113 +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-2013.2.9999.ebuild,v 1.5 2014/01/08 05:59:48 vapier 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"
-EGIT_BRANCH="stable/havana"
-
-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.5.21[${PYTHON_USEDEP}]
-		<dev-python/pbr-1.0[${PYTHON_USEDEP}]
-		test? ( ~dev-python/pep8-1.4.5[${PYTHON_USEDEP}]
-				~dev-python/pyflakes-0.7.2[${PYTHON_USEDEP}]
-				~dev-python/flake8-2.0[${PYTHON_USEDEP}]
-				>=dev-python/hacking-0.5.6[${PYTHON_USEDEP}]
-				<dev-python/hacking-0.6[${PYTHON_USEDEP}]
-				dev-python/nose[${PYTHON_USEDEP}]
-				dev-python/coverage[${PYTHON_USEDEP}]
-				dev-python/nosexcover[${PYTHON_USEDEP}]
-				dev-python/openstack-nose-plugin[${PYTHON_USEDEP}]
-				dev-python/nosehtmloutput[${PYTHON_USEDEP}]
-				~dev-python/pep8-1.4.5[${PYTHON_USEDEP}]
-				>=dev-python/mock-0.8.0[${PYTHON_USEDEP}]
-				>=dev-python/sphinx-1.1.2[${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}]
-		dev-python/python-swiftclient[${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"
-
-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}/tools/pip-requires"
-}
-
-src_test () {
-	# https://bugs.launchpad.net/swift/+bug/1249727
-	find . \( -name test_wsgi.py -o -name test_locale.py \) -delete || die
-	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"
-}
diff --git a/sys-cluster/swift/swift-9999.ebuild b/sys-cluster/swift/swift-9999.ebuild
index d8a552b1b7ef..a8551793908d 100644
--- a/sys-cluster/swift/swift-9999.ebuild
+++ b/sys-cluster/swift/swift-9999.ebuild
@@ -1,6 +1,6 @@
 # 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.7 2014/01/08 05:59:48 vapier Exp $
+# $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 )
@@ -10,7 +10,6 @@ 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"
-EGIT_BRANCH="master"
 
 LICENSE="Apache-2.0"
 SLOT="0"
@@ -19,25 +18,27 @@ IUSE="proxy account container object test +memcache"
 REQUIRED_USE="|| ( proxy account container object )"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-		test? ( dev-python/nose[${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/pep8-1.4.5[${PYTHON_USEDEP}]
-				>=dev-python/pyflakes-0.7.2[${PYTHON_USEDEP}]
-				>=dev-python/flake8-2.0[${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/sphinx-1.1.2[${PYTHON_USEDEP}] )"
+				dev-python/python-swiftclient[${PYTHON_USEDEP}] )"
 
-RDEPEND=">=dev-python/eventlet-0.9.15[${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}]
-		>=dev-python/dnspython-1.10.0-r1[${PYTHON_USEDEP}]
-		dev-python/python-swiftclient[${PYTHON_USEDEP}]
 		memcache? ( net-misc/memcached )
 		net-misc/rsync[xattr]"
 
@@ -45,6 +46,8 @@ 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
@@ -52,13 +55,14 @@ pkg_setup() {
 
 src_prepare() {
 	sed -i 's/xattr/pyxattr/g' "${S}/swift.egg-info/requires.txt"
-	sed -i 's/xattr/pyxattr/g' "${S}/tools/pip-requires"
+	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 -delete || die
-	sh .unittests || die
+	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() {
@@ -67,7 +71,7 @@ python_install() {
 	insinto /etc/swift
 
 	newins "etc/swift.conf-sample" "swift.conf"
-	newins "etc/swift-bench.conf-sample" "swift-bench.conf-sample"
+#	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"
@@ -106,19 +110,3 @@ pkg_postinst() {
 	elog "  * cd /etc/swift"
 	elog "  * openssl req -new -x509 -nodes -out cert.crt -keyout cert.key"
 }
-
-#src_install()
-#{
-#	distutils_src_install
-#
-#	dodir "/var/run/swift"
-#
-#	if use proxy-server; then
-#		newinitd "${FILESDIR}/swift-proxy-server.initd" swift-proxy-server
-#	fi
-#
-#	if use storage-server; then
-#		newinitd "${FILESDIR}/swift-storage-server.initd" swift-storage-server
-#		newconfd "${FILESDIR}/swift-storage-server.confd" swift-storage-server
-#	fi
-#}