ditto 2013.2.9999, viable test phase added to the live

Package-Manager: portage-2.2.0/cvs/Linux x86_64
Manifest-Sign-Key: 0xB8072B0D

4 files changed, 25 insertions, 29 deletions

diff --git a/sys-cluster/swift/ChangeLog b/sys-cluster/swift/ChangeLog
index 1d8468a64a7f..21950a94a383 100644
--- a/sys-cluster/swift/ChangeLog
+++ b/sys-cluster/swift/ChangeLog
@@ -1,6 +1,10 @@
 # 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.18 2013/11/10 07:02:22 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/swift/ChangeLog,v 1.19 2013/11/10 08:51:46 idella4 Exp $
+
+  10 Nov 2013; Ian Delaney <idella4@gentoo.org> swift-1.10.0.ebuild,
+  swift-2013.2.9999.ebuild, swift-9999.ebuild:
+  ditto 2013.2.9999, viable test phase added to the live
 
   10 Nov 2013; Ian Delaney <idella4@gentoo.org> swift-1.10.0.ebuild,
   swift-1.9.1.ebuild:
diff --git a/sys-cluster/swift/Manifest b/sys-cluster/swift/Manifest
index 9e682930ae94..2e5d76bb253b 100644
--- a/sys-cluster/swift/Manifest
+++ b/sys-cluster/swift/Manifest
@@ -14,14 +14,14 @@ EBUILD swift-1.10.0.ebuild 3999 SHA256 56c1550d5179b3647fc1c956d2ea35ec0d6df47f7
 EBUILD swift-1.8.0-r4.ebuild 4097 SHA256 0b93f2d969c5cc0ec68e5b6fba5823dcdf10b1224c3895c05a5f34fbb79f57da SHA512 eb9aa8db870848d0a6907354c4957d1ad12c1b587c915c067db1c246562ef2c5668b25ee44409ca38bf221d21b50f0459bb48a5e1fd7a222474c43f427937932 WHIRLPOOL 7e174225acda245670b80c072d32668d56a7b87c40e9af9631b8b96f7b2790027cd18a6c309b09c86eab38f93d1ba46a47bc03fd1385a1ad2f48ff0e4bafc5bd
 EBUILD swift-1.9.1.ebuild 3920 SHA256 979e7e120aa828f5a8bab84369fceb407da518eafcbc848ad50b72eab4b8d35c SHA512 f578b77c22cdfdf0a6a2f35802323acab7468dba39ee4db3d867309e539967ed43eee7908e5739dfeed7890fd5ae934b6dc7f67d002f600d23c8dd4d159bf5db WHIRLPOOL 36758d4e1ba742a66d9d86972052d187d94b426c376c2943257c1f0ae8199bd81cae2a6f63a9c77795d8ba6e323db618942d484d61c812aeeac1d365ee81b92d
 EBUILD swift-2013.1.9999.ebuild 3982 SHA256 546ce682e57ae30d441cdd4185ff55b86a104f0d7c5fa192c12014180ecb8f22 SHA512 72bf81629a46e27a42703148ea16cb2791e8714a8e6f23955fc8a1921fb97255508758316e23ab7b6fdd3df1a572b8e4a7c37403ea8c9aaf783994764ae64f2b WHIRLPOOL c3c8942434d230d2f2815643024e6fdfc52044922225ed5c66bfa40e10b8d1872ea26a464e3ef45348fe2da97774dc4c6d07a1fb3c5a9f8b7c9f41a10124628b
-EBUILD swift-2013.2.9999.ebuild 4259 SHA256 4585d4819bc0eeffdd21b8172cbe7c4fa03c0e91aa9aaff0edfc6900f13ab299 SHA512 030c8af7d51367e498e3fba2edeebde828cd5be015892044649374c0d3e0e0eca72c56dfa170a332064e9323b7c57895317f9dfd89b12f00a884d3e9c2588cf1 WHIRLPOOL 6e3932b4715b02f0404dcad89c2a3d6486b9926b3dea87914c375f7012b79341aff2e7a2508117ea85747dd2df662e97d16529cccd34037338f8c0832ce6c4fd
-EBUILD swift-9999.ebuild 4027 SHA256 8354df3a77e2ef4af78d94eb787ae26d3af8627d42c4786338fbba229dc4d3aa SHA512 07d046b71410b3855aef2b26f201b5d3c40f7d64069670de206ff5d7fae418f3028b06a9dba02e05aae1615c5c57d9099b32b7e127c78341772f2eabfa30f427 WHIRLPOOL c916ddcea459a41fa2f80fe4a96ab467f25b11ba200fce74acd1c5ce1e6fa8ed92a7ef52cb1a546a498dd9e9407687bdb6d5f0e648d9d2cd732ab6450ac1daf3
-MISC ChangeLog 3640 SHA256 2a8f4490d7cb5cea7a3ab142d0dd6ff0571a11d54fc2555fda89c72bcc4dbb66 SHA512 90d122fb106df4c73b6b1adcf8eeeef17a34f2efad8d378cd027a4b13c90064cc373a6339443ca3f0f7db990b931b2c595ef1fab8c63626537ac3b43a9f19ad0 WHIRLPOOL 5ba88dd139d77c61ff7cfffda9127e1b9248976d45966fe20a31b4b63ef5e7748dd1d8347d2fd3896eab8398e6c78b5384c5930661078c89f9fb1c0291a4740d
+EBUILD swift-2013.2.9999.ebuild 4049 SHA256 a2a6f6c06d986b782f9c1bda098b6278fb2676aed6926677cad98d09e0a18a9c SHA512 0cd7b1da939bba9fd64d8a1fdd5b7e4ce922ae2ff7641d572469905b3d7850baeaf2a6ef583a4fe50f7833a7274cb409973e2363473aacac23ed4c3f9577ad6b WHIRLPOOL d300b3ed233ea8c0c6979ca5cd5b34beec33a20d10a48e8b73eb844ff5cac722b70add5e16fd8787e3c542f399eb51026fe26b1d3561cfd612d8674e042399be
+EBUILD swift-9999.ebuild 4111 SHA256 f6b334ec94c879be8807137abe4191854f5cd6413e261f97ba8f171fec995546 SHA512 f57b650e94302b470365c30445cdab60544ef374eb754179c45971334a65996cdef2a4119473e61c41fba13fbf2eb50b57b08ff0662d5483c899940024d4b00c WHIRLPOOL f503dd168b2cadc509d8bd8b9e88bfdc3e072d3cc3ac164f5f630cf4c8059739329cefafc267373f52d388d5c05b260034484b5fd28d3388de227e25963cbf67
+MISC ChangeLog 3814 SHA256 945d636b3d2c58607272b30180fd623a89686627b4f41c0463ee5f890b1bce5e SHA512 fbc9083b0998b835a58111b04246f3c7817e936b2cad335dd9e8d59413c58725641a9b4755e9086ac1657ae3d580eb9252d0b408b5fd403046a6d67adff9aec2 WHIRLPOOL fd857c7244c5235ebccaed0409462af9e8cf3625454f24f29e13631e1ed7bd6d19815197fad1adda08aa9c341bda8dc0cfe15c361411760121f370a017d7d691
 MISC metadata.xml 694 SHA256 556c5cbba5f35997a06f1fb8225937b4d10d6c42540ea6263a58e8bdc27df514 SHA512 c23f67ab88832263600ee73a99ea4298043b11d397ea3375cd99e057af1d4d3dff397f510da1d5d6abb9b16cf6bca53c3fca0ea28c80627970a3da8f7076360d WHIRLPOOL f75febd6cc17191e3dab0dbe9a05f02c5bed3999549ae268968b39fc1fe0ccb62a47d881cd412bc14e67f5320a9fabb6d177359b936a62e219fe8362a18805c6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlJ/L48ACgkQso7CE7gHKw3LwQCgvqO8sPUcef7IKc0QyBMUN9SC
-/SsAnRI7VF++i2pFx71vyJRvSRkbJM8i
-=Nf3p
+iEYEAREIAAYFAlJ/STIACgkQso7CE7gHKw3F5QCeIJPqM0TRW0mSMAIc6tT224Fx
+35AAnjbAaymPmetPD7frGWAmo5J6j4Ky
+=kMWz
 -----END PGP SIGNATURE-----
diff --git a/sys-cluster/swift/swift-2013.2.9999.ebuild b/sys-cluster/swift/swift-2013.2.9999.ebuild
index d8d7cc66c7bc..f254d9d57acf 100644
--- a/sys-cluster/swift/swift-2013.2.9999.ebuild
+++ b/sys-cluster/swift/swift-2013.2.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-2013.2.9999.ebuild,v 1.2 2013/10/22 18:05:46 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/swift/swift-2013.2.9999.ebuild,v 1.3 2013/11/10 08:51:46 idella4 Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -64,6 +64,12 @@ src_prepare() {
 	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
@@ -109,19 +115,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
-#}
diff --git a/sys-cluster/swift/swift-9999.ebuild b/sys-cluster/swift/swift-9999.ebuild
index d72f0357f956..14b765134848 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.5 2013/09/12 04:55:07 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/swift/swift-9999.ebuild,v 1.6 2013/11/10 08:51:46 idella4 Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -45,10 +45,6 @@ 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
@@ -59,6 +55,12 @@ src_prepare() {
 	sed -i 's/xattr/pyxattr/g' "${S}/tools/pip-requires"
 }
 
+src_test () {
+	# https://bugs.launchpad.net/swift/+bug/1249727
+	find . -name test_wsgi.py -delete || die
+	sh .unittests || die
+}
+
 python_install() {
 	distutils-r1_python_install
 	keepdir /etc/swift