less grizzly

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

5 files changed, 27 insertions, 261 deletions

diff --git a/sys-cluster/swift/ChangeLog b/sys-cluster/swift/ChangeLog
index 83ce2f3ba33f..9267954a1f5b 100644
--- a/sys-cluster/swift/ChangeLog
+++ b/sys-cluster/swift/ChangeLog
@@ -1,6 +1,12 @@
 # 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.25 2014/02/20 21:04:11 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/swift/ChangeLog,v 1.26 2014/04/06 05:30:17 prometheanfire Exp $
+
+*swift-1.13.0 (06 Apr 2014)
+
+  06 Apr 2014; Matthew Thode <prometheanfire@gentoo.org> +swift-1.13.0.ebuild,
+  -swift-1.10.0-r1.ebuild, -swift-1.11.0-r1.ebuild, -swift-2013.1.9999.ebuild:
+  less grizzly
 
 *swift-1.12.0 (20 Feb 2014)
 
diff --git a/sys-cluster/swift/Manifest b/sys-cluster/swift/Manifest
index ee461ad4f239..608f33d808f7 100644
--- a/sys-cluster/swift/Manifest
+++ b/sys-cluster/swift/Manifest
@@ -8,31 +8,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.10.0.tar.gz 660633 SHA256 9a841225c3a00a93a15a160102d3f7116f2f1ba98ebffedfe641747844e14889 SHA512 7531f0c6c06be9a4cc2242a75140845474e176994667b60adb356945c78dfae4993f65dea55789735ac6e5a940353fd5188dab855a0fb91a844c5d26352efa68 WHIRLPOOL 63e7876a61010b3d14ad3b0703a8e1e8601b9824deca1745ac45e840fa9ca212269f5b7f24f2285bd65e2069f09be410d11d71eeac6df4d0204612f8c0f3d6e3
-DIST swift-1.11.0.tar.gz 712263 SHA256 d22767a417bdf9837df194672fc8f1e7eb8499e885f144bd83c865b2f95160c9 SHA512 265ecb5bdf5dedad68a7dd4860333fa81e14f4a16881b8d249ee848c543df5494628ccf917db0fdc37209af7333ecd15fd0faf99d978e097917486b8cb1be7be WHIRLPOOL de118849e0ef1e652368d23c51ebc903c8cd557fc05ab1d35a627576d28563184189c2fe89ed337e88e5d04680fcc323ca0dac1b3f98d762e54f97f2540829e7
 DIST swift-1.12.0.tar.gz 751007 SHA256 8ca450e747339668ade6b62b78c4617b2f7c5ff4c4b9f7b3cbc48779b8dfaa3e SHA512 1b16ae1c93af129266acf49f87adaebc78d28fefae5d99e55335c74339da4abf933368287b4bf48a5d868838e16bdc565b2f807d0bbe3952d390abcdb98dc5ed WHIRLPOOL 1c09cc33c7b421c829be957543d9e4bddbc49f191be316f8b9e6cdb1ce96c900c306632ead49ae244bd52daacb5a1a305459cad480fad174abff064114f96514
-EBUILD swift-1.10.0-r1.ebuild 4136 SHA256 59d3ca28d26370608950106a1a288f39fc58b24986f177a11e80ae087fcc65a1 SHA512 1803834c9756bb5987547d553802a155803274eb5856f10683005f9b52760271dec2e690d8c4e6e122e1c3a4072c060c12f107b39c72d8e24364cfd3599de68f WHIRLPOOL b9606a1be2f6553f7f094697cf3d2774d691a6466a4470395a81445187b2f59cf72d4a2be0f7d6f0e5411c4c16b80ac95ad60292635e87c495d60c61005564d9
-EBUILD swift-1.11.0-r1.ebuild 4139 SHA256 001684f2add182a100f69b12275598ae6ac0388036a34fdbc711f9ea458de071 SHA512 9dcaa0d93b69c10841465878955e4876537b819fb6d477969192ee40e06e18820b34a1c018d68fcc23615a0389482433f1808a463b493ada840ef3ea4cad02db WHIRLPOOL 29240ce9b05f35686527e84294d0187d6b600dfc4e0ff5cec50f467d73f9d705cb8c59985cf497f23aec8eb30e8a4de59f10756ef3a9818646f59f00d5c79b80
+DIST swift-1.13.0.tar.gz 779440 SHA256 2c2203678cb67e2e8249db1265c68ec901edfaaceeb759e1ac427324a74b6918 SHA512 8a8b55c2881f2ec1888f9182e47dca317c25af5c5ab58072f649f7bd73653fc12fabe0a4f3ede45fd83f6673193f93feab88b8314b618fdea5eb62e6c5f13311 WHIRLPOOL 38c74986d8aa0ca14b984b64d3863403b104c19e558d54f4d7628b078a9006b97441608f35cbbeff41aec9eb6ca7312f06af854199e77f6cbdf3f49e38c02426
 EBUILD swift-1.12.0.ebuild 4182 SHA256 66978608aee2828b94bd60947e92867a4cb1bbe9894f293af1066d783bbbd540 SHA512 b02b982a1739e37b7f6d257a11a5847ccf88702a9460152a4c53fad8bdff10f7f86f93a3d1800257700576f961bf905de30cae4cd084de1d0ad3585bf3b7b0fd WHIRLPOOL 719434cfbfec1b8dc0a4cb03cbf0e82accd5335d7a6144c37a80490f6ae441804f4b5dce19b7f306c28aad2029fa09fbf3af941485abbe2a6604c903e399aa92
-EBUILD swift-2013.1.9999.ebuild 3979 SHA256 023aed4521192fad79dc572c50f446d9cf05595bbafc89e61ab1e26d25d5d74b SHA512 778270f3350582aee501c60d6195d0b7ba5d2f89e2819e55433f435fb74d42037bc543533092602aeb22c8f3339e5839771b235e02c599f29d438ac6994cd3fc WHIRLPOOL c99af499ccd12b1f9bee44748c16233fa1d197ac7e9c81987dc5367f48b8272b95902f4b35adab2d6b5815108de38abf527e094a2dc9bbec4a21968a92e249f4
+EBUILD swift-1.13.0.ebuild 4137 SHA256 20c5ac8b7d7f1c0ec24b792d4ac6e3deeccacef7b905c1eb0c31b028bd5a312d SHA512 f4d0bd3fa81d0ef7ae8a689c29b11fa32f11c3fc66e2c910c303409d206b56afa45e48c6f037e4eef88312a3f0dccd677dc7ab5293f2d4abe0639aa29a9b91de WHIRLPOOL f15b571f67846686534f4cf50460c9d01867be8e543fcae4cbfc8545fece126f9f67d8839e81192ffaad2790d57683af4a7540260f85ecccc9d6a3e5851db6bb
 EBUILD swift-2013.2.9999.ebuild 4014 SHA256 3de1990c02c1f41f69c87444e0bf0fcb236a3ed35294ebd6b341c8a652aed127 SHA512 fbc8f06d994609217c6944e02f58a49a0f2c483ed3fa59690eb14a6410c7781d99d0ecdcab0cd4e0de2ecbd80b0836931b4b7112e786a15f5b6e89a6e2448c7d WHIRLPOOL d7ea0b53bdb30ac1b0fafc45a419f129a3e1245ff65804673ddf64f101e310b0769344a2fdfd6240cc094654935bb2425780ef1374c3bce181d285d764346ba6
 EBUILD swift-9999.ebuild 4115 SHA256 e7065fa4019f26a41180adb3074aa02dbb8a7fa88f1d4e3a09eedeb363e083c1 SHA512 88ca4c3bef9ba4a26cf103c89fc72d69618a8e5148d8055b0209585312f9be6edc16c9b6d3988cef482db4df6c9847de1ce2d21f87ad3ec88ddfb24b419e19f2 WHIRLPOOL aa7525858153ad4107115841b035d2c6cc321eadbfe2f500c0e1e180e5c609267628f9ac309e0cc8a62aeaee9fda477e20d8376b878ca2dcff76e17bb3b376a0
-MISC ChangeLog 4969 SHA256 2eeff7370b83b629b6ba7d4862faa9e05679b5b661c162730b87df1c535a8d2a SHA512 1bf7a3561b08eeac01f7090f2ffe079fe8c6adc24403619872883d0c2611c6a5da613150265a745641ae7195b4efaff4410125d89f6df4768a7231ac99eeddb1 WHIRLPOOL 04c634b8de63643bd10cde553ba437811bc5a453d70b60e84f38862c8a130f4424b65e54c042a8b029b18f50afb9dc63a0964f6fcf3994e751e56d01107d77bd
+MISC ChangeLog 5172 SHA256 70dc9b7c4f7a71c4df3833b5841291c4974cb7f81576aad239ce77e1763d6dfe SHA512 969dfebcc30094d730a93ca05b876c4e718d915534fc06e73072d56b4ae7d320bf907db59795bdb348a8c8dd864b766ba1d24c98a0906108138fa2fc6ebdfbc1 WHIRLPOOL fa9169d2b1bbf51ea2f3125c81fb503bc7d4bb3fa73316ea694e7e82af0736105af57ea7d53de921a5b2baf3c8d45a980e5fa1e35e082fd33242d242d8a4f139
 MISC metadata.xml 719 SHA256 319a1a58e687f433d3fbbc742d13c046dae70211fcf1b81a60d2acb69580c0ec SHA512 029f6557fa226e698e7070a9ee1d445adde992f9b44a219b5be80035d14dbab1daa61d9ad53ae52917a93d7689a0bfd1b0ca8f99e787d6beed9e601d459ea257 WHIRLPOOL da64649598a4601918d5f3932600105de0f8f5c3aa80acca697a7155115a18b562cad8dc068272931907ab4300b55219daec8bbe897a34363c0e9d1700967159
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJTBm3kAAoJECRx6z5ArFrDIXAP/RBoOZZryKBEBJmP7kQvuYnV
-ewoy7T8sFPS4lHlWKUNfstjGmYBUi9d5JQ+6Rrks6tLV42GDiQkS6cZlmLmJkiCr
-us315bFEpOrHkBRZY8w3pfSHb3Q/gnxzXmJ6Xa+nz2a3PBwfRYt2JP+8b40CtGoZ
-gQw9370nAU8CE2WVi3JJu8mAxRGFf/ZqrvgighDiliTYymlpvwugDdwq+RjohH0l
-qqVBtiFyNWJOuCR4YgkITgEpwbBGKaTT6575OFYOrMOk+iaous8LzvmCU+8E+dLI
-aNSvwjAf0fA19cAEEoZTUz5B2yQt6Mp+5R1o9wqaoNwRrNBmtmr+K42xP1a2en5L
-yLP8ElscsJcu1VVEaG8pWmm6+xzisjZNMudejWjqB2VgzrNHxyma0R1wPxDtrxg8
-lFL4MfBx8vJnznIQY+IqRbVrFGZYW/6zTF6jbo2m6+/pqexJegBSULpQZyHrIeB8
-JGkqJKEGOAwfLlJ1QVAautLPYVzlxyrMRIK6URIiALuGrUxY+O7UwB8TJJv0qdwY
-GEr9ubJQWD5C5/FIY12Kl8vAn/7zzHzpd0LqiRJ5yI4pmURAybI0gS2zYmHoTnjF
-z0sZn4ucUpNvrQhmpTz2bET2rtuzU5Ql7DKBLD+0aSWY7yedK/89/Z3ZGYmHtAMI
-UTzzpnM+FytL2QUXb60H
-=qMjX
+iQIcBAEBCAAGBQJTQOahAAoJECRx6z5ArFrDUboP/2X40RNIAf5eJP19O+IoZaep
+3GuhizTFFmAA+b4X6wG0P99S5yp7uug2oe0zTgGpgZy274UOCnD3DxvNCQzpp9I/
+XGyeTFNWr4Kn9ShJxnOa6KLOQZ8Jaagzhi7XWbYBaT+uTGXc9HiC0VtPR22V+iP7
+SImZP8HEeVgTZIYQm6FXRl6JQfCPnOSTCPh9kNySIzTKgniN+rDc9XY1Fc8EKhlt
+HHg+RH9McF/0EaMJ1EUtBxTiFKmYPE66pfu1R8iur1SsXFsq/4DOYg93sHTf5JJu
+muumCajLaHdeIKl1bh9DkpH9iXwBXKDc7V38h/u2tNGMtwnf8x3ojsaC1XCITuN/
+zYsElUqhLERjzF8k4C5FYB/AME4SKw5RkbKncHNz0+SoJJvb6Ed6Iq61cd4wFfyc
++nqZ7vveSEd1uXv127Q1NkQlwqOG9g8ZWmyXDgXqlFiRrlAaZQDzz6cY5wl8vBhH
+eKKtCtfnGj4f35bou470MreUQL1pVUZbmag2oLmwSn1pg3AAM0jGxS923k0eoy7a
+sowyUB1Z1O1VmzjC7WFENf4Eg3xTDOOKIA5A8B78kWuiW1z/y0WNc6NhigHZw8hn
++dIDDtkGQDi8fDEWV2bor0fptS45qE+EVCsS/v7Uv4FeXbJOGJB7B0C0DJ8fsesa
+ld8DiWMtq0AyRnacxpUa
+=4BqG
 -----END PGP SIGNATURE-----
diff --git a/sys-cluster/swift/swift-1.10.0-r1.ebuild b/sys-cluster/swift/swift-1.10.0-r1.ebuild
deleted file mode 100644
index 6e44a87e9042..000000000000
--- a/sys-cluster/swift/swift-1.10.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.10.0-r1.ebuild,v 1.1 2014/01/20 05:41:12 prometheanfire 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}/havana/${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/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"
-
-PATCHES=( "${FILESDIR}/CVE-2014-0006-havana.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 \) -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-1.11.0-r1.ebuild b/sys-cluster/swift/swift-1.13.0.ebuild
index b2bc8d26c74c..50ef0378a9a4 100644
--- a/sys-cluster/swift/swift-1.11.0-r1.ebuild
+++ b/sys-cluster/swift/swift-1.13.0.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-1.11.0-r1.ebuild,v 1.1 2014/01/20 05:41:12 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/swift/swift-1.13.0.ebuild,v 1.1 2014/04/06 05:30:17 prometheanfire Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -30,9 +30,9 @@ DEPEND="dev-python/setuptools[${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}] )"
+				>=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}]
@@ -49,7 +49,7 @@ 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" )
+#PATCHES=( "${FILESDIR}/CVE-2014-0006-master.diff" )
 
 pkg_setup() {
 	enewuser swift
diff --git a/sys-cluster/swift/swift-2013.1.9999.ebuild b/sys-cluster/swift/swift-2013.1.9999.ebuild
deleted file mode 100644
index 81cc6e2776a4..000000000000
--- a/sys-cluster/swift/swift-2013.1.9999.ebuild
+++ /dev/null
@@ -1,122 +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.1.9999.ebuild,v 1.4 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/grizzly"
-
-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}]
-		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/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[${PYTHON_USEDEP}]
-		dev-python/pastedeploy[${PYTHON_USEDEP}]
-		dev-python/simplejson[${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/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"
-
-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"
-}
-
-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
-#}