version bump for swift for havana

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

3 files changed, 154 insertions, 16 deletions

diff --git a/sys-cluster/swift/ChangeLog b/sys-cluster/swift/ChangeLog
index 095823afd65c..2bd82907ec63 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.9 2013/06/14 22:11:19 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/swift/ChangeLog,v 1.10 2013/07/02 14:34:42 prometheanfire Exp $
+
+*swift-1.9.0 (02 Jul 2013)
+
+  02 Jul 2013; Matthew Thode <prometheanfire@gentoo.org> +swift-1.9.0.ebuild,
+  swift-1.7.6-r2.ebuild, swift-1.7.6-r3.ebuild, swift-1.8.0-r2.ebuild:
+  version bump for swift for havana
 
 *swift-1.7.6-r3 (14 Jun 2013)
 *swift-1.8.0-r2 (14 Jun 2013)
diff --git a/sys-cluster/swift/Manifest b/sys-cluster/swift/Manifest
index 719b2784047b..1fdd2b2423c2 100644
--- a/sys-cluster/swift/Manifest
+++ b/sys-cluster/swift/Manifest
@@ -8,26 +8,28 @@ AUX swift-object.initd 989 SHA256 19a252739dca026435b0a861eea10ff76c22a41ec71d94
 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 1947 SHA256 1a381006dcf617ce4fc051297a002656065b4e184ddfe087508286ffb4ef4751 SHA512 46d0bd16dd84b75484eff877838981cd2a73620060cffcf141f5675063f234570df3435f7dcf039937d79299b956edf6f40117c1c6f2958d8b2ac1b2bcfd0fa7 WHIRLPOOL f71634acc1ace65eccf27b17043b855b8cb8818b4e84b2dbb07057a690ca9295ba441c44427e59c0782ba598a6d94be0db11ac8c76a52191c42d7845d214fefc
+MISC ChangeLog 2162 SHA256 788b387a57546445b734b3aded236bf12c8ced965f0b44bf144f7d8cbda6a997 SHA512 a1e6c3733528dc7c02feba4c5c0b3c57cb703f4622422ce9aa92e3e136f76f3b45e07ca230a55cd7f45426555820a9f3680e89898d4d711592d3886cada8c75c WHIRLPOOL d34f482aa3a3f4112a6c578812adb6a8eb8fd318b7c1ed315a436bdfecf2e0fea396eac03f6e82b9cfd155ceacce4dea9a2ecd063345d854f163d46fb7802486
 MISC metadata.xml 694 SHA256 556c5cbba5f35997a06f1fb8225937b4d10d6c42540ea6263a58e8bdc27df514 SHA512 c23f67ab88832263600ee73a99ea4298043b11d397ea3375cd99e057af1d4d3dff397f510da1d5d6abb9b16cf6bca53c3fca0ea28c80627970a3da8f7076360d WHIRLPOOL f75febd6cc17191e3dab0dbe9a05f02c5bed3999549ae268968b39fc1fe0ccb62a47d881cd412bc14e67f5320a9fabb6d177359b936a62e219fe8362a18805c6
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQIcBAEBCAAGBQJRu5UOAAoJECRx6z5ArFrDtsUQAJ+f13umNuQfdJcjRniSul1+
-/tw4N97P6n16EP/+K9nPg5nGjqXYv2tJmmL7G1E32tJ/cWd3bAAPXRjrGIKjW6+b
-CA7NYEX6GUN7KHKvv7VwUoSbl+GE8PSU1OyPVUvG7Le0iyl4T6SebSldFf1EMJFv
-YerPqYp4vqP8HRnZAaqsjdQHuVpwx1sAcIrsO2YsWPd5xI/7wydjeSr68p65eeFK
-rvab6gqZQ10I+gGMyi7vRIA5LJGCw9LUNkM0hllZvGs0wWEed5zLWQpIsTsONHXJ
-qV7jd0vtRHkOlUgY+zPOquJoSucW6XRoTsPkOxB77aJrqqbqiiTV9CXOOG/I7+T4
-kvb3bbPatjMK6kT77psymlyTCkkRTpLlg4U4xN+W3pQWQNRI+M49dqF6z8MiFAbo
-m6Lr7BltVxm6yeW1YdiG+Aaciltms3IhpLBkFlf3E8FDWbBRo0smT7E8euEfCnCM
-uytYKdOzn4ofVJnUZ3kkqXRhsivpYzGQN2XJk7T1nysQ+TIA+WeOG/jRrFHJObto
-8ZtV6AJWBOV3m/6gEl7pQ78m8cuZC3PgfxKd7Tt7GCOYWPiEbKaTvTntYef2XVdf
-iVcVl9TnssIrkn/7ERiRtPzLugsClQs90GEldMpoP6hT8+oHlMNtUyIzWjE3QWNm
-4YN5FEGkXDbj2wq3xHIZ
-=0V5v
+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
 -----END PGP SIGNATURE-----
diff --git a/sys-cluster/swift/swift-1.9.0.ebuild b/sys-cluster/swift/swift-1.9.0.ebuild
new file mode 100644
index 000000000000..d8f79f0e5615
--- /dev/null
+++ b/sys-cluster/swift/swift-1.9.0.ebuild
@@ -0,0 +1,130 @@
+# 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.9.0.ebuild,v 1.1 2013/07/02 14:34:42 prometheanfire Exp $
+
+EAPI=5
+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}/havana/${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[${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/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-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]"
+#		dev-python/configobj[${PYTHON_USEDEP}]
+#		>=dev-python/webob-1.0.8[${PYTHON_USEDEP}]
+#		<dev-python/webob-1.3[${PYTHON_USEDEP}]
+
+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
+#}