all distutils-r1 compliant

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

5 files changed, 37 insertions, 34 deletions

diff --git a/sys-cluster/swift/ChangeLog b/sys-cluster/swift/ChangeLog
index 89640dd3bc57..3da138067bc1 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.13 2013/08/19 03:30:25 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/swift/ChangeLog,v 1.14 2013/09/12 04:55:07 prometheanfire Exp $
+
+*swift-1.8.0-r4 (12 Sep 2013)
+
+  12 Sep 2013; Matthew Thode <prometheanfire@gentoo.org> +swift-1.8.0-r4.ebuild,
+  -swift-1.8.0-r3.ebuild, swift-2013.1.9999.ebuild, swift-9999.ebuild:
+  all distutils-r1 compliant
 
   19 Aug 2013; Matthew Thode <prometheanfire@gentoo.org>
   swift-2013.1.9999.ebuild:
diff --git a/sys-cluster/swift/Manifest b/sys-cluster/swift/Manifest
index 8e7636d0155c..3d6ac87a6dd0 100644
--- a/sys-cluster/swift/Manifest
+++ b/sys-cluster/swift/Manifest
@@ -9,26 +9,26 @@ AUX swift-object.initd 989 SHA256 19a252739dca026435b0a861eea10ff76c22a41ec71d94
 AUX swift-proxy.initd 1505 SHA256 8e1ee2051116e869f5e51de426d640c7f57278f1fc2681bd80ec9393fa834c92 SHA512 a030a5b8ceedb69f89fca93abdd08d9f527d2789ed9983f7cca616b4a318176f84913e1d01ed09d5a1a9e55bd0d697d501f5698ea5b3f8ccce7f76b95984dff1 WHIRLPOOL e8653ceb1e19fead4b0941d158661fe6e81d66c71f032aa1be7aa56dd839d43a82adb090a7e509142bfa9a341c49fdf82c8f86e3a9159be63b538b588cca6e66
 DIST swift-1.8.0.tar.gz 556736 SHA256 613185473e0c6f11c77bdc6b65efee195303268117afd9024fee82ebde6ed8a3 SHA512 c7eb92b7b6c952633ccc519f0b9125d1f95db548885c3ccdeaf872f1729797dde1525bcd6f87a8b094cf54c256e472d8d2b11e52954391b1636dc3c966152d37 WHIRLPOOL af4a841829e1d3c2ba85fae97cd2364bb16697f7bccc32a5c419a15946950dc32c95fb86fab40b35ae96f8b3203e450e93c9b8806df265522ac67667ebf5a75a
 DIST swift-1.9.1.tar.gz 631902 SHA256 d95a8a158cc0dce4780ab462efca13b63be2485ee93a9dc70788b3372f264537 SHA512 ffc06ab87d2696360ded346aff0d29191b6921ab7d3eed35107dc6d8a9bb163b87eebbce4f2521a31df318b0d38e19ceaa2b25f2f066dffb601f9507121b6382 WHIRLPOOL 6fe37fe01589e6c1c82f1e743c001511c2fff402c7731070515d05a3a59192e0069938857752d441b2729e04db3f0cbe9147c32393d33f6dd6583e49b732cdb9
-EBUILD swift-1.8.0-r3.ebuild 4044 SHA256 6f7d60aeb80e9e50706171c4adbf449769f5b16cb9ab00487a81c5a806acf142 SHA512 3b2745c075b194f5e96b71c3ab845a9ebefffc7bcc818a2165e03e37a14e9f1d8c6c714011e4d512950eed1fd59df4be49b295d1f89e206d3fa5a83de133ae85 WHIRLPOOL 4b540f307c301291c33a6489414bbc1647aece3021dec2df2f5fa2eeb07235e000e553c8bfe56aff4f7bf46de86370502a61be9da3384953a3f8c2c74349dbd4
+EBUILD swift-1.8.0-r4.ebuild 4097 SHA256 0b93f2d969c5cc0ec68e5b6fba5823dcdf10b1224c3895c05a5f34fbb79f57da SHA512 eb9aa8db870848d0a6907354c4957d1ad12c1b587c915c067db1c246562ef2c5668b25ee44409ca38bf221d21b50f0459bb48a5e1fd7a222474c43f427937932 WHIRLPOOL 7e174225acda245670b80c072d32668d56a7b87c40e9af9631b8b96f7b2790027cd18a6c309b09c86eab38f93d1ba46a47bc03fd1385a1ad2f48ff0e4bafc5bd
 EBUILD swift-1.9.1.ebuild 4205 SHA256 8ad365cf33cc55416bc886764d1515de93935495abf71d83e5140f5eb8c3b398 SHA512 fa81f338a530ce6b4d2cfe4cf0dce366770ead58b54fb1dee8d49ce6fa55d0d91800ed72919f89d4359ed55628058a09f73e8a2b42d6804aa14112318c9772fe WHIRLPOOL 468d34660d706362550e8ce04715bf15d676d5823a3cb0afaf0ff21123c09423686a8d54c5679e70b8f2a98f95ca578fbca97ef905fed7810ef4d98dfbbdf21a
-EBUILD swift-2013.1.9999.ebuild 3929 SHA256 883fa16776a0dbad6395eb1c34cc62c40314e4b4844277c5dd7c8e307bc2842f SHA512 1edd231c445a604af58b443a26a93c46deb46ab106f9d7c18571cae8006c90f23949366efa9de59c7bfb915302432c42bcd460d96c225fbe0c65d0dd496ea7d7 WHIRLPOOL d9bfa402eeb9f97526bebf59e3d6b5a7515aecd71e1f69158c6fbdb57a2cdbbba180acfb982599461e3aa961146fa86e474635523310ce2c13e9fa82090af8b2
-EBUILD swift-9999.ebuild 4028 SHA256 62e3b6bcf8a32ff6a77bca329678d4c70109f7bbfaf2054377a0fd5247eb2cc9 SHA512 b28ab173b140766699b228d0d633330a539bee5ffad4209aab214e79cf193eebb98c9d7a40589a5142524b26eb2893df55548bc79c7c1db79ddfb32a70557f34 WHIRLPOOL 866e3b6a0b805c4e769a4712483c23472254c149cbb0564667885f76fb3af919ca70474a4a9b3adfee9f8c6d8ac1f6ae162163ef990d31597cb3eb84c06c0eca
-MISC ChangeLog 2880 SHA256 c961234c74c502b38cd2db7e29a8e652a49d4d025b66682a58ed21c391e4f3bf SHA512 cdb70bede39533a0fe8932ffe02c52f366336bd171ec707252c2a5a44f3518cc454773b65292c931b924d3a1f11fe594b2f8cfb6b85fc90f04d18801f3c16805 WHIRLPOOL fd5a4facb836b29b1ce5f231dba7efc0a26cfd9f98d9bb7c8c2f5d6d4c7a236dfa6f302f2bdebd5dba5b4db155cd963a535083c06e01cc37b5e1b08d6c01cd20
+EBUILD swift-2013.1.9999.ebuild 3982 SHA256 546ce682e57ae30d441cdd4185ff55b86a104f0d7c5fa192c12014180ecb8f22 SHA512 72bf81629a46e27a42703148ea16cb2791e8714a8e6f23955fc8a1921fb97255508758316e23ab7b6fdd3df1a572b8e4a7c37403ea8c9aaf783994764ae64f2b WHIRLPOOL c3c8942434d230d2f2815643024e6fdfc52044922225ed5c66bfa40e10b8d1872ea26a464e3ef45348fe2da97774dc4c6d07a1fb3c5a9f8b7c9f41a10124628b
+EBUILD swift-9999.ebuild 4027 SHA256 8354df3a77e2ef4af78d94eb787ae26d3af8627d42c4786338fbba229dc4d3aa SHA512 07d046b71410b3855aef2b26f201b5d3c40f7d64069670de206ff5d7fae418f3028b06a9dba02e05aae1615c5c57d9099b32b7e127c78341772f2eabfa30f427 WHIRLPOOL c916ddcea459a41fa2f80fe4a96ab467f25b11ba200fce74acd1c5ce1e6fa8ed92a7ef52cb1a546a498dd9e9407687bdb6d5f0e648d9d2cd732ab6450ac1daf3
+MISC ChangeLog 3093 SHA256 9836c1d216a1eb349108df5aa7d12b18a326246e4d56011501336964d2b6bb70 SHA512 5ddbf7c45af92ba2977cd50a987c2354e245ae1796d5f876ac6e46e8f0b3583c2a5bd0b264042e93fcd47642a3a5bb23295fe9d0efabed075e117bbe3c88ed51 WHIRLPOOL c92a491f5e3d0152de1b1ed53efa969aeeadb78a8c84a12be91e30637410fac71612bf7f7655e3a434c60f75a7939fdc7208436e6439ded332a676f7c06f0c2b
 MISC metadata.xml 694 SHA256 556c5cbba5f35997a06f1fb8225937b4d10d6c42540ea6263a58e8bdc27df514 SHA512 c23f67ab88832263600ee73a99ea4298043b11d397ea3375cd99e057af1d4d3dff397f510da1d5d6abb9b16cf6bca53c3fca0ea28c80627970a3da8f7076360d WHIRLPOOL f75febd6cc17191e3dab0dbe9a05f02c5bed3999549ae268968b39fc1fe0ccb62a47d881cd412bc14e67f5320a9fabb6d177359b936a62e219fe8362a18805c6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQIcBAEBCAAGBQJSEZGUAAoJECRx6z5ArFrDoG8P/RKYGdEuAkh5Y2M3na7XmwQ5
-rJG0PLjPHYObYJ6rxjg5jmO4lADl5tRouDz19rqoQ6V4b/SKNOT3nL7mfY0nF4b9
-wo0XltOBKSM7NoSTo8BFDHhYiFj9RcMp9IEYuFhDQ3PJ9d3njY1LpPYpScy9s/AA
-QpeSu7KVnnfygMSI7t9G9PnQVqQh8fChD8k+KaGNjaYDrkQkN77yFazKNnwmMLqw
-rM3xNP9Cfc6w8QK+8Sn/kJ/DN97H7bhf2+OuRkuKX3E7boYtFs/dOYpn3SZKEfSQ
-D1MUzaV7rW6ZhxVZhwE3i+n+4nn8tdFt0/ohPGODGlEbpbsDJxnvII9b/VEjwp9f
-aEWNSZFAdhGBF85F1hUyl09wZV5s1NNuPM9e9NCG9jsakdmF9rgeAfQWD+bqShJ5
-25makuZbgyKDvabva51dI+d2BbuBSTm569ijgZqwXtWQPBbiG9UH1CYRG9Q17IiW
-yt0UG41U8RUQczaX9skyAWHEWstNKK9o7mRUKSJq+k7tf20vlz/28Ac2v65LhPKe
-twfdNXS2E4pcrGUsp1/C9nn2tmBId7W5tsE2UZVS7TPdfIBV6XHJCjBDZRqTMwtL
-EULE3bqhcox2//BJr4XHsaOZFJw/RcP4tjDGd8wOM+0tvEkf0zoTgGfdEeVJe9bD
-Pw+3bMZH/ZD5w7PIfBRt
-=zAmf
+iQIcBAEBCAAGBQJSMUmFAAoJECRx6z5ArFrDArMP/RPMZ14DLiqYb7itnmDfgl4w
+ssZUWCkxgFVGJvH7xh71kYyyPU4p2bmyEyCYURieCRLX213uRr2BmDRJ/9XqmlLH
+/H3WAWfeWuIqTvtddYSuw85S8tgSJUet8+Cep3HvwcM5gk2ouT8okrLM0M8NNZTs
+B1bdlZdfE2RevwVYZ1XLn5aYI7QKXABqcCgVW5T+9aO49PHSHC75Gxi3sEmN55er
+rc2XV4mWloVCvDzElpTin3RjY0m0DwAtWP6dWvgN1YqJHgAJKJA7lwUJA73sC/ml
+cDspSWgKJrnHWxQFQUZB7mYft+9XZb6nIe1OPuNv7KQpBH4ehwDZmO3m5e75Fi9M
+fsdXgzZW2A76OMr8gVgckYxdzwPIwaNTaB04LKon130BzN+0vIy7uG/bjOYdBYFe
+nbmurG7PacpnvJx/xNxCwhJ5TyRRn82GISNrU6X+/f5zPuTBBdCiItG2+Jy/RFDY
+abpstA9tWswvElT9NIclNB83heTaTe5/HWpu51fqN98BnljCRpMWkpeTDrjdiHre
+gxJF9gsG93BMh+tOal4d9UayD11R7CAzqwgjoHNqzkC3g71w6ysQff+k3Ts7XIBD
+2IwLicDrNynBauvJx4JUkE0vQUE0fngGU9ZDkHAf3+xHRtWn7AoDhydenwei6kz1
+ZEUNai1GQ7qfRcXSPX4+
+=uhOR
 -----END PGP SIGNATURE-----
diff --git a/sys-cluster/swift/swift-1.8.0-r3.ebuild b/sys-cluster/swift/swift-1.8.0-r4.ebuild
index f65aa7008b42..0e9f0b0e69c4 100644
--- a/sys-cluster/swift/swift-1.8.0-r3.ebuild
+++ b/sys-cluster/swift/swift-1.8.0-r4.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-1.8.0-r3.ebuild,v 1.1 2013/08/13 16:07:23 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/swift/swift-1.8.0-r4.ebuild,v 1.1 2013/09/12 04:55:07 prometheanfire Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -15,20 +15,21 @@ 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}]
 		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/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/netifaces[${PYTHON_USEDEP}]
 		dev-python/pastedeploy[${PYTHON_USEDEP}]
 		dev-python/simplejson[${PYTHON_USEDEP}]
 		dev-python/pyxattr[${PYTHON_USEDEP}]
@@ -39,8 +40,6 @@ RDEPEND="dev-python/eventlet[${PYTHON_USEDEP}]
 		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"
diff --git a/sys-cluster/swift/swift-2013.1.9999.ebuild b/sys-cluster/swift/swift-2013.1.9999.ebuild
index 7f788f86dcc3..e6660a808f18 100644
--- a/sys-cluster/swift/swift-2013.1.9999.ebuild
+++ b/sys-cluster/swift/swift-2013.1.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.1.9999.ebuild,v 1.2 2013/08/19 03:30:25 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/swift/swift-2013.1.9999.ebuild,v 1.3 2013/09/12 04:55:07 prometheanfire Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -16,20 +16,21 @@ 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
+				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/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/netifaces[${PYTHON_USEDEP}]
 		dev-python/pastedeploy[${PYTHON_USEDEP}]
 		dev-python/simplejson[${PYTHON_USEDEP}]
 		dev-python/pyxattr[${PYTHON_USEDEP}]
@@ -40,8 +41,6 @@ RDEPEND="dev-python/eventlet[${PYTHON_USEDEP}]
 		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"
diff --git a/sys-cluster/swift/swift-9999.ebuild b/sys-cluster/swift/swift-9999.ebuild
index d5a77eeba866..d72f0357f956 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.4 2013/08/02 19:02:15 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/swift/swift-9999.ebuild,v 1.5 2013/09/12 04:55:07 prometheanfire Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -16,6 +16,7 @@ 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}]
@@ -23,7 +24,7 @@ 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/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}]
@@ -40,8 +41,6 @@ RDEPEND=">=dev-python/eventlet-0.9.15[${PYTHON_USEDEP}]
 		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"