stable/grizzly for nova too

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

4 files changed, 112 insertions, 31 deletions

diff --git a/sys-cluster/nova/ChangeLog b/sys-cluster/nova/ChangeLog
index bba78a73f432..d1ff566b456a 100644
--- a/sys-cluster/nova/ChangeLog
+++ b/sys-cluster/nova/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-cluster/nova
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/nova/ChangeLog,v 1.16 2013/06/25 19:04:50 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/nova/ChangeLog,v 1.17 2013/08/02 18:39:46 prometheanfire Exp $
+
+*nova-2013.1.9999 (02 Aug 2013)
+
+  02 Aug 2013; Matthew Thode <prometheanfire@gentoo.org>
+  +nova-2013.1.9999.ebuild, nova-9999.ebuild:
+  stable/grizzly for nova too
 
 *nova-2012.2.4-r3 (25 Jun 2013)
 *nova-2013.1.2-r2 (25 Jun 2013)
diff --git a/sys-cluster/nova/Manifest b/sys-cluster/nova/Manifest
index e5d6559f8f83..9f16e9964e37 100644
--- a/sys-cluster/nova/Manifest
+++ b/sys-cluster/nova/Manifest
@@ -8,23 +8,24 @@ DIST nova-2012.2.4.tar.gz 6286004 SHA256 883a44282514b484a1187c07875834b9c464855
 DIST nova-2013.1.2.tar.gz 5748169 SHA256 964be1ad9a2578f3441e9c61553b5bac464aec9a35d4f4e941325adab0b2206b SHA512 a8d83e9ca61e6334f86f0c1cfd89ad02a2f9dde60c8f4f54ac99a07578e836929191029360280b6776b7ce5b7a88138bb69f432343a2c376952d32aec2e4c727 WHIRLPOOL b7701694bff7dbc452c3949f30418ec662b9ba3bea16afba30e6c7b649e5476a63848897b79f77e5e7c7e2795a20b1b3bbec41010e961580b7affb4e896845b7
 EBUILD nova-2012.2.4-r3.ebuild 2674 SHA256 f6bcba48b87962a3d690062fb4b11f5d65bc2ebcd2fec0da184603874c171508 SHA512 25c827a591ec3631278e1479f49373e3f4b086b3eb6c09eda595d364f938ff12e4141898ad0078ac4c56415d3e62a106a0651a9bcd95c858f10c8f6a20566a32 WHIRLPOOL e5149bb51ed417d78a09a2cff7bf7adba6bb7bbd1b9a8ca2c91de10ed42c3feffaebf145872786991429cf4e017ae8d93ccde7fdc8348d5ee08905b8878dc4e5
 EBUILD nova-2013.1.2-r2.ebuild 2976 SHA256 fd1e0802ee744e91e8b3067c7111dc26cf2f52eeef086854b1c54a6ff2725bcc SHA512 d65979935a6453b367ceb2b3d794c977646373a5e12a11d1867b10e040211f1340f5abae3b3335f6605fa8e3a974d6fc4ab8d88f27462069c03044f67976127c WHIRLPOOL 4dbb734ecaef06c8f1c6b6080b7a5d720c0c5e1b1a75fd56de6b8cee14b14d2cf6f02ef414004a6794212a0e2fd5fa0dc8742ca6ff04320e29145969e2c5db3a
-EBUILD nova-9999.ebuild 3345 SHA256 afa6f66e5e92714fbab8e5df3ae7117919df35455bdfc84c2e80d2636d346b9c SHA512 2e07d5c54e1ba0e61ddf52a12c858961bac70ed50e5af6aae49708c136e1f1e81a240648e4251d7931554bb0e23fa503cde394ad6670ff8f0c687040f2e000d5 WHIRLPOOL edcd237c4f24a231f8b48744db02bc21b85c56c74ee05fcf13655e158dbc009a1f7c58d3389ad7d04e021fe503d74777a4242109a0fead7f9cf8cb29d9d47eb9
-MISC ChangeLog 3804 SHA256 102ce5d073c12cf6e01dac71d8b2bcdabe48d343ecea616c7b7456842986d7a4 SHA512 757a114dff7a54bf001b735c9605735b711d3b966e5bd66c1e5100c066bb5ab95d496de496b06ce73461572025f4e10d8b7384ca467a4d794eaf7eadbeeb92b4 WHIRLPOOL bb624c59518fd075bd0787b87f213a0db7351fe2f10c1427585ac9ec203cf25fb69abb15af00ff775ccf45186435e2976a4a8179e048683c05779a94f9fab059
+EBUILD nova-2013.1.9999.ebuild 3051 SHA256 0ed811ea3b5e30e584ad87c3f008eaad7ede6631e638f0ff8f62af3d537f026d SHA512 db6bdde3a992ff771f1c66c610b103fe1a9d9217379e28858185be2fb446d71149876d02582074d66f0731c61c31ac71b8732b8c0f8d4d71cce476b0d89876b1 WHIRLPOOL f284f7493e755eb12f4d99568097e120d19a4fd6c87f962095a203819d5e0d5bc65af3eaf16d5af48416aa7d71e44bf0334e475c7a95d160fbadb79d8ae35d2c
+EBUILD nova-9999.ebuild 3025 SHA256 e0702a7f45a0c37359aa3eaec1ad824dc4f11cb951a79f2d01ee2e3bf37dafd5 SHA512 cf1720edd1b2d0e1a2406b912a029d27110d0148ffcff179762678341dfc05be4eea79ac3e6a86dfe1c40c48821b4f6edc8553c2ff0a04f05296f5941ee25f4a WHIRLPOOL cf3bdf79241d5d32301bb6deae1fe91f604ee2186b79dab1715f8a75e235e8bab3834eda2c57cd2e06961becc14c3dcedbe2aae0db1ce96a97ca1adefd5dfcd4
+MISC ChangeLog 3971 SHA256 1eb8291a1b2e046cd3596ead515b6824d9fa84006439cc45610eb63a7c929f16 SHA512 2e4f25d55051fdbd564ad9aa7462418a640993c25b076244489587861316a7c6756c0005a32a27d361165ee61d8163cb83b46445562941e45472e371920c0fd8 WHIRLPOOL f9f7f5a05461cac54135c40dfe01020c7e10dedfa7162cde478bba2d2920a395f6cc3785e0a3004935a2c54d00504879c587d5f70b033a8271f7c88a1995df20
 MISC metadata.xml 407 SHA256 87ac581ad3af018ee16b2c5a8dbc98553ad93fc48bf5cfd62a6f929353049e77 SHA512 4ae00a6fc5411c1795249864317143787b31cb068fb1508f8a1455fd6194254961cca80256e0b437dc131560126cdf5a59d98a5a5064ac49c6e43c1651718a4a WHIRLPOOL 52b178c072593baea26fa3d7e9c06aac003d1a828ffa98de712306f60eeddba92271bc6061d7224a76ac35fa3c1da33213983e998160acf92a6d7027b284bcc0
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQIcBAEBCAAGBQJRyen4AAoJECRx6z5ArFrD7KUQAMMzZMl+G4R9GNA+9zyHYgPa
-rHlSSXOOEfA23mIHfW6Ufs8HO9Rs3sos1nc7iMctKyeFw1id+b5KkZDBwEdSL5L+
-eaUYY8jfnSy38sMCVTlYPmQXg9qnxWfgJBqm1K/PSQGN9LUc/I+ltqrCtY5dICqs
-ROZsoNRSJPWzE8tBqhCN+TcuHqcwqhfUU6LTFG1Ae7LkvcsqemEZaUHkv67RYtFt
-Bk/BCKUrm11VMibwlzn/E0gUVf/7UH775/acZWX26OfpRxrW8zuok/ThIT5SB6Hh
-XkMzNOSQAGE9XPyEU744jvsyE1fg2dgthBUERKIar/+3R4V+WCQ4aJjZVWDnZPcQ
-Q+HiIG7E4sj9HXL24wYe3rG+nJM+ib4A3gquCgS+Cgl213h3xH8Sro62tIvFV2Li
-V94UPY/ytObkgbhLSOPVXUVdTEZEoEDTJ34skPBCCNfbN+xIiAgNZW7RRkOMBWsV
-47KWXjicoa6XF3/+VjFVwELrSjJuSJdAgZaPSy1+L8tFLBNsez0Lgwkry4D3qzzD
-qTEDw4oDancnZny19khxSpQc3Cfc9GChz5sXYlyuVK5PPKJmBnCSi+g+qVTw0KNa
-MJI/qQ+bJXpLadn+76HLMt8sTBfWPa/Cvz9sUWDm7XNdUfVN8mHDgNF0WwxAKiSg
-lBkNlsRZqNQfOHZOs2hf
-=l9Nr
+iQIcBAEBCAAGBQJR+/0mAAoJECRx6z5ArFrDyPAQALPT2FlfXME1sfD0GJ5i+zWs
+Gi13Xcjgk6TYlYjKpsRAnJpYNzPTlhdKvDqvrsne7Jb6Kd4beX/V6sVYV+3JXjGI
+2sN222H9pO5ow9xZz121BrBrHmPbWfDR42aFBBnMWNXtkoc9eyD+Lvw0djKSC2pu
+OcrpVhRjqL263jAq9zJ/XaUZZgk+nKIKTsk++1v0CFaZgB9PNwwtCeeMpz/lM7Dd
+SLd8ST0iEI1k/VOYI5haFATqEGX/dMJ5jINMi9SHsKHQ34FIsGR2En8ashXU7dxB
+vCrrqjIvcuf/Y4d1LCrBLMnGYMD9+c+gJAsBkGXiQFldPnOgxSvBf4PC7QkSykIQ
+NuindUHsCsS1yFWWryGZxzXFGmeJ+AS96pZAskUpQWpkc2DDJm6K0qBarrWSHoPY
+LdEMec7L9+uv31Mxrv73iZ2B/Q/p42UccPQAwML+26RNhL/hN1ev3wYtpVdEqh04
+FNyESREj0ep60boyPmSh//4U0a31Up5l7fnfrLUBorgDvOXZQ5On9NkiEGOLMSR8
+TOEOAKKe1csiOcaoXlB/aMBJBuy71oKr/2UBtwVnsyz4cimZNOJYgM6sbaB8/PYH
+6uX5weGg15zOS0JgCgkzkBuuvDPNus11Hh25hF+PNbgqI1J5vEsW9i59qlZeIvQ5
+vDT1UKNzhlPTl5/JstnO
+=CrrK
 -----END PGP SIGNATURE-----
diff --git a/sys-cluster/nova/nova-2013.1.9999.ebuild b/sys-cluster/nova/nova-2013.1.9999.ebuild
new file mode 100644
index 000000000000..0c850a633469
--- /dev/null
+++ b/sys-cluster/nova/nova-2013.1.9999.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/nova/nova-2013.1.9999.ebuild,v 1.1 2013/08/02 18:39:45 prometheanfire Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1 eutils git-2
+
+DESCRIPTION="Nova is a cloud computing fabric controller (main part of an
+IaaS system). It is written in Python."
+HOMEPAGE="https://launchpad.net/nova"
+EGIT_REPO_URI="https://github.com/openstack/nova.git"
+EGIT_BRANCH="stable/grizzly"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE=""
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+RDEPEND=">=dev-python/amqplib-0.6.1[${PYTHON_USEDEP}]
+		>=dev-python/anyjson-0.2.4[${PYTHON_USEDEP}]
+		>=dev-python/cheetah-2.4.4
+		>=dev-python/sqlalchemy-0.7.8
+		<=dev-python/sqlalchemy-0.7.99
+		dev-python/boto[${PYTHON_USEDEP}]
+		>=dev-python/eventlet-0.9.17[${PYTHON_USEDEP}]
+		>=dev-python/kombu-1.0.4-r1[${PYTHON_USEDEP}]
+		>=dev-python/routes-1.12.3-r1[${PYTHON_USEDEP}]
+		=dev-python/webob-1.2.3-r1[${PYTHON_USEDEP}]
+		>=dev-python/greenlet-0.3.1[${PYTHON_USEDEP}]
+		>=dev-python/pastedeploy-1.5.0-r1[${PYTHON_USEDEP}]
+		dev-python/paste[${PYTHON_USEDEP}]
+		>=dev-python/sqlalchemy-migrate-0.7.2
+		dev-python/netaddr
+		>=dev-python/suds-0.4
+		dev-python/paramiko[${PYTHON_USEDEP}]
+		dev-python/pyasn1[${PYTHON_USEDEP}]
+		>=dev-python/Babel-0.9.6[${PYTHON_USEDEP}]
+		>=dev-python/iso8601-0.1.4[${PYTHON_USEDEP}]
+		dev-python/httplib2[${PYTHON_USEDEP}]
+		>=dev-python/setuptools-git-0.4[${PYTHON_USEDEP}]
+		>=dev-python/python-cinderclient-1.0.1[${PYTHON_USEDEP}]
+		>=dev-python/python-glanceclient-0.5.0[${PYTHON_USEDEP}]
+		<dev-python/python-glanceclient-2[${PYTHON_USEDEP}]
+		>=dev-python/python-quantumclient-2.2.0[${PYTHON_USEDEP}]
+		<=dev-python/python-quantumclient-3.0.0[${PYTHON_USEDEP}]
+		>=dev-python/python-keystoneclient-0.2.0[${PYTHON_USEDEP}]
+		>=dev-python/stevedore-0.7
+		<dev-python/websockify-0.4[${PYTHON_USEDEP}]
+		>=dev-python/oslo-config-1.1.0[${PYTHON_USEDEP}]
+		virtual/python-argparse[${PYTHON_USEDEP}]"
+
+PATCHES=(
+)
+
+python_install() {
+	distutils-r1_python_install
+	keepdir /etc/nova
+	insinto /etc/nova
+
+	newins "etc/nova/nova.conf.sample" "nova.conf"
+	doins "etc/nova/api-paste.ini"
+	doins "etc/nova/logging_sample.conf"
+	doins "etc/nova/policy.json"
+	doins "etc/nova/rootwrap.conf"
+	insinto /etc/nova/rootwrap.d
+	doins "etc/nova/rootwrap.d/api-metadata.filters"
+	doins "etc/nova/rootwrap.d/compute.filters"
+	doins "etc/nova/rootwrap.d/network.filters"
+	doins "etc/nova/rootwrap.d/baremetal-compute-ipmi.filters"
+	doins "etc/nova/rootwrap.d/baremetal-deploy-helper.filters"
+	#copy migration conf file (not coppied on install via setup.py script)
+	insinto /usr/$(get_libdir)/python2.7/site-packages/nova/db/sqlalchemy/migrate_repo/
+	doins "nova/db/sqlalchemy/migrate_repo/migrate.cfg"
+	#copy the CA cert dir (not coppied on install via setup.py script)
+	cp -R "${S}/nova/CA" "${D}/usr/$(get_libdir)/python2.7/site-packages/nova/" || die "isntalling CA files failed"
+}
diff --git a/sys-cluster/nova/nova-9999.ebuild b/sys-cluster/nova/nova-9999.ebuild
index ea025eb59098..54ae5818383c 100644
--- a/sys-cluster/nova/nova-9999.ebuild
+++ b/sys-cluster/nova/nova-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/nova/nova-9999.ebuild,v 1.3 2013/06/25 19:04:50 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/nova/nova-9999.ebuild,v 1.4 2013/08/02 18:39:45 prometheanfire Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -11,6 +11,7 @@ DESCRIPTION="Nova is a cloud computing fabric controller (main part of an
 IaaS system). It is written in Python."
 HOMEPAGE="https://launchpad.net/nova"
 EGIT_REPO_URI="https://github.com/openstack/nova.git"
+EGIT_BRANCH="master"
 
 LICENSE="Apache-2.0"
 SLOT="0"
@@ -22,32 +23,25 @@ DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
 RDEPEND=">=dev-python/amqplib-0.6.1[${PYTHON_USEDEP}]
 		>=dev-python/anyjson-0.2.4[${PYTHON_USEDEP}]
 		>=dev-python/cheetah-2.4.4
-		>=dev-python/d2to1-0.2.10[${PYTHON_USEDEP}]
-		<dev-python/d2to1-0.3[${PYTHON_USEDEP}]
 		>=dev-python/sqlalchemy-0.7.8
 		<=dev-python/sqlalchemy-0.7.99
 		dev-python/boto[${PYTHON_USEDEP}]
 		>=dev-python/eventlet-0.9.17[${PYTHON_USEDEP}]
 		>=dev-python/kombu-1.0.4-r1[${PYTHON_USEDEP}]
 		>=dev-python/routes-1.12.3-r1[${PYTHON_USEDEP}]
-		=dev-python/webob-1.2.3-r1
+		=dev-python/webob-1.2.3-r1[${PYTHON_USEDEP}]
 		>=dev-python/greenlet-0.3.1[${PYTHON_USEDEP}]
 		>=dev-python/pastedeploy-1.5.0-r1[${PYTHON_USEDEP}]
 		dev-python/paste[${PYTHON_USEDEP}]
 		>=dev-python/sqlalchemy-migrate-0.7.2
-		>=dev-python/lxml-2.3[${PYTHON_USEDEP}]
 		dev-python/netaddr
-		>=dev-python/pbr-0.5[${PYTHON_USEDEP}]
-		<dev-python/pbr-0.6[${PYTHON_USEDEP}]
-		>=dev-python/requests-1.1[${PYTHON_USEDEP}]
-		<dev-python/requests-1.2.1[${PYTHON_USEDEP}]
-		dev-python/six[${PYTHON_USEDEP}]
 		>=dev-python/suds-0.4
 		dev-python/paramiko[${PYTHON_USEDEP}]
 		dev-python/pyasn1[${PYTHON_USEDEP}]
 		>=dev-python/Babel-0.9.6[${PYTHON_USEDEP}]
 		>=dev-python/iso8601-0.1.4[${PYTHON_USEDEP}]
 		dev-python/httplib2[${PYTHON_USEDEP}]
+		>=dev-python/setuptools-git-0.4[${PYTHON_USEDEP}]
 		>=dev-python/python-cinderclient-1.0.1[${PYTHON_USEDEP}]
 		>=dev-python/python-glanceclient-0.5.0[${PYTHON_USEDEP}]
 		<dev-python/python-glanceclient-2[${PYTHON_USEDEP}]
@@ -68,10 +62,10 @@ python_install() {
 	insinto /etc/nova
 
 	newins "etc/nova/nova.conf.sample" "nova.conf"
-	newins "etc/nova/api-paste.ini" "api-paste.ini"
-	newins "etc/nova/logging_sample.conf" "logging_sample.conf"
-	newins "etc/nova/policy.json" "policy.json"
-	newins "etc/nova/rootwrap.conf" "rootwrap.conf"
+	doins "etc/nova/api-paste.ini"
+	doins "etc/nova/logging_sample.conf"
+	doins "etc/nova/policy.json"
+	doins "etc/nova/rootwrap.conf"
 	insinto /etc/nova/rootwrap.d
 	doins "etc/nova/rootwrap.d/api-metadata.filters"
 	doins "etc/nova/rootwrap.d/compute.filters"