metadata.xml; added herd, python-keystoneclient-0.3.2; upgraded test phase, revbump; updated deps inc. test requirements, restricted tests subsequent to stalled dev. of httpretty, added IUSE doc & examples with pertinent build and install phases

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

6 files changed, 125 insertions, 11 deletions

diff --git a/dev-python/python-keystoneclient/ChangeLog b/dev-python/python-keystoneclient/ChangeLog
index f8722d3ae99b..889cc49ed2e0 100644
--- a/dev-python/python-keystoneclient/ChangeLog
+++ b/dev-python/python-keystoneclient/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for dev-python/python-keystoneclient
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-python/python-keystoneclient/ChangeLog,v 1.20 2013/11/09 10:47:56 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/python-keystoneclient/ChangeLog,v 1.21 2013/11/30 07:28:20 idella4 Exp $
+
+*python-keystoneclient-0.4.1 (30 Nov 2013)
+
+  30 Nov 2013; Ian Delaney <idella4@gentoo.org> +files/sphinx_mapping.patch,
+  +python-keystoneclient-0.4.1.ebuild, metadata.xml,
+  python-keystoneclient-0.3.2.ebuild:
+  metadata.xml; added herd, python-keystoneclient-0.3.2; upgraded test phase,
+  revbump; updated deps inc. test requirements, restricted tests subsequent to
+  stalled dev. of httpretty, added IUSE doc & examples with pertinent build and
+  install phases
 
   09 Nov 2013; Ian Delaney <idella4@gentoo.org>
   python-keystoneclient-0.3.1.ebuild, python-keystoneclient-0.3.2.ebuild:
diff --git a/dev-python/python-keystoneclient/Manifest b/dev-python/python-keystoneclient/Manifest
index 7ff9807dd7dd..ee4d556cbea2 100644
--- a/dev-python/python-keystoneclient/Manifest
+++ b/dev-python/python-keystoneclient/Manifest
@@ -1,19 +1,22 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX sphinx_mapping.patch 612 SHA256 d262ebd8e9254f683333c7e349a291037a74d6b3cde23e5d984d9ff37d0f73ed SHA512 a2aeacf6bfdae22056a33be8ece54d64dff1206eadb7ab6988ced85b502ea64ce0ed35b3f55bbbe2d902a139b8939e1b76d48b3e85772f4729a5247fbf498af5 WHIRLPOOL 2f7e733736ef865af5398112a3b62ec164d5f7cdb6b35ede36d302f7c3f63527a62ca382bb352bed9173615122a9f9398dc14046b30cbae44d2337f02db3bed0
 DIST python-keystoneclient-0.2.5.tar.gz 196496 SHA256 3985ab402b3b63510f387df639658687ee001c047ed710bee9a46219ebc31e2b SHA512 2c14d039a80a8b8ac65c974410722b5726b2f0f94c238b60ac93d09828abcf4518cec16af10387ccaa5e1639a5c9e168afa32623e507899c8486152c3d785c8b WHIRLPOOL aa82ee7f157c8573978b04b485068cc5d3f3f8bcfc4e573b8ed631b23ca3ffd8eb47830449c13da5e93e674c42a23c1efb072ffd5005c93a3c6f84a12e1b4063
 DIST python-keystoneclient-0.3.1.tar.gz 209845 SHA256 bfc149b2d161bfe168be0fde41d9e75f2c0a99b9f398672f92c7c54c6f62fa26 SHA512 e79a4ab0b8e2c99a94efd6bf6690abd15cf41ea6b4e605c1a3534ee9788cb38239b6cd43e2956bd513b1149ab359af63eb46c7a61a9ebe3f3c1005068a7533de WHIRLPOOL ab4636f77e8de91fe38718f3f43a9f81d4bde69ed02710fe0d02ce1e8965f728c53fff6f28780981e7303c16fe43a33c9c30ac21a7cb1cfc8a2e855bc47c1f36
 DIST python-keystoneclient-0.3.2.tar.gz 231132 SHA256 cfa6766fd3141cd4dbb5ebf126a4b14095dd0aafee71a753fff9f6a0b4ab8a65 SHA512 914dd7366936f09cd8500564d3842e855b2cc005e1ec48488d133ffcc7fe6f1a302777d62b99e262b86ec82220502452cfcf9146f43e7b3704592be4ac77ffe3 WHIRLPOOL f3f751e63749850a72ad5e2ddda38c5917ae6226057ad063d71bd7341d739d69ffd4173d09637302a92f31853e8f57e1cc6abb03f50f8f1c0654e6f29bff9329
+DIST python-keystoneclient-0.4.1.tar.gz 255751 SHA256 bc9b27000e5bbfbb06030a69af81e08ced99568d97fd257972ef80637f6e0704 SHA512 f423a49d02c694f2d945efd39cbd17a3149934b367771891a45a8f43c8a2492800fd3068e68a8a59237f013fd575a355bbac81298ef26e6973f1b0bd66fc6bad WHIRLPOOL 91162321e838ff5022676b76f1d56551dd0b602f8d95fd14fa957744154eead4597d3347623e8c32f594d4ea9e6fab94d10d8dd8d51cb83591fbcc6fbfccb641
 EBUILD python-keystoneclient-0.2.5.ebuild 2060 SHA256 d07bafbc00522304e19f82b88bcec0af96f5da8fc789c78edf3a1d297631f301 SHA512 83fb0fe0a8bf8ae0d58a8c3e19a6ef9f255c80e703aa3f5afb16733ed88d326bb1ee7093a53bd682d1cc27b72ead729caac7c22de5523025311c5f02b9c55e2c WHIRLPOOL 99e97137c1b9805d643f0c788679b3cd54ce4282901f41246700122a005636394d35105dc5dad8a62bc872092cb66262fb91c30664f4576bea7149074a54da9b
 EBUILD python-keystoneclient-0.3.1.ebuild 2236 SHA256 2786fd1ffe5e3924c0f6623ecf9613ab2e3d396ce939988f158ac77e3c957836 SHA512 84652d4f1824b9f8a04d32cd7bf8903175ca2b75eaed5f26c9a860cafbae3a4d9dec2313f714715ad86ef7f8abf107818175969dde1bf5a71a575d6f6905d16b WHIRLPOOL ab96bb70febeb08db6b96ad254716e273f465cf5eb8a2bb3a42dcd2e1541829ac06217bb3c0ff36cf5ba5a216b956dfd6e2b87fda51de0d091bc4d1deecc0087
-EBUILD python-keystoneclient-0.3.2.ebuild 2591 SHA256 11829f110c6308490254b5719f3452cf5a9016dcf3a5d2cbcdd4a8d861886031 SHA512 2edba3098e2adee2b23c3e094fe4937501c979c46784284ead12c8cbd292a37704dfa6e0a52d91efa5b1af1e99178e99a8e33cb072f87548377d35913322b777 WHIRLPOOL feff77a3a5cd09845f95a535b5c41222f4e253303f9eaf062a3e0b4861dd3620f1933dc11545adcb3f11752ee47c0f916fedeb7d78e629bb24f52af1793a9e51
+EBUILD python-keystoneclient-0.3.2.ebuild 2778 SHA256 93138511e81cedbbf25adad3184ef17d562df0010fe388abadd98d560a92ab16 SHA512 f7b0c295123822c15c5146f0633c0a6e617da32214da434a4111e02cd33bd48a81cd7c1b59d71c222b91f102950cbadab8e71cf21baf2211fa1b8253a8d67810 WHIRLPOOL ca57f780e535684b3d5dc34051fa5226c87f25526c0ead65480e2da1241a2187808cd5336e074c12a139b6581b39b77abccc9d086d09fcfafb89427fb078819e
+EBUILD python-keystoneclient-0.4.1.ebuild 3248 SHA256 ac6cb3f11b316b83c15a55c7e933e5d37490854857499aafbb5e70803486b22d SHA512 40dccdb5e56362e121b0f6782503e3a1862602994c47a9f13bd25606c5c48f3f948d3288f6142ad677007127556a6f196807c8d15a301285d39e36fe94587101 WHIRLPOOL 3f9437cd084c1784f447641f5b3a15d2ce523f5286765d2e6ebdbcdecea9d5a4242e73b4fada261d383d5bd4c64ec50cd1871f6e88013fe2b9dbb7e12fa7a8ab
 EBUILD python-keystoneclient-9999.ebuild 2056 SHA256 2ca68b565b4cd97dfa81a76f080682df3c377e7fe0d923fb8183e043772218ce SHA512 9d74ddadfbef7398d7e5132d94408042a470004413c496c94a3ddb48bff914a89fab3d8a16b103a8012f64b13faa5c00d3e0b7449175427448bd23d37f33fb22 WHIRLPOOL 492d41efe53f5ecbef0973393636a3f04768375017ea24e8dc528a1ad873038aee88feffe95a072fe2c01821d27f19067136c94847873798519ac707c6fba5b7
-MISC ChangeLog 5068 SHA256 98263d2bb0e8c21bde286e3a1f3ed4da494bee9400bc589213016e8ca7e2be38 SHA512 5deae9fd16d3df1f2aef48eebabae7fe80da98c74f8abfcc1c73cc3c7e2b61f00d188e1e1488d174e3fe1a957c84f7dbb465b3b4d5362c2238a0044711d94ed5 WHIRLPOOL 1ae55c227d52441803fdfc95605398be5fc54e0e964277aa94b19188c68ab3c891508d1dd6c6dab56c8f0ec86a47e4381386f8aea236dd87fe485777eb326a71
-MISC metadata.xml 343 SHA256 716e96a66916d216f80e7ce0283db63bd6d18a95e2365d9d1a35964b2ef461f9 SHA512 fd28e5434f725af6a835205ae8cfae1354983f8e68f6c25f9a4f56ec17041ac9bb1a460ff8e82d0e165ab19c5b0f26e0f0c8c5124dfcc37723c786e12cd4d3bf WHIRLPOOL b486328b67aa7f6e4b68adc757bf5d3983077a894d7ded68be7723fe5655805324a73e5914fda0f81ae334e75db9557e2675a43e9437df633311590758466c5c
+MISC ChangeLog 5535 SHA256 4984dc0d1a84900cd36d21d21f64c7ded887ddeb02a5bf96ba32ce9b0b11c3d3 SHA512 3f5b0aa19fa528843371d8b0cbb0267e711c5ddd57cc166aebc69567e9c05eb420a7e185462e8b8af556397fd7e162cde43d0863fdd08dc6211297695d7c8684 WHIRLPOOL 1493a44b11e60f56846532cfd5183d12354df71e776537c653d98a8a1df78a3bb7d7a920092126b0ae1d3cac3bd35141a9c7b3964d24bdc0dee94643ee2a5f72
+MISC metadata.xml 369 SHA256 eb7dd073442c59e45a735e9d7a32e27c8c38169aa20208b7a51b65ef2567686d SHA512 e24a82fca02729b14e0e6af7322a26d565b3fc69b41e79773cb1ff135b6163ef05995439913b8a90855b630d6124883bdfcb7aa91d2508403be108da1f0be562 WHIRLPOOL 2fca1ff8dc706f6a692b0998bb0802fe97b3a517482608d9396aa6251f57ba06db2f27927871a33901469f5fb3a297cbfd217820acebb68c46d7e16ac95736c6
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlJ+EukACgkQso7CE7gHKw0C4gCfaElxn8pGd2qvhv7PkE6mhdPD
-nm0AoIXNGkW/kaBcfnP9U0OSz0UQvmXS
-=k3j6
+iEYEAREIAAYFAlKZk6MACgkQso7CE7gHKw3HJACgv7DeKz3/4l9Vr76uF8XYp87w
+WXQAn162ZuwiINPP6Wv9ebHmZlaTeafr
+=0yCg
 -----END PGP SIGNATURE-----
diff --git a/dev-python/python-keystoneclient/files/sphinx_mapping.patch b/dev-python/python-keystoneclient/files/sphinx_mapping.patch
new file mode 100644
index 000000000000..c60c3db61ee0
--- /dev/null
+++ b/dev-python/python-keystoneclient/files/sphinx_mapping.patch
@@ -0,0 +1,11 @@
+diff -ur python-keystoneclient-0.4.1.orig/doc/source/conf.py python-keystoneclient-0.4.1/doc/source/conf.py
+--- doc/source/conf.py	2013-10-17 04:33:40.000000000 +0800
++++ doc/source/conf.py	2013-11-30 15:12:37.069566832 +0800
+@@ -222,7 +222,3 @@
+ 
+ 
+ # Example configuration for intersphinx: refer to the Python standard library.
+-intersphinx_mapping = {'python': ('http://docs.python.org/', None),
+-                       'nova': ('http://nova.openstack.org', None),
+-                       'swift': ('http://swift.openstack.org', None),
+-                       'glance': ('http://glance.openstack.org', None)}
diff --git a/dev-python/python-keystoneclient/metadata.xml b/dev-python/python-keystoneclient/metadata.xml
index f95a2e556db9..22116572be04 100644
--- a/dev-python/python-keystoneclient/metadata.xml
+++ b/dev-python/python-keystoneclient/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>
     <name>Matthew Thode</name>
diff --git a/dev-python/python-keystoneclient/python-keystoneclient-0.3.2.ebuild b/dev-python/python-keystoneclient/python-keystoneclient-0.3.2.ebuild
index e2b4df8b2143..2c9b4dcf6a1b 100644
--- a/dev-python/python-keystoneclient/python-keystoneclient-0.3.2.ebuild
+++ b/dev-python/python-keystoneclient/python-keystoneclient-0.3.2.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/dev-python/python-keystoneclient/python-keystoneclient-0.3.2.ebuild,v 1.4 2013/11/09 10:47:56 idella4 Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-python/python-keystoneclient/python-keystoneclient-0.3.2.ebuild,v 1.5 2013/11/30 07:28:20 idella4 Exp $
 
 EAPI=5
 #testsuite has unpretty httpretty deps
@@ -18,8 +18,7 @@ SLOT="0"
 KEYWORDS="~amd64 ~x86"
 IUSE="test"
 
-#because fuck packaging this shit, I mean, really look at this shit.
-#https://github.com/gabrielfalcao/HTTPretty/blob/b5827151ddde2e3fed49f5a1ca7f2bb2ef8876a1/requirements.txt
+#Note: https://github.com/gabrielfalcao/HTTPretty/blob/b5827151ddde2e3fed49f5a1ca7f2bb2ef8876a1/requirements.txt
 #https://github.com/openstack/python-keystoneclient/blob/0.3.2/test-requirements.txt
 #https://bugs.launchpad.net/python-keystoneclient/+bug/1243528
 #				>=dev-python/httpretty-0.6.3[${PYTHON_USEDEP}]
@@ -57,5 +56,12 @@ python_test() {
 	# https://bugs.launchpad.net/python-keystoneclient/+bug/1243528
 	# https://bugs.launchpad.net/python-keystoneclient/+bug/1174410; last touched on 
 	# 2013-05-29 with 'importance: 	Undecided → Medium' and never worked since.
-	nosetests -I 'test_http*' -e test_auth_token_middleware.py || die "testsuite failed"
+	sed -e 's:test_encrypt_cache_data:_&:' \
+		-e 's:test_no_memcache_protection:_&:' \
+		-e 's:test_sign_cache_data:_&:' \
+		-i tests/test_auth_token_middleware.py
+	rm -f $(find . -name "test_http*") || die
+	testr init
+	testr run || die "testsuite failed under python2.7"
+	flake8 tests || die "run over tests folder by flake8 drew error"
 }
diff --git a/dev-python/python-keystoneclient/python-keystoneclient-0.4.1.ebuild b/dev-python/python-keystoneclient/python-keystoneclient-0.4.1.ebuild
new file mode 100644
index 000000000000..19e5664794b7
--- /dev/null
+++ b/dev-python/python-keystoneclient/python-keystoneclient-0.4.1.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-python/python-keystoneclient/python-keystoneclient-0.4.1.ebuild,v 1.1 2013/11/30 07:28:20 idella4 Exp $
+
+EAPI=5
+#testsuite has unpretty httpretty deps
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1
+
+DESCRIPTION="A client for the OpenStack Keystone API"
+HOMEPAGE="https://github.com/openstack/python-keystoneclient"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc examples test"
+RESTRICT="test"
+
+#Note; https://github.com/gabrielfalcao/HTTPretty/blob/b5827151ddde2e3fed49f5a1ca7f2bb2ef8876a1/requirements.txt
+#https://github.com/openstack/python-keystoneclient/blob/0.3.2/test-requirements.txt
+#https://bugs.launchpad.net/python-keystoneclient/+bug/1243528
+#				>=dev-python/httpretty-0.6.3[${PYTHON_USEDEP}]
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+		>=dev-python/pbr-0.5.21[${PYTHON_USEDEP}]
+		<dev-python/pbr-1.0[${PYTHON_USEDEP}]
+		test? ( >=dev-python/hacking-0.5.6[${PYTHON_USEDEP}]
+				<dev-python/hacking-0.8[${PYTHON_USEDEP}]
+				>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
+				>=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}]
+				>=dev-python/keyring-1.6.1[${PYTHON_USEDEP}]
+				<dev-python/keyring-2.0[${PYTHON_USEDEP}]
+				>=dev-python/mock-1.0[${PYTHON_USEDEP}]
+				>=dev-python/mox-0.5.3[${PYTHON_USEDEP}]
+				>=dev-python/pycrypto-2.6[${PYTHON_USEDEP}]
+				>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
+				>=dev-python/testrepository-0.0.17[${PYTHON_USEDEP}]
+				<=dev-python/testtools-0.9.32-r1[${PYTHON_USEDEP}]
+				>=dev-python/webob-1.2.3[${PYTHON_USEDEP}]
+				<dev-python/webob-1.3[${PYTHON_USEDEP}]
+			) "
+
+RDEPEND="virtual/python-argparse[${PYTHON_USEDEP}]
+		>=dev-python/iso8601-0.1.4[${PYTHON_USEDEP}]
+		>=dev-python/prettytable-0.6[${PYTHON_USEDEP}]
+		<dev-python/prettytable-0.8[${PYTHON_USEDEP}]
+		>=dev-python/requests-1.1[${PYTHON_USEDEP}]
+		>=dev-python/simplejson-2.0.9[${PYTHON_USEDEP}]
+		>=dev-python/six-1.4.1[${PYTHON_USEDEP}]
+		>=dev-python/oslo-config-1.2.0[${PYTHON_USEDEP}]
+		dev-python/netaddr[${PYTHON_USEDEP}]
+		>=dev-python/Babel-1.3[${PYTHON_USEDEP}]"
+
+PATCHES=(
+	"${FILESDIR}"/sphinx_mapping.patch
+)
+
+python_compile_all() {
+	use doc && emake -C doc html
+}
+
+# Made more reliant upon httpretty. python test phase is a w.i.p until httpretty is 'sorted'
+python_test() {
+	# https://bugs.launchpad.net/python-keystoneclient/+bug/1243528
+	# https://bugs.launchpad.net/python-keystoneclient/+bug/1174410; last touched on 
+	# 2013-05-29 with 'importance: 	Undecided → Medium' and never worked since.
+	sed -e 's:test_encrypt_cache_data:_&:' \
+		-e 's:test_no_memcache_protection:_&:' \
+		-e 's:test_sign_cache_data:_&:' \
+		-i keystoneclient/tests/test_auth_token_middleware.py
+	rm -f $(find keystoneclient/tests/v2_0/ -name "test_*") || die
+	rm -f $(find keystoneclient/tests/v3/ -name "test_*") || die
+	testr init
+	testr run || die "testsuite failed under python2.7"
+	flake8 tests || die "run over tests folder by flake8 drew error"
+}
+
+python_install_all() {
+	use doc && local HTML_DOCS=( doc/build/html/. )
+	use examples && local EXAMPLES=( examples/.)
+	distutils-r1_python_install_all
+}