fixed doc generation

Package-Manager: portage-2.2.18/cvs/Linux x86_64
Manifest-Sign-Key: 0x33ED3FD25AFC78BA

4 files changed, 33 insertions, 21 deletions

diff --git a/sys-cluster/nova/ChangeLog b/sys-cluster/nova/ChangeLog
index 6491f77ba364..d5d2300e5e94 100644
--- a/sys-cluster/nova/ChangeLog
+++ b/sys-cluster/nova/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-cluster/nova
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/nova/ChangeLog,v 1.88 2015/05/04 15:09:48 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/nova/ChangeLog,v 1.89 2015/05/07 23:04:40 prometheanfire Exp $
+
+  07 May 2015; Matthew Thode <prometheanfire@gentoo.org> nova-2015.1.0.ebuild,
+  nova-2015.1.9999.ebuild:
+  fixed doc generation
 
   04 May 2015; Matthew Thode <prometheanfire@gentoo.org> nova-2015.1.0.ebuild,
   nova-2015.1.9999.ebuild:
diff --git a/sys-cluster/nova/Manifest b/sys-cluster/nova/Manifest
index d7917e33d987..7fae864a1c8a 100644
--- a/sys-cluster/nova/Manifest
+++ b/sys-cluster/nova/Manifest
@@ -6,24 +6,24 @@ AUX nova.initd 627 SHA256 74417e422e6c503ae338bb981934b54a5da57e783bdfed778de6ce
 DIST nova-2014.2.3.tar.gz 4436742 SHA256 5fc1f02c887a4ca9b1968dba71864cdb5e81bfbee3da398c64260be0cf1d7a2b SHA512 320ff0b3d6257834b96629101b0c1d6c4b240004dc8f9775759aa6532d166c8849bc3feef04e001421a75f36bd3516b8df0b595af30d020c3d9c22af843c5099 WHIRLPOOL 653c2485f89df171c03e290ce6cbc61c0a964d64440a0de9ebfda24dec6abac4e1c633d0a0057d7e531590e5bc9d3f048a0fe8b89c8db22007ef72ec24e3ebf7
 EBUILD nova-2014.2.3.ebuild 6067 SHA256 b8ea6d84e8bfbf5c5658b10938d4da15b8dfbb9044b4b4b475ebeb3a89a75793 SHA512 38188b2c1e0eed1fe23002ccfaa81f6782b74276b587b21765f83b359ae67f8757e6222b0bc2c1d819f238c2c943c1ebf5fdab5da1b0bb1de08934b04ba16550 WHIRLPOOL 2db61b4f347a886465b29c02901d9ec3ea7f34e0abb49be18e754269032a7aa932221f918d905a1add52d28672d0e28629dd7d55213fec71ba45b318b4edd5e3
 EBUILD nova-2014.2.9999.ebuild 6075 SHA256 eefe8729db7296ca360cddabfde23258be0a908921d94ab25ea585e199ddf9b1 SHA512 6ebfc8afdcfb33aaccf0bc137360c563572c743d3fb937e18805eba5d13f9a6c027311917327a519ee71492070875528d58fff3f1747b35e1f0031f973decf68 WHIRLPOOL 989b23c9d9edd618c6338731b5763f2a258de2241830e934bfbc26f38f105b61206934ee78188eb760fa47f63f1f65b9df8bf7e2279eb3596d8a99089f74f322
-EBUILD nova-2015.1.0.ebuild 6593 SHA256 645b15c32323bcb40daf08f66d22e153d5136f911f820fc04f55dc3b311551a0 SHA512 f2e04e0856828883d0a7c3069e9d40f4f5b1bf3b340ddfb16bf2f7b7e91dce66e37b99e88a6ef1c183bfd8976de31ba101563b1e32e409c091ad6c99dfd319df WHIRLPOOL cd4fcd835a127d31456789233417c49e2d7802d2c7026529c7860c6249d3f263b58c6e5f00067ea9b681083dc36a3290f7b175e778a0d11bed5487cd5d499f75
-EBUILD nova-2015.1.9999.ebuild 6591 SHA256 42b1e429a84e4d1c08ec03a9eb96ed8bc5fa4c6a021fac8dc81ef1ff5560f7dd SHA512 57ba936af4ea52e373fa68330b2effb57807a359f0733a2fd1289294805255964d7693b0628d8cb42fe3e7146d135750edf0438e827fce065d58bac39e8a4f35 WHIRLPOOL e224ac69a2e83de7ec39bc363aff3c78670fabd9ad9abb731decdb261b215d5c6353df2315a2d41fac286b1c933c2f4252eb411c8e8427a50cf45f6d556242b1
-MISC ChangeLog 19347 SHA256 8735cb40b3469c61012a543e8ed13771457889b93543b62ec5ed5150f83157dd SHA512 a928df45e2617848954f98478096f061be22821e3fb533312b8e1048f12c416cff8531885276e1b3a12a4483cf910a8c8268610b5933bae7834b9899fda28772 WHIRLPOOL e53dac5ce041097f67152f69ccf8694f845930561f5a4033d369d92e2eb07f31fce2e72f92903e6d26f9b11267e3a2c4f3a5b9c07944d2804cc78c2797df0401
+EBUILD nova-2015.1.0.ebuild 6837 SHA256 a688252941744437bfa7c848d896aec7c870a1314872b4861dc4e5c4bce19a13 SHA512 c6c67ac5e91529771e5eae0b6e850b3facebac3f784889e86986e5ceeaaa0481d4c89e30d7c5d3530ba2418b6beac340f8f9dd3daba821e63c3985ac68ab3bc4 WHIRLPOOL c7258f811782b8ad5e826800825bc723116fd69acc905517c81372aff61bc3423d6ba3c57026785eff310bea64a5085437ba9305823fc68879509b51389ec212
+EBUILD nova-2015.1.9999.ebuild 6835 SHA256 8fb0b535730456cf7ee325a2e5963b465d93c65ca36f0c924782a739ae94d120 SHA512 cb2d12f95a2d8ae36fbf9ac100c076329c756d323f3629a0ecc9106111ca4df63c5234cd2fc41505d8ebecb5e439b5b731c441f9ea21c1fd0031bde529b82385 WHIRLPOOL 03909042e620c43f6db541860a68569e6530fef90973cffc5c5a1199f9c2b11757f076ad46ddacd58a2884898c3c1f7a799d306eae320bd2feca4a4e4a605d96
+MISC ChangeLog 19477 SHA256 32b0f6514c1d6607a8a0772da16a455dcf4473529103cfb0a7f77df16440bfbd SHA512 5a3403bf27208237725e05f34adabd838993b21bc1e84085f5fc875b858c39d12276c7b6681de8b7b64dde6323a877b9bc5ed3e088c436aae1876548517cf7d5 WHIRLPOOL 3ec4e829c7a103223743bde708c257bfb65629a8afbfb506f56ebce8ff893ad535061f908798bdecb55c75e65733f449dd5ca3416aca0f65301e8d8548527c05
 MISC metadata.xml 911 SHA256 d5ba172160431f66d7d3bfa414209ef83b9e449efd3a55ded6d6ab91b3adeece SHA512 eb2c13ad92930a0792580d276672c7e9aae07ae09109bb6149429dff5e24951509ea95fa182ebdbb8a9a94b5dcbf6b25b580a16878c9b201ffa840270919d30e WHIRLPOOL 0a0eb3e24dade3fb862a89ad92a3da54191fa3bca682a8a512410c5f376d575ef21703cdcb085e7a423b89e8c08bdb682ef53392c43f19fdb0f6fd4984bfd0ce
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJVR4vXAAoJEGSje+quGaTo+DEQANAzP6UgmILuNtvbcRhb0LLw
-Qai2pYXPnoNXq2u6Tuoki7ROvxyqp2BNuxTjeWDMLP7psNDQ7ZHkzzgpCvl6KjoH
-g9ysNDEfzKiDruhctXscyuW4ePhgBwmHZC0hnhbxPpLcZHvnsmhCJF+kGRv62btw
-ekwMvrgWf9FSQWjMgfeELi9wSdPLRgOSxrEhuSwj+TD+94AsOL8SGcqvrTealGrO
-4Tn0kdUQlH0cCjPRbAP/tkP6hDg1PUUz7uUO6CoU/LYNZaAdLpzFkrfhBFPES2Sj
-lSmwDC5rTLwV5Sbz9QL6RL52siSgw6HXBdm4hAA1pfTZl1HROi7w5TH13gNyRpWp
-R7ktjGh1UYV0QDIWWs5FrkreAa08+TPI+NSsmkVfhWaXbwUYAk5N/IvGMoQWlLzb
-yYdsWicMlMim3ShXmSr9pNwNRJJb7Ijry/Mf25VZMfY1bL737d7BMwwDyCepuJ2L
-x9HGd9VIVE99Su4z6f2OVAkcpO9ztGTfEMU3Fw8XeNJfQ8Xb3MLS3dKvJYLGEVEG
-yI8W9F+2WWJp9soA6RoqwN7XoPm4fMmzipoIM8tBvNve0cblYRPiQaFvQpvz/YMB
-2pcuGUzyXIJP/e5ZDkuMq3fOhbDxHES7tuteJC8iShslwlNRGn3DbrmajHUY0G2Q
-/7ZV+AZwhj9PnQQv9wSj
-=7RfS
+iQIcBAEBCAAGBQJVS++lAAoJEGSje+quGaTo/AMP/2nGckxiXWMJVEo00lzd+1fp
+00a81kOlMEjA26S7t1v8n5SU3FQdfvreiot+5zPA3Z8ee/ZHCTfE0P+ZU3BPNACR
+/thiKumjlZo4MjSvyxuApi/knhYcR9J2CaWCVmT3+rYApLiAEiyXQFAt+Wrc7faT
+5suGSNWaS0w3rp165kyBWuvNP6wKeAE3iytH3TLMKbj2ymp6HJiO6OQgD7ypLYQH
+0tKq+wQJmlMAiTggAo2VrSd/m6uOoyidmtYnl4uNauOn/bRJivLdeVUkp3RkJ5t0
+rkrGQHK5BFDxPa0eBVqzAd00eod6q49r8+Wq1Zoi+PWnkisHxon5cNT9NB2iikAR
+CcTMaSn+B7P8OxfpYRDfnybCnzBQ6nplm/CFNC3hZKiDj0gY8cjTvjsfRZJ0Dh3d
+ig/+zY7EnPLgWEUFcrwtSqgc1a9murfy2Aao/OO0Jg9SnCKhs9BQIcrWDpB3e9WD
+sAZSiS0GscMuK5x7DceYJnhpWsu8s4sQeA3zctZKtpbHEln+2u+r1jIh0vW7cJEs
+56qWhNcyol51+QmuHiGEO9q3Qy3SGkn9YwO22NMRYpKR+YSJgZUdmeX7n1XR3AWF
+c6Bo+nLg5MhgIL0fJht6iWlfN0JpMCMFFUc9UMlsihvDj+FcZjUjaOYTWtzUxVtx
+royIb9IZSYCioMNJ8t/H
+=Vy3q
 -----END PGP SIGNATURE-----
diff --git a/sys-cluster/nova/nova-2015.1.0.ebuild b/sys-cluster/nova/nova-2015.1.0.ebuild
index 0048b3c1350b..858e3d428d4c 100644
--- a/sys-cluster/nova/nova-2015.1.0.ebuild
+++ b/sys-cluster/nova/nova-2015.1.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/sys-cluster/nova/nova-2015.1.0.ebuild,v 1.2 2015/05/04 15:09:48 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/nova/nova-2015.1.0.ebuild,v 1.3 2015/05/07 23:04:40 prometheanfire Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -24,6 +24,7 @@ DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
 		<dev-python/pbr-1.0[${PYTHON_USEDEP}]
 		app-admin/sudo"
 
+# barbicanclient is in here for doc generation
 RDEPEND="
 	sqlite? (
 		>=dev-python/sqlalchemy-0.9.7[sqlite,${PYTHON_USEDEP}]
@@ -67,6 +68,8 @@ RDEPEND="
 	<dev-python/python-neutronclient-2.5.0[${PYTHON_USEDEP}]
 	>=dev-python/python-glanceclient-0.15.0[${PYTHON_USEDEP}]
 	<dev-python/python-glanceclient-0.18.0[${PYTHON_USEDEP}]
+	>=dev-python/python-barbicanclient-3.0.1[${PYTHON_USEDEP}]
+	<dev-python/python-barbicanclient-3.1.0[${PYTHON_USEDEP}]
 	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
 	>=dev-python/stevedore-1.3.0[${PYTHON_USEDEP}]
 	<dev-python/stevedore-1.4.0[${PYTHON_USEDEP}]
@@ -125,11 +128,12 @@ pkg_setup() {
 	fi
 	enewgroup nova
 	enewuser nova -1 -1 /var/lib/nova nova
+	sed -i 's/python/python2\.7/g' tools/config/generate_sample.sh || die
 }
 
 python_compile() {
 	distutils-r1_python_compile
-	./tools/config/generate_sample.sh -b ./ -p nova -o etc/nova
+	./tools/config/generate_sample.sh -b ./ -p nova -o etc/nova || die
 }
 
 python_install() {
diff --git a/sys-cluster/nova/nova-2015.1.9999.ebuild b/sys-cluster/nova/nova-2015.1.9999.ebuild
index 449cf1245d7c..85469e07af08 100644
--- a/sys-cluster/nova/nova-2015.1.9999.ebuild
+++ b/sys-cluster/nova/nova-2015.1.9999.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/sys-cluster/nova/nova-2015.1.9999.ebuild,v 1.2 2015/05/04 15:09:48 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/nova/nova-2015.1.9999.ebuild,v 1.3 2015/05/07 23:04:40 prometheanfire Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -24,6 +24,7 @@ DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
 		<dev-python/pbr-1.0[${PYTHON_USEDEP}]
 		app-admin/sudo"
 
+# barbicanclient is in here for doc generation
 RDEPEND="
 	sqlite? (
 		>=dev-python/sqlalchemy-0.9.7[sqlite,${PYTHON_USEDEP}]
@@ -67,6 +68,8 @@ RDEPEND="
 	<dev-python/python-neutronclient-2.5.0[${PYTHON_USEDEP}]
 	>=dev-python/python-glanceclient-0.15.0[${PYTHON_USEDEP}]
 	<dev-python/python-glanceclient-0.18.0[${PYTHON_USEDEP}]
+	>=dev-python/python-barbicanclient-3.0.1[${PYTHON_USEDEP}]
+	<dev-python/python-barbicanclient-3.1.0[${PYTHON_USEDEP}]
 	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
 	>=dev-python/stevedore-1.3.0[${PYTHON_USEDEP}]
 	<dev-python/stevedore-1.4.0[${PYTHON_USEDEP}]
@@ -125,11 +128,12 @@ pkg_setup() {
 	fi
 	enewgroup nova
 	enewuser nova -1 -1 /var/lib/nova nova
+	sed -i 's/python/python2\.7/g' tools/config/generate_sample.sh || die
 }
 
 python_compile() {
 	distutils-r1_python_compile
-	./tools/config/generate_sample.sh -b ./ -p nova -o etc/nova
+	./tools/config/generate_sample.sh -b ./ -p nova -o etc/nova || die
 }
 
 python_install() {