metadata; add openstack herd, python-swiftclient-1.6.0; reset HOMEPAGE to launchpad site, add IUSE doc with dep, doc build & install, update test phase, bump

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

5 files changed, 100 insertions, 33 deletions

diff --git a/dev-python/python-swiftclient/ChangeLog b/dev-python/python-swiftclient/ChangeLog
index f3058d3e6a76..34f835589e77 100644
--- a/dev-python/python-swiftclient/ChangeLog
+++ b/dev-python/python-swiftclient/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for dev-python/python-swiftclient
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/python-swiftclient/ChangeLog,v 1.6 2013/09/17 19:08:59 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/python-swiftclient/ChangeLog,v 1.7 2013/11/15 06:51:33 idella4 Exp $
+
+*python-swiftclient-1.8.0 (15 Nov 2013)
+
+  15 Nov 2013; Ian Delaney <idella4@gentoo.org>
+  +python-swiftclient-1.8.0.ebuild, metadata.xml,
+  python-swiftclient-1.6.0.ebuild:
+  metadata; add openstack herd, python-swiftclient-1.6.0; reset HOMEPAGE to
+  launchpad site, add IUSE doc with dep, doc build & install, update test phase,
+  bump
 
 *python-swiftclient-1.6.0 (17 Sep 2013)
 
diff --git a/dev-python/python-swiftclient/Manifest b/dev-python/python-swiftclient/Manifest
index e38234b720d5..5a51d8054763 100644
--- a/dev-python/python-swiftclient/Manifest
+++ b/dev-python/python-swiftclient/Manifest
@@ -4,25 +4,17 @@ Hash: SHA256
 DIST python-swiftclient-1.3.0.tar.gz 52707 SHA256 9aac48035d497473bf198f80aab71149765c520611421d640b68feca3e230ebd SHA512 14f6bce84de3a7df926ccb81b94795fb8ccfea54ac7603310b7217a586dcb6e4ca4a63460aabbe2317598554c17d61d08b5b241c381314fc6b89f6544f859a8d WHIRLPOOL 994bdbf686ae3f49eb3f7e3311cda6f5de1a1fa43427825789a757f8671f90dd6cf488e2868e307863498a64808679850addaa21dbba92597e30612d4e674cdb
 DIST python-swiftclient-1.5.0.tar.gz 61714 SHA256 7307b5797e9c8f61e7cbc98e5248b649c110a17f365613a6e4f94ae1ad2486b8 SHA512 a9343aa4bc6acf238cf09f17b178185db4158ac4f89ef5c1f8a5f473d2640a29d044a060c8b2ed29ded9be683932cfb6f7e51482d1f6eed2ef9cc34e338b3a1f WHIRLPOOL b2a01cc9d44140dedd32c32e4bb955863801883fb7ce25b96fb54bf218637cb165550406e36c85a32514d5c453d0612d71dbcfa9b5b05266ff01d82fd7389fa2
 DIST python-swiftclient-1.6.0.tar.gz 71606 SHA256 4b4150f078549b40893e83ddc8d79166da9532cd565acf671bad4d5152b0360f SHA512 cca01715c52a8bfb3d7a1e975f5ec3dfd9a732b49a66b3325fa6465f5f55770cae678af0979af5993c1cc2d4b4dc89f595e7199899e725a81f446b417a78b9bf WHIRLPOOL b150305976a5b8abb7e03446190fd959ddd6f9b295416e6f1c2bc367d15a8a11b22cc254a6c6731fc60a9b40027050525430e21ab6807f04bbc1a5e0adbf53f0
+DIST python-swiftclient-1.8.0.tar.gz 72672 SHA256 c6054784d818552c0fe6b6b985323c7a811a42cc49a52f3d44330987cbbce39b SHA512 f59ff78ac72d77f0d52bcd5ce17f05a7c689995b2e99c6b88b541ca5fe873fdb382daa6c361eade406d233745372294978330216185bc17e2d3c3a4e763a6714 WHIRLPOOL 3a1ae95dd01c68be8a500d7e10a582c8b97cd9d9c511d33cd60fa8c13cfbf560b4ba2a0d4a5467586cd00ba1471f41709279f05a775cda78f4551bc0a146097c
 EBUILD python-swiftclient-1.3.0.ebuild 1244 SHA256 337bca981f0f91bece7fbfad4f430a862641222aeb72c0c8bf9d9c7cbc3fbd86 SHA512 8636bf701aa5e0e4112ec437fa71ee15ef6b69f3ce69e342c2e7bbe7d87efc01cdfa8ce326849283b471389c58659e9321ca983cbf81f7c0a84c0f6e85cc6967 WHIRLPOOL b076ffb1419bb82c1d588b747d747d003b9e0391cc1fd1e11ec436245e850f88929bf4ecd1f9e993c9aae762c20d7e31467cd9b210afcab437a6bc8c184d50e3
 EBUILD python-swiftclient-1.5.0.ebuild 1321 SHA256 312624e48804aa5d3e851f4f1137b655232fa99fb09a9dff5ea4fa8e39330756 SHA512 a919a745caaa57a3b2e6afc97edb0a1929328df4f8ba5e4851b2c27dfe934aae0d620ab53231111bc3b069331e6d1274d56b0cd10da12b996eaf31a8ce4bbeb5 WHIRLPOOL 7d9b77c1d9fe47ecd825e42ba02e38d86428396c2f9e1477db51e09a56bf98d5fe94d28cd18a67520582e0b67ae25ed14a13c42f39669690bf7c473412dba7ca
-EBUILD python-swiftclient-1.6.0.ebuild 1495 SHA256 b8f24ae26364113674f3f2c7a9443dc7ab662c1480ca07a990dcee1fe658cfa3 SHA512 29cbb4db4feb15b101dd99c0806f16a7c3f05ab8fd6102affc40ca0f5d669bce296250a19635d72e98cefc8c71fee9a8c7763b2f2c4592a2434530cda047a8ce WHIRLPOOL ee879ac4cccdf588583dc91defa5f54ec7ddbf868e8702587b59e7566b2a27bca16e96d618d786a353d59f03195bb535e0eae8153569df724703764a47df3db0
-MISC ChangeLog 1355 SHA256 965e73eda1473c3d56f43b03550a8364983653e67a17c21fd3311c1e92be5790 SHA512 64eb52016ca679b9bd7b299eaafade20a505a0f8caee0b0f6b54945a641537e1f8fe551f2c3a7def77a5aeee3373757d9f80c613f416a080e16a3fedd1c13d7d WHIRLPOOL 5eb61ffa8e918863ba1389f5d7bd03efc87ebecb156b807743159be38a321571ffecbdf980819a3aa72f522c08a0c6523c328dcf2ae1c824002d6d992e119a2f
-MISC metadata.xml 323 SHA256 97e4defd9a3b763a49684a186cf615710fe3c893208bfd4640fb7ef0a576193f SHA512 03b6cfc7835743347b9279c7aafb05cccf8378a728adf85390059c3ba73afec272164ef59ee8e11965cbf9d26312c97a43603a354d456055e1c3c12c4b07e20d WHIRLPOOL bed51f25b8f94df301ee0744735dd029ec4e19f30b6ce43136fe12504812bc85e596a5bc42ef54b87d28ed85147f4213aaf690e2498588072f9715eec96656ec
+EBUILD python-swiftclient-1.6.0.ebuild 1763 SHA256 da9b47ceb583055706730900f431190f0438e62277720c76c63b64c2112e37c4 SHA512 121c1d526b0a53c0604f0b6a7c0a43433dab3d693e4abb4b7506540833eb9e29ececd48027498378fca2a848d27c5f3c316d54cd07092176b5c82e56d8f8a8ab WHIRLPOOL ff59dbacf9676e08296ab80532b4fdb7af4bea5247c2d0879649d37217601935f132ed939fdb3bf97e93a60fd8355ed5033c07b8ec9111f685acbc956b9e5898
+EBUILD python-swiftclient-1.8.0.ebuild 1849 SHA256 3cec915f52645df6a6485f9aad6f6b4f0083b06e3ebc1487a17b4b212abb7596 SHA512 48dc0a68625375b935fe7a40a5735c8511d3b22b262e83b393216a58fd0525579fb92d4c3274bbae93850724c5a14f90cfc870fa68669c2b53b8c43bd5d52721 WHIRLPOOL 765de4480f7dde3234dab5ad4b63712e494babc67de08c22b63930133a26f6912f1db1579dc1a706b5b5c900c63c91dddb64f26ea439f2b6e8a0fe7a53c32a53
+MISC ChangeLog 1687 SHA256 9ab6c88a71f21288b17468846f6084a8f46654f851587deb3e10f10e1d19a6e4 SHA512 56935f67c0a5b4dc4922fc2ed2389a570857bdaf728ba6e7e181a2cd0190a325521a0dbc3ba42461c1c4ffaac3ba62e380953e3d5b9aeafff03c0cf44c0315cb WHIRLPOOL 00bfb93c608c7fd496f32c97673a9f9da0c675076391e0ff2eaf89a2e67c4eb51d14374e29f9b44d1618d9fc3320fcd852468e01942c9c1daa172ca482db7825
+MISC metadata.xml 348 SHA256 4d6c0e1aacad5621435008bad2d49cfe4065eac1769af4012b317ec3fbb600f3 SHA512 9c034100076019685f841893ce1ed8f24f58f8f77dfca6570bd3bf2ba05d8303a4a1b5cacb337e6aeae63dc506ec6940ecf6e141e10de8abb0332269822b8391 WHIRLPOOL 97ebfa4051c12dfc2fa8343478152150868037daa1a9736ac4d6e89cc5721e395548922d968175b4f6cf20d228e93efa3f2503a127dc66c80e87f6ac1497ee1f
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iQIcBAEBCAAGBQJSOKknAAoJECRx6z5ArFrDjpsP/j86BK4HLMk/NB1raKVKCBAB
-VzMb8rXEn5e4bdjWpmujCRIJ9Nt0ToRya2JqslRYwbSjrfdCuz71UJTKt11u23KA
-Z4grfttNl0bvVgSW+xM1v57hhbJang2cjmWMzquF+pirpQ2qMw1GwZcNjrR9g9tt
-93Yde9/YQWFac4MYMjTdw/i2HVxZZECMH+XbZ+P/mGUDADeHGkgL1Nr5ZelRgBQQ
-/rOwydotpVo+T5MrqN6g8dvgo7k5/1SGD0iCt1bFKZO0DwvDGbDPhMdyeQEtbMR1
-CJEVSZnoNP9gsQkN5oORgboErVhDw/iijMj3IO2wwbacg1SyqXXy4u9insiYZvjO
-ljmoYVQIbVNZpjNzTMlgMez29siqqSGC14VrWzaghrFdSkwJ/UsFmNLBNtMfLCA6
-6ykRbU6CdcobJC3miT4GsmteYdCbzVr1FvtZ7iTmRL6JuBWvhRAHa7iovsXnwpZw
-egLA1U4ZxQGtqcpkMiaOM7tQdni1AEvrbiUK1JwUlt0UfyVzLBlnRCie3ulUmSAE
-Zf5GPw+eb4Gcd+Vo6kFABaGVdKKchj8H/cFXgJ5n9uxgO3frEsMF3GlDE5JNxZq1
-OEQaQ6RyJlZxxn3vJfxjnfMRsvNzt4n78zISkvo18jQvktyL+6BPxKJL6PnUcujw
-y+G8rpslbF3khhgvoXSW
-=IEWY
+iEYEAREIAAYFAlKFxIYACgkQso7CE7gHKw3rqQCeOQYDI+pHkdHlmzTIpkzHpDU1
+LOIAoNGposK38fy7Tz7vvGp86CB0d1ls
+=cTR0
 -----END PGP SIGNATURE-----
diff --git a/dev-python/python-swiftclient/metadata.xml b/dev-python/python-swiftclient/metadata.xml
index 818e1687f24f..d5d2b99e3fc7 100644
--- a/dev-python/python-swiftclient/metadata.xml
+++ b/dev-python/python-swiftclient/metadata.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
+  <herd>openstack</herd>
   <maintainer>
     <email>prometheanfire@gentoo.org</email>
   </maintainer>
diff --git a/dev-python/python-swiftclient/python-swiftclient-1.6.0.ebuild b/dev-python/python-swiftclient/python-swiftclient-1.6.0.ebuild
index 71f111922a6d..28cd2bf58bb2 100644
--- a/dev-python/python-swiftclient/python-swiftclient-1.6.0.ebuild
+++ b/dev-python/python-swiftclient/python-swiftclient-1.6.0.ebuild
@@ -1,33 +1,32 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/python-swiftclient/python-swiftclient-1.6.0.ebuild,v 1.1 2013/09/17 19:08:59 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/python-swiftclient/python-swiftclient-1.6.0.ebuild,v 1.2 2013/11/15 06:51:33 idella4 Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
 
-#testrepository doesn't exist
-RESTRICT="test"
 inherit distutils-r1
 
 DESCRIPTION="Python bindings to the OpenStack Object Storage API"
-HOMEPAGE="http://docs.openstack.org/developer/python-swiftclient"
+HOMEPAGE="https://launchpad.net/python-swiftclient"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="test"
+IUSE="doc test"
 
 DEPEND="dev-python/setuptools[${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/coverage[${PYTHON_USEDEP}]
-				>=dev-python/mock-0.8.0[${PYTHON_USEDEP}]
-				dev-python/python-keystoneclient[${PYTHON_USEDEP}]
-				>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
-				>=dev-python/testrepository-0.0.13[${PYTHON_USEDEP}]
-				>=dev-python/testtools-0.9.22[${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/coverage[${PYTHON_USEDEP}]
+			>=dev-python/mock-0.8.0[${PYTHON_USEDEP}]
+			dev-python/python-keystoneclient[${PYTHON_USEDEP}]
+			>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
+			>=dev-python/testrepository-0.0.13[${PYTHON_USEDEP}]
+			>=dev-python/testtools-0.9.22[${PYTHON_USEDEP}] )
+	doc? ( >=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}] )"
 
 RDEPEND=">=dev-python/simplejson-2.0.9[${PYTHON_USEDEP}]
 		>=dev-python/pbr-0.5[${PYTHON_USEDEP}]
@@ -40,6 +39,16 @@ python_prepare() {
 	distutils-r1_python_prepare
 }
 
+python_compile_all() {
+	use doc && emake -C doc html
+}
+
 python_test() {
-	sh run_tests.sh | die
+	# https://bugs.launchpad.net/python-swiftclient/+bug/1251507
+	nosetests tests -e test_instantiation || die "testsuite failed"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( ../${P}-python2_7/doc/build/html/. )
+	distutils-r1_python_install_all
 }
diff --git a/dev-python/python-swiftclient/python-swiftclient-1.8.0.ebuild b/dev-python/python-swiftclient/python-swiftclient-1.8.0.ebuild
new file mode 100644
index 000000000000..a50a03f4d41f
--- /dev/null
+++ b/dev-python/python-swiftclient/python-swiftclient-1.8.0.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/python-swiftclient/python-swiftclient-1.8.0.ebuild,v 1.1 2013/11/15 06:51:33 idella4 Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="Python bindings to the OpenStack Object Storage API"
+HOMEPAGE="https://launchpad.net/python-swiftclient"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc test"
+
+DEPEND="dev-python/setuptools[${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/coverage[${PYTHON_USEDEP}]
+		>=dev-python/mock-1.0[${PYTHON_USEDEP}]
+		>=dev-python/python-keystoneclient-0.3.2[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
+		>=dev-python/testrepository-0.0.17[${PYTHON_USEDEP}]
+		>=dev-python/testtools-0.9.32[${PYTHON_USEDEP}]
+		>=dev-python/hacking-0.5.6[${PYTHON_USEDEP}]
+		<dev-python/hacking-0.8[${PYTHON_USEDEP}]
+	doc? ( >=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}] )
+		)"
+RDEPEND=">=dev-python/simplejson-2.0.9[${PYTHON_USEDEP}]
+	>=dev-python/pbr-0.5[${PYTHON_USEDEP}]
+	<dev-python/pbr-0.6[${PYTHON_USEDEP}]
+	>=dev-python/d2to1-0.2.10[${PYTHON_USEDEP}]
+	<dev-python/d2to1-0.3[${PYTHON_USEDEP}]"
+
+python_prepare() {
+	sed -i '/discover/d' "${S}/test-requirements.txt" || die "sed failed"
+	distutils-r1_python_prepare
+}
+
+python_compile_all() {
+	use doc && emake -C doc html
+}
+
+python_test() {
+	# https://bugs.launchpad.net/python-swiftclient/+bug/1251507
+	nosetests tests -e test_instantiation || die "testsuite failed"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( ../${P}-python2_7/doc/build/html/. )
+	distutils-r1_python_install_all
+}