pycadf-0.8.0.ebuild; tidy & correction to deps: 1 missing dep for doc build, bump; update deps and upgrade test phase by use of testrepository as the testrunner

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

5 files changed, 88 insertions, 105 deletions

diff --git a/dev-python/pycadf/ChangeLog b/dev-python/pycadf/ChangeLog
index 1009526ae046..d96b8aa1ceb0 100644
--- a/dev-python/pycadf/ChangeLog
+++ b/dev-python/pycadf/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-python/pycadf
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pycadf/ChangeLog,v 1.6 2015/06/03 20:52:39 jlec Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pycadf/ChangeLog,v 1.7 2015/07/02 10:17:41 idella4 Exp $
+
+*pycadf-1.0.0 (02 Jul 2015)
+
+  02 Jul 2015; Ian Delaney <idella4@gentoo.org> +pycadf-1.0.0.ebuild,
+  -pycadf-0.5-r1.ebuild, pycadf-0.8.0.ebuild:
+  pycadf-0.8.0.ebuild; tidy & correction to deps: 1 missing dep for doc build,
+  bump; update deps and upgrade test phase by use of testrepository as the
+  testrunner
 
   03 Jun 2015; Justin Lecher <jlec@gentoo.org> metadata.xml:
   Add pypi to remote-id in metadata.xml
diff --git a/dev-python/pycadf/Manifest b/dev-python/pycadf/Manifest
index c4f82ee08d88..8a718d370ac2 100644
--- a/dev-python/pycadf/Manifest
+++ b/dev-python/pycadf/Manifest
@@ -1,31 +1,21 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX CVE-2014-4615.patch 901 SHA256 f589f668e9152a0cdde02afc9d28b13de15983846f4ff636dd112120661160b3 SHA512 9c9da786c276dfbb121623418d285ce50250a313df52ce03dcca1a947d674755c88be34d7cc34619cced018a6f7f525647a63878d9ea749674655bcb0027e430 WHIRLPOOL 22f585b98b98ee01ab09902868bfa27381e03c3a03cee2494c36a2ae10e603c38155387cb7939f8e13e4e530d85c2b9d03cf3c8915b3868a808f06ded381700b
-DIST pycadf-0.5.tar.gz 273168 SHA256 b150df953b822c0317c6f1fbd35b950db0d2ce8bc53bb7319cc921e3018e59e1 SHA512 c7c108ba79c8f34ffcac77d43317d6bed34ecd9e23980ecf4a061c5d9fa52d446835a92263bef030cfb974e750245c19c634902f3e3b79233a12a02affdb9a54 WHIRLPOOL c058201b9e396930de463fa43ba73145663c7efa0a2e4c57303e1d5919ad7ecc7e972d010ea48427b8984ea536cf75a5e71c13a868b7ef12c79162229b7b4a31
 DIST pycadf-0.6.0.tar.gz 277434 SHA256 9ba1e9ac52ee2a2d6d9cc89847323559cc2ffe7b4d80b703944a0a1f75c7093f SHA512 97e223296e5cf77bbc2f7f8b2caba70f76d418ccd476bbc07462dac2c01399f920ae7801f1e30ef91ac6dbfe340b8b45dff2426bf457c1239f54293dbadeef61 WHIRLPOOL 96644ae4b82352cd0a296f3a9adf161b8500d043d8d2bce239c23473a53e1a2feb43f60d92c67bf1543b3b101bbf722bf9104b2c6b16fa7240b94e86cc6a2aa1
 DIST pycadf-0.8.0.tar.gz 255774 SHA256 240d7775682a0f49fb580310dd6459e8a8b5f5619dfdc687f043c3fe21b48ba1 SHA512 3b8446c33f0bf740b0f2384bb9e4c5ab5d960690e50bd52cf2217eb184f9f8061dfe39da9b21ef275a7c66ba4e35b912bfd9476469b28c3c2cd6f33d912ac6f7 WHIRLPOOL bf28052eee894a1a986c1903f44f2f800f096979188a6b0ff502b7316d38ce7c43197405e635da097de038e24c1d870140a4ddd1c0eaa543841b3073055f1c19
-EBUILD pycadf-0.5-r1.ebuild 2280 SHA256 7c73730df43eb1fd0ac503be19c819f93392ca47bc4f1bdab03dd2e4ab24b44a SHA512 3d483abae95706db6b1df05e8b1eff87ed3d4ec1ffc5206d45350a238b7e1fd2ba410c860dc1c7ff7bc6c283103cc87758fba1e8f46530f23e10b66d521eaefb WHIRLPOOL 1f255b845807926c9cf2d15fc70ff01e2b33383047349d77d18607374395f44f65fe29d503cee0419424c9d592742d03af42ee4a2df4c9c6f6225bd24fc4da62
+DIST pycadf-1.0.0.tar.gz 247178 SHA256 8278865dba0c6d7d2c83f51629c0f215393e8cbc36719c845b591f40dd80609f SHA512 7f7a4bb1d89ee3a63c9c74980995864b6e80a4e7df2111b4bafb42ba977ab2b86aac5e288d930068789cae9cabee13300ede7ae3c520440cc5fdfdac057085c0 WHIRLPOOL 68eab74a8e7a727d178dfdaa7cef27d0a41538540c450446a768775de61854eb82ca070792e694bad422ccacfae894b73226ab9224d82f742fdcd037ebd2c725
 EBUILD pycadf-0.6.0.ebuild 2394 SHA256 e11e7fdd1b30e74eeb326c2d97a5facddec6494447403afd8af722cd34f3c42c SHA512 c06f2e2b89d528c4608c6788205ddc020f14df28df414f8789b097ecf3ebeaef30e723d4afabd3374a0865cc5e376f9b58eab4dc2418c9b45b6707686dfea0cc WHIRLPOOL 7ba120cbcc133438f788d3186c8ce3eb75c65841252b572ece3794396d174b46b5a6db8a0c26d6588faa54900263249821384a93f5dc573b553a673a63fcff64
-EBUILD pycadf-0.8.0.ebuild 2380 SHA256 e4d6bcd4f33e428c54d5dfa648e06f002ffd75a7e055d1b47783aac81184a1e9 SHA512 d880f8ee6bc804f875d8998f48663f487842654faecaf8d92d3c91b9fb12cadb85ea395911f106f3821eb9362796d59fd5d2258805e8df8d64e83c0e02b05512 WHIRLPOOL ab5f9f1ed2eee751ac27e63b96a235d2fa6cdb4025017f8084e80c7e486c59eacfd480aac17c325656a58c7a43c171d17827d821565f8404ccef0d0fefab3138
-MISC ChangeLog 1172 SHA256 b9d66eaa110b56cc113c45e4e30b64c2da2fa9cec296f861dfba90a3cfc3aa69 SHA512 49535ca461710c16d3a13886759c870050bc80a3e3ca3e752ff96d6f1b409017a0d2b1bb010ccab01e085bdc9ff2319e7bdc00f5f7f22696c5f32123b87e36f7 WHIRLPOOL d86b9700602ee95749a7fb9ae95b825f51f3787cdc051986d09dc60d38d1b5d66ab332ea827e82fa62dcd9c9b164c08e1a5a1b88ec1c35e0d580e3ba1e23ba04
+EBUILD pycadf-0.8.0.ebuild 2316 SHA256 ded3841aa482600e861fce047616b7c3fe50a6792639e0c069d5d1bd3792f7d1 SHA512 39b5cdb2256f3544ed468fb5c9a63fee6d0d1ee99e8e215fe9e48b54a2e3398428412db6987c8610e2a75be123cdc0dfdec699b10ac58d4894ff84d8d6480b04 WHIRLPOOL 1c14a63399cc7515be22004a38270b0210949262224591822dc038471f007e4b54dae693b890e7d19b07274a2ff88bd751754e2125437a8813d9d3d84d20dc58
+EBUILD pycadf-1.0.0.ebuild 2067 SHA256 05b8bfe54c612f6339e946dd04589916c6426752556803f8ea2ee3dd81b61d83 SHA512 6b6eaf6f5cccdbe03118685ca306bff7d0ce2fd99cefff60e1944e74f5b0d51d922a6bbda3eee2338057ed3e85d7b0c8d32d1a0f314a06f4d1aa7215d5aa8897 WHIRLPOOL fc4e5870b9ac982e879ff5ea4a4265182826e3bf0314a96c861adee2fbf57f3d7a2191a53f7bcddea1ff47decac8ac5bff4e694f3eb2ece81af31b378b76ef46
+MISC ChangeLog 1488 SHA256 680eb77226990876a0c0d146b77a7bf16d93a58254bfc925eb0df6aff1bee088 SHA512 ae560c05c07c9d87a5509f4f1f58d7801395bb1b19543f451dd9b9b6e048b3655b9263cbdfe64e3d4714b9e4e0d28990f5472961b089342a47fc9b97b097fdfc WHIRLPOOL 28da09e271cd9dd3b0a8e58f7f877d82590237f86c7f29ea7953ce908613582ad7dba940a027f93cf6fbe2809d429fc511d630ccb42874ca61f64c4a35f94a23
 MISC metadata.xml 456 SHA256 89a3838659222c85a7c579883d3a9278e9143660de4d6f4aa3d72a879419cdb6 SHA512 71877b6180e968ff23bd6e45163ee48094f2647ac3e258f2c6fec2d427a3cd7d9aa64a9a7ac329005a6c2cabdacc16cdf10846fa1afbb045018c9cbd2592ffda WHIRLPOOL 87af5c4b842c2ac005d7e5012933cb3853df85d0a2d4982ea06c9be871eb5d7f6ed1174b57c15118d3f68466fdb5809630313c5a3df254e86af356f48ba23a53
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
+Version: GnuPG v2.1
 
-iQJ8BAEBCgBmBQJVb2kZXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
-OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmiOhoQALQix6HgIcvqvHg3bY5auz3u
-7ZAK7vhCHy796+eQiGRK5/ZrcpqKyuTl1pzfPxXmLVxBlPYmv0ZtOPTj4z0fhTsH
-6QVS/G/MMyP46PXCeF0tdR6e9vHZQjVc3kjyvuxwCSUmTTHVSgKA6pq/3BvoFQqW
-ajcvnfoF9BcA2SZ6Ysm2NYTiWSLBt5LHG0bT3SXVSl2sGIBe0oY6x9bknEPJES5K
-P1/IhdBSFwGZ16UJQVhGk0LopilNiRN9jGi0DMk88T5vYN9+lu0oX5j45ord6U0p
-2bNtzdToR7cXtra3V52Lx+hluW1lA9+HlMK6hsF+rOiWrTvGa0TBa8PzBcAGej1b
-JgKdk/x2L98zxgXB4Djx7LrtmXZXENN423I2M9sNioGq2b1k2ni4S3EIslle8Aa1
-K6hruSsWuZNiQ5h+eKsEp2L1gSJxqATLb4DDbLOspnX+9rimdFodHZAEV2+mXnlQ
-x5gz+QsECyq2zStDgj9TO5WaAoXPYurUX++Kaxg27Lwd1ORMz5yJTHssK51QJJfl
-MbdcnvYWATUqXqYuCQv4j/WQyCkdouMOyeYz15wPwBSyhrr/in+R7XsqRqSvSdeK
-tqlt1RiuLMRcBwvDfIjPN9h8spbCZKA74wKBeiZNP17jgl7rnrLwPr6teorvnpgH
-7K63pagHLYAM9rsajag0
-=gYee
+iKYEAREIAGYFAlWVD8dfFIAAAAAALgAoaXNzdWVyLWZwckBub3RhdGlvbnMub3Bl
+bnBncC5maWZ0aGhvcnNlbWFuLm5ldDdDQUM1OUY0ODkzMERBREU1NUQ1RjJBRkIy
+OEVDMjEzQjgwNzJCMEQACgkQso7CE7gHKw2VOACdH6c3KPYPjtDJPb46+ocMH/c/
+9csAoJhLOskYIOhS1+PskYgWl/Eami4p
+=HSI8
 -----END PGP SIGNATURE-----
diff --git a/dev-python/pycadf/pycadf-0.5-r1.ebuild b/dev-python/pycadf/pycadf-0.5-r1.ebuild
deleted file mode 100644
index f6fd3c2f95ba..000000000000
--- a/dev-python/pycadf/pycadf-0.5-r1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pycadf/pycadf-0.5-r1.ebuild,v 1.2 2014/07/06 12:45:32 mgorny Exp $
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-
-inherit distutils-r1
-
-DESCRIPTION="python implementation of DMTF Cloud Audit (CADF) data model"
-HOMEPAGE="https://pypi.python.org/pypi/pycadf"
-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}]
-		>=dev-python/pbr-0.6[${PYTHON_USEDEP}]
-		<dev-python/pbr-1.0[${PYTHON_USEDEP}]
-	test? ( >=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
-			<dev-python/sphinx-1.2[${PYTHON_USEDEP}]
-			dev-python/oslo-sphinx[${PYTHON_USEDEP}]
-			~dev-python/docutils-0.9.1[${PYTHON_USEDEP}]
-			>=dev-python/hacking-0.8.0[${PYTHON_USEDEP}]
-			<dev-python/hacking-0.9[${PYTHON_USEDEP}]
-			>=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}]
-			dev-python/nose[${PYTHON_USEDEP}]
-			>=dev-python/mock-1.0[${PYTHON_USEDEP}]
-			>=dev-python/mox-0.5.3[${PYTHON_USEDEP}]
-			>=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
-			>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
-			>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
-			>=dev-python/testscenarios-0.4[${PYTHON_USEDEP}]
-			>=dev-python/testtools-0.9.34[${PYTHON_USEDEP}] )
-	doc? ( dev-python/oslo-sphinx[${PYTHON_USEDEP}]
-		dev-python/sphinx[${PYTHON_USEDEP}] )"
-
-RDEPEND=">=dev-python/Babel-1.3[${PYTHON_USEDEP}]
-		>=dev-python/iso8601-0.1.9[${PYTHON_USEDEP}]
-		>=dev-python/netaddr-0.7.6[${PYTHON_USEDEP}]
-		>=dev-python/oslo-config-1.2.0[${PYTHON_USEDEP}]
-		>=dev-python/oslo-messaging-1.3.0[${PYTHON_USEDEP}]
-		>=dev-python/pytz-2010h[${PYTHON_USEDEP}]
-		>=dev-python/six-1.5.2[${PYTHON_USEDEP}]
-		>=dev-python/webob-1.2.3[${PYTHON_USEDEP}]"
-
-PATCHES=( "${FILESDIR}"/CVE-2014-4615.patch )
-
-python_prepare_all() {
-	# ? typo error in conf.py
-	sed -e s':oslosphinx:oslo.sphinx:' -i doc/source/conf.py || die
-	distutils-r1_python_prepare_all
-}
-
-python_compile_all() {
-	use doc && emake -C doc html
-}
-
-python_test() {
-	nosetests ${PN}/tests || die "test failed under ${EPYTHON}"
-}
-
-python_install_all() {
-	use doc && local HTML_DOCS=( doc/build/html/. )
-	distutils-r1_python_install_all
-}
diff --git a/dev-python/pycadf/pycadf-0.8.0.ebuild b/dev-python/pycadf/pycadf-0.8.0.ebuild
index 70022be563cb..937f8cfc74dd 100644
--- a/dev-python/pycadf/pycadf-0.8.0.ebuild
+++ b/dev-python/pycadf/pycadf-0.8.0.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/pycadf/pycadf-0.8.0.ebuild,v 1.1 2015/04/14 16:06:18 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pycadf/pycadf-0.8.0.ebuild,v 1.2 2015/07/02 10:17:41 idella4 Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -25,25 +25,24 @@ DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
 		>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
 		>=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}]
 		>=dev-python/mock-1.0[${PYTHON_USEDEP}]
-		>=dev-python/oslo-messaging-1.6.0
-		>=dev-python/oslotest-1.2.0
+		>=dev-python/oslo-messaging-1.6.0[${PYTHON_USEDEP}]
+		>=dev-python/oslotest-1.2.0[${PYTHON_USEDEP}]
 		>=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
 		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
 		>=dev-python/testtools-0.9.36[${PYTHON_USEDEP}]
 		!~dev-python/testtools-1.2.0[${PYTHON_USEDEP}]
 		>=dev-python/oslo-sphinx-2.2.0[${PYTHON_USEDEP}]
 		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
-		!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
 		<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
 		dev-python/nose[${PYTHON_USEDEP}]
 	)
 	doc? (
 		dev-python/oslo-sphinx[${PYTHON_USEDEP}]
 		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
-		!~dev-python/sphinx-1.2.0[${PYTHON_USEDEP}]
 		<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
+		dev-python/sphinxcontrib-httpdomain[${PYTHON_USEDEP}]
 	)"
-
+# !=1.2.0 of sphinx deleted since it is not in portage anyway
 RDEPEND=">=dev-python/Babel-1.3[${PYTHON_USEDEP}]
 		>=dev-python/oslo-config-1.6.0[${PYTHON_USEDEP}]
 		>=dev-python/oslo-context-0.1.0[${PYTHON_USEDEP}]
@@ -51,15 +50,8 @@ RDEPEND=">=dev-python/Babel-1.3[${PYTHON_USEDEP}]
 		>=dev-python/oslo-serialization-1.2.0[${PYTHON_USEDEP}]
 		>=dev-python/pytz-2013d[${PYTHON_USEDEP}]
 		>=dev-python/six-1.7.0[${PYTHON_USEDEP}]
-		>=dev-python/webob-1.2.3[${PYTHON_USEDEP}]"
-
-PATCHES=()
-
-python_prepare_all() {
-	# ? typo error in conf.py
-	sed -e s':oslosphinx:oslo.sphinx:' -i doc/source/conf.py || die
-	distutils-r1_python_prepare_all
-}
+		>=dev-python/webob-1.2.3[${PYTHON_USEDEP}]
+		>=dev-python/pytz-2013.6[${PYTHON_USEDEP}]"
 
 python_compile_all() {
 	use doc && emake -C doc html
diff --git a/dev-python/pycadf/pycadf-1.0.0.ebuild b/dev-python/pycadf/pycadf-1.0.0.ebuild
new file mode 100644
index 000000000000..e9ee83e3284a
--- /dev/null
+++ b/dev-python/pycadf/pycadf-1.0.0.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/pycadf/pycadf-1.0.0.ebuild,v 1.1 2015/07/02 10:17:41 idella4 Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="python implementation of DMTF Cloud Audit (CADF) data model"
+HOMEPAGE="https://pypi.python.org/pypi/pycadf"
+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}]
+		dev-python/pbr[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/hacking-0.10[${PYTHON_USEDEP}]
+		<dev-python/hacking-0.11[${PYTHON_USEDEP}]
+		>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
+		>=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}]
+		>=dev-python/mock-1.0[${PYTHON_USEDEP}]
+		>=dev-python/oslo-messaging-1.6.0[${PYTHON_USEDEP}]
+		>=dev-python/oslotest-1.5.1[${PYTHON_USEDEP}]
+		>=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
+		>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
+		>=dev-python/testtools-0.9.36[${PYTHON_USEDEP}]
+		!~dev-python/testtools-1.2.0[${PYTHON_USEDEP}]
+		>=dev-python/oslo-sphinx-2.2.0[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
+		<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
+	)
+	doc? (
+		dev-python/oslo-sphinx[${PYTHON_USEDEP}]
+		>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
+		<dev-python/sphinx-1.3[${PYTHON_USEDEP}]
+		dev-python/sphinxcontrib-httpdomain[${PYTHON_USEDEP}]
+	)"
+# !=1.2.0 of sphinx deleted since it is not in portage anyway
+RDEPEND=">=dev-python/oslo-config-1.11.0[${PYTHON_USEDEP}]
+		>=dev-python/oslo-serialization-1.4.0[${PYTHON_USEDEP}]
+		>=dev-python/pytz-2013.6[${PYTHON_USEDEP}]
+		>=dev-python/six-1.9.0[${PYTHON_USEDEP}]"
+
+python_compile_all() {
+	use doc && "${PYTHON}" setup.py build_sphinx
+}
+
+python_test() {
+	testr init || die "testr init failed under ${EPYTHON}"
+	testr run || die "testr run failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/build/html/. )
+	distutils-r1_python_install_all
+}