stable/grizzly for swift

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

5 files changed, 58 insertions, 175 deletions

diff --git a/sys-cluster/swift/ChangeLog b/sys-cluster/swift/ChangeLog
index 2bd82907ec63..43c35aa36110 100644
--- a/sys-cluster/swift/ChangeLog
+++ b/sys-cluster/swift/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-cluster/swift
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/swift/ChangeLog,v 1.10 2013/07/02 14:34:42 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/swift/ChangeLog,v 1.11 2013/08/02 19:02:15 prometheanfire Exp $
+
+*swift-2013.1.9999 (02 Aug 2013)
+
+  02 Aug 2013; Matthew Thode <prometheanfire@gentoo.org>
+  +files/CVE-2013-4155-grizzly.patch, +files/CVE-2013-4155-havana.patch,
+  +swift-2013.1.9999.ebuild, -swift-1.7.6-r2.ebuild, -swift-1.7.6-r3.ebuild,
+  swift-9999.ebuild:
+  stable/grizzly for swift
 
 *swift-1.9.0 (02 Jul 2013)
 
diff --git a/sys-cluster/swift/Manifest b/sys-cluster/swift/Manifest
index 1fdd2b2423c2..435f0918744a 100644
--- a/sys-cluster/swift/Manifest
+++ b/sys-cluster/swift/Manifest
@@ -6,30 +6,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.7.6.tar.gz 503775 SHA256 cf108786ecd0fbf1d2b7e422824d78210e17e93ec4a85c2be01c611092f95c14 SHA512 c549bafb25fac590dd76c5f17873e0921532dfc8542c450594788294e2c75253414ab2a5150d191b5b61b2c9b745bab4e30146d71c6b0c35714a8e3005dcd016 WHIRLPOOL ae8d6c0d6657473f2715f2ab70d823fe69e64dcc4d7b7b910d4f978df01ca7e0d14450cde297499a0b9f090c40ccfea82059cb12a4c888a5fbf09291cfdcb8a2
 DIST swift-1.8.0.tar.gz 556736 SHA256 613185473e0c6f11c77bdc6b65efee195303268117afd9024fee82ebde6ed8a3 SHA512 c7eb92b7b6c952633ccc519f0b9125d1f95db548885c3ccdeaf872f1729797dde1525bcd6f87a8b094cf54c256e472d8d2b11e52954391b1636dc3c966152d37 WHIRLPOOL af4a841829e1d3c2ba85fae97cd2364bb16697f7bccc32a5c419a15946950dc32c95fb86fab40b35ae96f8b3203e450e93c9b8806df265522ac67667ebf5a75a
 DIST swift-1.9.0.tar.gz 617393 SHA256 12f86404bde15192415badd60ed7528a47967b66c29ba7f671fe5189290c7b64 SHA512 fef5277dc494dd066ec6a9e5d063256bf61f240cf35338c47f902de67f61c9dc35bf388b378e8d586379e578e8c1d66e11a55f3387a64dda8b85af894eaf86cd WHIRLPOOL 2b8e98f09ebcbf9d6751f90c4d3e0e148a9a9f76602cde195483d65b573327e40972e60d0282bae1564b292c1015a68293ef3dd82677bfdbaaf69b19526773f7
-EBUILD swift-1.7.6-r2.ebuild 3633 SHA256 4e00acff20822eb588c77b8252c72ed504781a7c6463fef3f93bb64a57c0d32c SHA512 fa4373490ef74ad27ce6b12eefcf8454fbc692aafddd27f59ad95728442d099195c9061a4b869ac1c318c81da99f87891766d7bda901bed04729184efc44e42b WHIRLPOOL 88e6204f8ee5a8eb2952fdd16978b747a0e0a8f6a08119237976ce59bd73799875008104528ee32f26c2dd824484e0052980c8bbd7827b5ce3eb85602cf689e5
-EBUILD swift-1.7.6-r3.ebuild 3714 SHA256 36c72c7d909ae4a01a7d57bcbcf031aa32b74ddc8f8348fb48eed5798751649c SHA512 c5a76985799db87be8b4808e1b7ec512655a750897bce9363fb90671302ec4feb5509c5f8d4b46f7a3743ce7c4509f97c5401f65ddc9c36c28b02a158ab53e05 WHIRLPOOL 1d09055fe71ce16e7bc00115bbe7bec83f42dad972bbf63dc3b33f56e53268f044814f80f1b6a7e5cb3db1659cc74ff7c572376feac8c17d619ae4386ebba9bb
 EBUILD swift-1.8.0-r2.ebuild 4001 SHA256 e4a5ada179f773d1f27dab0cd15ee99fb8a890402661e1a4a3bfd082a788e8bf SHA512 e533a4f4306ba64c32a0c4a4ac66a000917ae968d0ae4820f5507807c65fb93c86032f0243af8e94b346a60c3d59e8086dd6eb0a32d3976a7e833ec0bb2b7f76 WHIRLPOOL 9ea0d5eb948d52b44af2450c7b0611309ac3f4e7aa01ea8a447b492352d52d9f4375e404db95947447b21bdb873e893cbc93d0e32df0cdb68a2df9e24a05e7e3
 EBUILD swift-1.9.0.ebuild 4243 SHA256 0bab26a5e5089d0850d761fdd3656d467dd68553a9149326530881194be292f9 SHA512 974c3eb746f57dab01380534fecdaa4336b70c03839831e997eb5c3169f7c77f4a01795eef3bb18725108281d3eb24aafc4b72a8faa03c4269f577f069a3ec40 WHIRLPOOL 8cca0519507b50cc024a16f2141f9dc0d7b3070ff7b0aded3fdc31499af7948364445b12391197fe6ffed4caca60aca184d5b698edf3aba29c9cc41382ba1ad1
-EBUILD swift-9999.ebuild 3893 SHA256 531bbb8b7b8f6cc9b69e51a1e80bd56fa58ecf9c31f7cc902549c774e43b5980 SHA512 b71f69869bdc3fa3bdae88af7fdcd15a310f28912ddae9ab639be35db91dc4fbf049a2be5bca87bd8277d06287b2db8cd4a941223c85909390f01e00ce429395 WHIRLPOOL 66177e526818ebce34f91512b5a9542ee61b2e7b6c99082d7cc60af55ae9964db435e5299c99f3f7aa39a05420cbc107232cf474ce7e29aa0239eaded8d77d9b
-MISC ChangeLog 2162 SHA256 788b387a57546445b734b3aded236bf12c8ced965f0b44bf144f7d8cbda6a997 SHA512 a1e6c3733528dc7c02feba4c5c0b3c57cb703f4622422ce9aa92e3e136f76f3b45e07ca230a55cd7f45426555820a9f3680e89898d4d711592d3886cada8c75c WHIRLPOOL d34f482aa3a3f4112a6c578812adb6a8eb8fd318b7c1ed315a436bdfecf2e0fea396eac03f6e82b9cfd155ceacce4dea9a2ecd063345d854f163d46fb7802486
+EBUILD swift-2013.1.9999.ebuild 3940 SHA256 296aab83be17c2cfbd8adfc4bea57070bbde6e943c9bab540c643f6eb4c5f6e0 SHA512 ada463ece6038340c86904e520ab49b0066ab1bc4b194aaadb8c8453bdb9d8ae9a62d41e3e22f8da31cefa12690539b568b3a36fd50088ba85f4df0f391983a0 WHIRLPOOL 2f5efa1bd18199f02c1c66f1279ee13fb4a49af264a7bf35d8175cd01b054e9f3d45618c6632245f73f7a252ec200f3ba89f7d711c977765739fde3416fa3750
+EBUILD swift-9999.ebuild 4028 SHA256 62e3b6bcf8a32ff6a77bca329678d4c70109f7bbfaf2054377a0fd5247eb2cc9 SHA512 b28ab173b140766699b228d0d633330a539bee5ffad4209aab214e79cf193eebb98c9d7a40589a5142524b26eb2893df55548bc79c7c1db79ddfb32a70557f34 WHIRLPOOL 866e3b6a0b805c4e769a4712483c23472254c149cbb0564667885f76fb3af919ca70474a4a9b3adfee9f8c6d8ac1f6ae162163ef990d31597cb3eb84c06c0eca
+MISC ChangeLog 2452 SHA256 8aa9051e84a40354da615613ab8adaba068b78b4b26b7f6f1f0f36d46ee9c1c5 SHA512 aaba33b2593cb4ca4fb25894ccfd5ac8b18008c5aaa431c724f904deed4276db7aaa174b7f58c49ec9867175275bbee2deb9077e2cec71389891f39092beabf5 WHIRLPOOL 2e7c2014b797a8ad05bed7f135b2cb5635833251b07427015f390b7f75361b3dec156b4523a2ba337fa3329126934439418399ef9e76d358dab8c278c9df710d
 MISC metadata.xml 694 SHA256 556c5cbba5f35997a06f1fb8225937b4d10d6c42540ea6263a58e8bdc27df514 SHA512 c23f67ab88832263600ee73a99ea4298043b11d397ea3375cd99e057af1d4d3dff397f510da1d5d6abb9b16cf6bca53c3fca0ea28c80627970a3da8f7076360d WHIRLPOOL f75febd6cc17191e3dab0dbe9a05f02c5bed3999549ae268968b39fc1fe0ccb62a47d881cd412bc14e67f5320a9fabb6d177359b936a62e219fe8362a18805c6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQIcBAEBCAAGBQJR0uVJAAoJECRx6z5ArFrDwQUQAJ91X+hAbsgLJHiF5TF+j7hM
-sOD+/oLK3OtesgDG6G6+7FzdhozxAre106i/GzHkL5LUx/QEOHAl1w3trhzZGV1f
-+eZ9t+qIJkkm0nGTGVGZaw7uuY4RKVMLJLyxiQG+D1/LQERZp4iXpuPckFLixP3p
-lK1yu+BH/PE54YD3e36tHs5ZvdpTmL90JYqJloCEhliNIyPf02YDQ/OTPYz7+zt7
-fWYoMKQap59jzLf5S3WguFG9QDSipO5KxM80ufldE5T5Tm2+VAdlik8Uigd9w3pa
-bPhQWNIY0DTkrMi9FoGKi4brSnJhoJKvbEJt0Ks7HjDEXJcLEu1joJ+BsBfE7f8F
-BLxCHUTsixzfoqfj2gyTz9xj2HuIy8ZPLS4+KMM7eD9vLNIr7PC8lwlKDN0m0NCp
-khuRPJFBCStF+yyq8QSV+fFeT/K3Bbvjk9IqEqJ6VIikfqDOEEvSxa300UZdKiQL
-0lrsSNGBPdm/EervqAsqbpkdszNthjSL6lrxB20y9R4c5dMEVEfKkTzl9ERM3SlF
-/PX5/K6dal/9fA8cQnyNtNAvxhkXtR+9I9euaDrPOkHZ9MyEB3vbGgXWutfsAa4o
-+KDCVXSRp2K8mjR8LgZHH/2BTkJBjBGpQeofFYIcfL6h0lgVvxrJBUVYg23uvqQA
-KDJ7+n0t5QqfNGpJhawu
-=Socz
+iQIcBAEBCAAGBQJR/AJsAAoJECRx6z5ArFrDwNwP/i683l/q+2iNXmrzpYZI6LDG
+7vCYFnU4CyH4TT1T/LSSSnkxELvZatohX4j7jAmF9EcBa7UreimLfCMXMTazzWok
+4qcW5gwZmWAXNTm+NKQpoVtWTyMAXeuPk4WjgMRDifdXRZf7F+8zjNcVwouryuUa
+Rrb6G1V4HEnzdYHLdiE+aDZd4mavWC64nesXNjdmkac7QyxvlbdBjkUqeoxUSdiB
+KjyW8adq1Bee+GSqO7tiCNl6VkBr0m8bdxc1O0KwKRbHEBiHckJ5GlIECO2IFuRR
+DYmB+Iyo6+0xEanOX4cKXfzR9uMsjmx6klOCKP7XjvRkcs0UGiJ3z5hzvDx3EDxT
+NrI7QCv3b6YqIN1b1fBMhpMZbVZ7bJwe+LyZxpSEVba7bCrBz8LkM6s3mIbpKWEd
+wli4ilrdlj77/QX2VvEwbmK1VzLNS3ZMVQJPW/7fwOJf34d1g6IjSaI0pHbcNQ1u
+P680QcgIKQ5Keao/pC0GwLodv9iGTku8WChGIVTc7OzQkv22LeL2lfaMDSBBXJaR
+PbHZLu9/v42wyaKb8jd6D3jLd8oZbewJnCeUeKy9Je79EXg9Vb+h4H4erJwvwpye
+rGZZZsWMUFD9Ee0gOrhbgeVCmdQo83tbqud1GLfc8oVYofvUWp0KJRtCRAsz0v80
+Uzb7hUy9yhipQKUeMXVV
+=kEE4
 -----END PGP SIGNATURE-----
diff --git a/sys-cluster/swift/swift-1.7.6-r3.ebuild b/sys-cluster/swift/swift-1.7.6-r3.ebuild
deleted file mode 100644
index e85db75bf929..000000000000
--- a/sys-cluster/swift/swift-1.7.6-r3.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/swift/swift-1.7.6-r3.ebuild,v 1.1 2013/06/14 22:11:19 prometheanfire Exp $
-
-EAPI=5
-PYTHON_COMPAT=( python2_5 python2_6 python2_7 )
-
-inherit distutils-r1 eutils linux-info
-
-DESCRIPTION="A highly available, distributed, eventually consistent object/blob store"
-HOMEPAGE="https://launchpad.net/swift"
-SRC_URI="http://launchpad.net/${PN}/grizzly/${PV}/+download/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="proxy account container object test +memcache"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-		test? ( dev-python/nose
-				dev-python/coverage
-				dev-python/nosexcover
-				dev-python/pep8
-				dev-python/mock
-				>=dev-python/sphinx-1.1.2 )"
-
-RDEPEND="dev-python/eventlet
-		dev-python/greenlet
-		dev-python/netifaces
-		dev-python/pastedeploy
-		dev-python/simplejson[${PYTHON_USEDEP}]
-		dev-python/pyxattr
-		dev-python/configobj
-		dev-python/webob
-		>=dev-python/webob-1.0.8
-		<dev-python/webob-1.3
-		>=dev-python/python-swiftclient-1.2.0
-		memcache? ( net-misc/memcached )
-		net-misc/rsync[xattr]"
-
-REQUIRED_USE="|| ( proxy account container object )"
-
-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-2013-2161.patch"
-)
-
-src_test () {
-	sh .unittests || die
-}
-
-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"
-	distutils-r1_python_prepare_all
-}
-
-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"
-}
-
-#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
-#}
diff --git a/sys-cluster/swift/swift-1.7.6-r2.ebuild b/sys-cluster/swift/swift-2013.1.9999.ebuild
index 238a1cd908a7..1e9fbb207a84 100644
--- a/sys-cluster/swift/swift-1.7.6-r2.ebuild
+++ b/sys-cluster/swift/swift-2013.1.9999.ebuild
@@ -1,15 +1,16 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/swift/swift-1.7.6-r2.ebuild,v 1.2 2013/05/01 16:42:43 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/swift/swift-2013.1.9999.ebuild,v 1.1 2013/08/02 19:02:15 prometheanfire Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python2_5 python2_6 python2_7 )
+PYTHON_COMPAT=( python2_7 )
 
-inherit distutils-r1 eutils linux-info
+inherit distutils-r1 eutils git-2 linux-info
 
 DESCRIPTION="A highly available, distributed, eventually consistent object/blob store"
 HOMEPAGE="https://launchpad.net/swift"
-SRC_URI="http://launchpad.net/${PN}/grizzly/${PV}/+download/${P}.tar.gz"
+EGIT_REPO_URI="https://github.com/openstack/swift.git"
+EGIT_BRANCH="stable/grizzly"
 
 LICENSE="Apache-2.0"
 SLOT="0"
@@ -17,24 +18,25 @@ KEYWORDS="~amd64 ~x86"
 IUSE="proxy account container object test +memcache"
 
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
-		test? ( dev-python/nose
-				dev-python/coverage
+		test? ( dev-python/nose[${PYTHON_USEDEP}]
+				dev-python/coverage[${PYTHON_USEDEP}]
 				dev-python/nosexcover
-				dev-python/pep8
-				dev-python/mock
-				>=dev-python/sphinx-1.1.2 )"
-
-RDEPEND="dev-python/eventlet
-		dev-python/greenlet
+				dev-python/openstack-nose-plugin[${PYTHON_USEDEP}]
+				dev-python/nosehtmloutput[${PYTHON_USEDEP}]
+				=dev-python/pep8-1.3.3
+				>=dev-python/mock-0.8.0[${PYTHON_USEDEP}]
+				>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}] )"
+
+RDEPEND="dev-python/eventlet[${PYTHON_USEDEP}]
+		dev-python/greenlet[${PYTHON_USEDEP}]
 		dev-python/netifaces
-		dev-python/pastedeploy
+		dev-python/pastedeploy[${PYTHON_USEDEP}]
 		dev-python/simplejson[${PYTHON_USEDEP}]
-		dev-python/pyxattr
-		dev-python/configobj
-		dev-python/webob
-		>=dev-python/webob-1.0.8
-		<dev-python/webob-1.3
-		>=dev-python/python-swiftclient-1.2.0
+		dev-python/pyxattr[${PYTHON_USEDEP}]
+		dev-python/configobj[${PYTHON_USEDEP}]
+		>=dev-python/webob-1.0.8[${PYTHON_USEDEP}]
+		<dev-python/webob-1.3[${PYTHON_USEDEP}]
+		dev-python/python-swiftclient[${PYTHON_USEDEP}]
 		memcache? ( net-misc/memcached )
 		net-misc/rsync[xattr]"
 
diff --git a/sys-cluster/swift/swift-9999.ebuild b/sys-cluster/swift/swift-9999.ebuild
index 102329babefd..d5a77eeba866 100644
--- a/sys-cluster/swift/swift-9999.ebuild
+++ b/sys-cluster/swift/swift-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 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.3 2013/05/01 16:42:43 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/swift/swift-9999.ebuild,v 1.4 2013/08/02 19:02:15 prometheanfire Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -10,6 +10,7 @@ inherit distutils-r1 eutils git-2 linux-info
 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,22 +20,22 @@ IUSE="proxy account container object test +memcache"
 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
 		test? ( dev-python/nose[${PYTHON_USEDEP}]
 				dev-python/coverage[${PYTHON_USEDEP}]
-				dev-python/nosexcover
+				dev-python/nosexcover[${PYTHON_USEDEP}]
 				dev-python/openstack-nose-plugin[${PYTHON_USEDEP}]
 				dev-python/nosehtmloutput[${PYTHON_USEDEP}]
-				=dev-python/pep8-1.3.3
+				=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/mock-0.8.0[${PYTHON_USEDEP}]
 				>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}] )"
 
-RDEPEND="dev-python/eventlet[${PYTHON_USEDEP}]
-		dev-python/greenlet[${PYTHON_USEDEP}]
-		dev-python/netifaces
-		dev-python/pastedeploy[${PYTHON_USEDEP}]
-		dev-python/simplejson[${PYTHON_USEDEP}]
+RDEPEND=">=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/configobj[${PYTHON_USEDEP}]
-		>=dev-python/webob-1.0.8[${PYTHON_USEDEP}]
-		<dev-python/webob-1.3[${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]"