upgrade of swift to 1.8.0 (grizzly release)

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

3 files changed, 43 insertions, 37 deletions

diff --git a/sys-cluster/swift/ChangeLog b/sys-cluster/swift/ChangeLog
index 325bbf2fcd4e..8a50e4741275 100644
--- a/sys-cluster/swift/ChangeLog
+++ b/sys-cluster/swift/ChangeLog
@@ -1,6 +1,12 @@
 # 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.4 2013/03/04 21:56:56 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/swift/ChangeLog,v 1.5 2013/04/10 16:24:16 prometheanfire Exp $
+
+*swift-1.8.0 (10 Apr 2013)
+
+  10 Apr 2013; Matthew Thode <prometheanfire@gentoo.org> +swift-1.8.0.ebuild,
+  -swift-1.7.4.ebuild:
+  upgrade of swift to 1.8.0 (grizzly release)
 
 *swift-1.7.6-r1 (04 Mar 2013)
 
@@ -22,4 +28,3 @@
   +files/swift-proxy-server.initd, +files/swift-storage-server.confd,
   +files/swift-storage-server.initd, +metadata.xml:
   initial add of openstack-swift
-
diff --git a/sys-cluster/swift/Manifest b/sys-cluster/swift/Manifest
index 19929804e8a4..86ef8f4b42ff 100644
--- a/sys-cluster/swift/Manifest
+++ b/sys-cluster/swift/Manifest
@@ -5,26 +5,26 @@ 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.4.tar.gz 461286 SHA256 5c927cfd6aeba38689c1b8e0d1b6fd697999ad56012f6a4aff011d6018d55cd2 SHA512 c7527593beaede09a70e92b85823eb4661992a568377aea6254c7470dddf9ab64238361c84298b1c046c05abb781507bd7634fdff05d30c1e35e465d7f86cf78 WHIRLPOOL f78325e57a02a34e3f4a052778604115df71f2225861b6b4e9516c25d9b83d7bec7251de34da98f34618b7b586eaac747948192822f2998f3ddeb23fc12f999a
 DIST swift-1.7.6.tar.gz 503775 SHA256 cf108786ecd0fbf1d2b7e422824d78210e17e93ec4a85c2be01c611092f95c14 SHA512 c549bafb25fac590dd76c5f17873e0921532dfc8542c450594788294e2c75253414ab2a5150d191b5b61b2c9b745bab4e30146d71c6b0c35714a8e3005dcd016 WHIRLPOOL ae8d6c0d6657473f2715f2ab70d823fe69e64dcc4d7b7b910d4f978df01ca7e0d14450cde297499a0b9f090c40ccfea82059cb12a4c888a5fbf09291cfdcb8a2
-EBUILD swift-1.7.4.ebuild 3485 SHA256 4f7651a001a7822e55e83eb1494256c23b5c0ffcd4a26cf0b585d78fc772d59b SHA512 a214178fe1d25c2b04fb194870a8331898a04a0064b72cc2f36687466472cd8438044813f66413467cb6c7e620360601dfe01aa99c9ecf9952b55385c3cffaf2 WHIRLPOOL d0f3c37bc5ed2d3ae9a49eb1ffca7bc87c4c5b847a5a69f64e706aca26d6ee155146d2242ea19b807493bfbfdbc86dd2fffd8dd476c79f7f7b6f09a66b93ed22
+DIST swift-1.8.0.tar.gz 556736 SHA256 613185473e0c6f11c77bdc6b65efee195303268117afd9024fee82ebde6ed8a3 SHA512 c7eb92b7b6c952633ccc519f0b9125d1f95db548885c3ccdeaf872f1729797dde1525bcd6f87a8b094cf54c256e472d8d2b11e52954391b1636dc3c966152d37 WHIRLPOOL af4a841829e1d3c2ba85fae97cd2364bb16697f7bccc32a5c419a15946950dc32c95fb86fab40b35ae96f8b3203e450e93c9b8806df265522ac67667ebf5a75a
 EBUILD swift-1.7.6-r1.ebuild 3490 SHA256 ca008bcf74287cfb8e51399cff409f6984a6a9345f5d886f273f07617853d773 SHA512 5f07e6bcb9a30d2ab0010238c30ae9d7768c647f821ba8bd7a6c98a04375a03be2ee84df0973fb6e134a19e7d2b7a8e2e42ebe0692f4e07545db1c570289a2a8 WHIRLPOOL 59170a265dd285d49f0afd76b019899aa4891ec344c555270acf018d473277b0577891a36394e7f1e008dcce012a7865e7590b0f781a87625d76e3a64a826cff
-MISC ChangeLog 891 SHA256 7339f6bdad8524a019dfab02edd64938891c1bec27e54d0a57e816e48465996b SHA512 cda1a54bea45a8670a4beb4ac4c7a3f295e79d1b62cf4a3fd90aa185b2a712f75586b9515495eb6e1075ccea4f6d5710397459431a501d37cb3a69d9f64ad507 WHIRLPOOL 7ec41017f5a2079707cd29b4e35c250765f853d1188ace7b3cfd6124a9fe8678090e4c94671f19df92dcfd0e7e8dc68d8810d204d9bcfaa37d26839ff85f36b7
+EBUILD swift-1.8.0.ebuild 3774 SHA256 23568ef0fbd3542e40f8d9eda96fdffb581c5b156789814659743871dba950b2 SHA512 72705f49e3d6c4cb753a65c873353a6550bd7602da265eaf6af90ed649faf85341ccbeb7d0f63d0c04c046af7a033e39b0a51cf1da3c5ea394e845e5be49b1b0 WHIRLPOOL e62b60b791d471ab2c2acafaf695224fe23f2c68d5aecce9d90385f8a0d18fcb0dc31de30e2827217ebd3d3cb861dd360c5c9c946301e6097b58089e06d919f9
+MISC ChangeLog 1066 SHA256 1eabb097600624e4a26df834640814194628807634e448ffa0c221e06e014d77 SHA512 5dac1a3f84fa3d5b03195b163b59988ed9f2cebf92b1f5a06d8fc8bde63929e8489281064d5bbe82af5456db6886dac28787ddd3ae23bfde9fa27e9aa1e0fab0 WHIRLPOOL fbc8dafc60d4e13618f9b2f88e4fcb41b8cf9b23a75fd539a7029637fa4d9d825f5b9ab4e1ddb7c75555291f5b4839b9f4e4223a5467a538f8bf94baf7e800bf
 MISC metadata.xml 694 SHA256 556c5cbba5f35997a06f1fb8225937b4d10d6c42540ea6263a58e8bdc27df514 SHA512 c23f67ab88832263600ee73a99ea4298043b11d397ea3375cd99e057af1d4d3dff397f510da1d5d6abb9b16cf6bca53c3fca0ea28c80627970a3da8f7076360d WHIRLPOOL f75febd6cc17191e3dab0dbe9a05f02c5bed3999549ae268968b39fc1fe0ccb62a47d881cd412bc14e67f5320a9fabb6d177359b936a62e219fe8362a18805c6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJRNRceAAoJECRx6z5ArFrDNl4P/1BwttMuWx7ewrHrEnP5HOHE
-TQ/wokYY2nIAntIxK3dmuOfs5Na0KnSA4B5lN8c9T7tHZcouzqg6+u3hMI9Bk59E
-OP7jaGFxLVZIBdpfM5u4d2t91BfdvoMGe+GrX0T5MXlSEpmEFyss7iRwhpwXiREs
-wrEmgj5XWoFwSrQZGhqD0td/9yf+85mAa/7tAf2cGVtjn9muhI3EosE9RluqUjI6
-M4GZmJRe0K8FgE4U7+4ccxdUfmYhLdPiG+8/46rudxklHl9+ycVQqbmChNyvmsno
-3/l3cmwq3eY48OnKcJdogB0E5rDbzrUV0mzieBVkIvJdFcobcYDCDBt0lwpYPQRS
-F381XbWb+mnimOy/BgSAhuJJz2dfbt1nhZh+52JdJ2itrbb6Am36f0nrgKrYcZWi
-HtznpP6zOh20w5VD890TEFj/hNNhiCQvTsS9die9AQJ5trpfZBgEU+P6kqYlDcht
-8ZZaALVgByxsZHHYcsb2Ns3DKImNi+qSEKX9s3DDUjT4wxPOZ/wAXMdX0qnQdLqp
-Zt8tsmzKqXz4KVgnaaFGteQyLXzQ76guQNxFnOIxVtZ4iGBj1bCPi66VC+Bf1EZn
-A/JqAUaXG7pXcr0RzV3nbNrAwSDRfZm+IN2rO/A191tGAqJ8S/zx/BIlxIsbggvs
-RpxsGu8ryttHFHbSh6uj
-=Akt6
+iQIcBAEBCAAGBQJRZZJRAAoJECRx6z5ArFrDMoAQANIE1l5fMutfOFZWfFAV+R8G
+k5anZjVJxFPl2w04NnZZsT3wYbh/FX+VZDvY6slSuFRJan+va710y+BBjXPF1TTa
+DdgMICmDNzn7DsNG7T4K9iMuslp9efOLsWOSktYz87zUl35SHIU/zjFuvBWcROrU
+/pjGWCS98yEP3fh6KqTcs9XZCqFo3xxZ+DYqlSJxbkuRwzFhG41HPEDKAdBpQFew
+cpx4dygQApEKtHKWFGXfGc7sTd5pD3uvJs8xqFKMcZ57zjf6f+726HoK3wlmjCrn
+BnlXZ4MG5hGj0kbfT2QQjMhlJnfLC9sv4iJWHX7/YoBf5pn8Mpr0q+R77C2YJoJp
+/iE3YM5AqQPP2AUAn5c0F0WUaY/QN1Gz+7TmmB0pnfDYPJpBGED1wuzNnoL5R56Z
+XACuJJCR/y9toD/81aEtVA5Wq98jvy2wnqwhDnpaP4rbeorXobOWz59ZP3U3FL5r
+q5VdZN311TH1mfcheZirQRoUTG5Vo9HkGl9+6fXe4B6O2r3szpxDLU7ZTu4wk0GB
+xdiBUDxFOk5zuKDDFJ8NbTjIl07D/Qv3MUI208WuU03TnaZq/vpcU0pwSFQ3lQA9
+vdk/UX5oRP/v+I1S2pLJdFtiDbLYqcYcNi9fv11RN82clMS1we22zKALQqqYu+Q3
+z4QFGZJBVHLHrvPJrY1B
+=Lc3i
 -----END PGP SIGNATURE-----
diff --git a/sys-cluster/swift/swift-1.7.4.ebuild b/sys-cluster/swift/swift-1.8.0.ebuild
index 45f3509a8b30..c5efc6846816 100644
--- a/sys-cluster/swift/swift-1.7.4.ebuild
+++ b/sys-cluster/swift/swift-1.8.0.ebuild
@@ -1,15 +1,15 @@
 # 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.4.ebuild,v 1.2 2013/01/11 22:29:38 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/swift/swift-1.8.0.ebuild,v 1.1 2013/04/10 16:24:16 prometheanfire Exp $
 
 EAPI=5
-PYTHON_COMPAT=( python2_5 python2_6 python2_7 )
+PYTHON_COMPAT=( 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}/folsom/${PV}/+download/${P}.tar.gz"
+SRC_URI="http://launchpad.net/${PN}/grizzly/${PV}/+download/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
@@ -17,24 +17,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"
 
@@ -83,7 +84,7 @@ python_install() {
 		newins "etc/container-server.conf-sample" "container-server.conf"
 	fi
 	if use object; then
-		newinitd "${FILESDIR}/swift-object.initd" "swift-obect"
+		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