bump for release
authorMatt Thode <prometheanfire@gentoo.org>
Tue, 9 Dec 2014 01:32:21 +0000 (01:32 +0000)
committerMatt Thode <prometheanfire@gentoo.org>
Tue, 9 Dec 2014 01:32:21 +0000 (01:32 +0000)
Package-Manager: portage-2.2.8-r2/cvs/Linux x86_64
Manifest-Sign-Key: 0x2471EB3E40AC5AC3

sys-cluster/cinder/ChangeLog
sys-cluster/cinder/Manifest
sys-cluster/cinder/cinder-2014.2.1.ebuild [new file with mode: 0644]
sys-cluster/cinder/cinder-2014.2.9999.ebuild

index 1d2998de7d4e2ce88f5b1fb450573b38055aabca..af1283d754ef0bb21a49c04857c4d61282b12082 100644 (file)
@@ -1,6 +1,12 @@
 # ChangeLog for sys-cluster/cinder
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/cinder/ChangeLog,v 1.47 2014/11/21 00:11:13 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/cinder/ChangeLog,v 1.48 2014/12/09 01:32:14 prometheanfire Exp $
+
+*cinder-2014.2.1 (09 Dec 2014)
+
+  09 Dec 2014; Matthew Thode <prometheanfire@gentoo.org>
+  +cinder-2014.2.1.ebuild, cinder-2014.2.9999.ebuild:
+  bump for release
 
   21 Nov 2014; Matthew Thode <prometheanfire@gentoo.org>
   cinder-2014.2.9999.ebuild, cinder-2014.2.ebuild:
index c607a95c0f90a16b6c20567ab30e5cb51b6927fc..01ebfcfe5ebfb7679073918ab6a731f52c777c94 100644 (file)
@@ -7,28 +7,30 @@ AUX cinder-sudoers 86 SHA256 a2c2b8f50b21deaceaa2184c00725492cd96db44736cb3fe4bf
 AUX cinder.initd 744 SHA256 187237abfa1bef35136a95d0e2addffdf2fc3cff0e7c4f05e3523c31a16d377d SHA512 473aa626026adbcc132753f620702fcbe1bedef2b122cf212994b3bc453c27d56a3be1bec7229944f9be0478776001dba80f7cb7498cb46f314d2ee06a39f5f5 WHIRLPOOL 3b1667b2a1e089ecef68d9fa5315266d486c462820ea2304c76a5954c0b718983293de9c6a955695ae4fa7d9faedf36490d3ceda49775b4b81a441f67b4875d7
 AUX cinder.sudoersd 86 SHA256 a2c2b8f50b21deaceaa2184c00725492cd96db44736cb3fe4bf4aaecc0805b6f SHA512 c158be54e721abc6916db2e710092ca75aac65ac88b19849ccd0f3ebbb7c8879aab6b73aba36537e806abd5b8b5e8fbc24fca79d00015d3308198d5270e51fe1 WHIRLPOOL 52642c53b34b089fb9c82c1307c02cd611ea834492a2919a12902bc974a146348a3dcde3db6058eb417395acaff8131398e70fbfa74c7325abcd695102f372c3
 DIST cinder-2014.1.3.tar.gz 4636363 SHA256 e514553ee7c3421a112ae85e534c48a9490c3c89185db38e78d1a4339f52a43f SHA512 905ce85b93744e019a83d849af68a8dea68447cc4cffd99791874b8f6f57f0e88bc7e19bd7ed8f38309f044ec6a880c6567ca081475a06cf993a11c48fc9e9de WHIRLPOOL fd745f89054513fbffeb48dea15cfefaf31cf4549d593390ec795ed4ee2eb71e49623d73db9abc5941a958b637c565e85a3845d598f0d904ca59c6407a314857
+DIST cinder-2014.2.1.tar.gz 1785395 SHA256 b1370c9349a1a6329b1f3fa1ae21cc3bfc35d665c978452d6bb4226c9b240d73 SHA512 04c7524e6e4ff24a83eeed3786c0ac830363d8c8538aa943e475ac9893d4377dde2dc68b6c99a2a4d81a8f83e42b817a38ab837c560060ce9a6aa285b0935223 WHIRLPOOL f64407703d590ee74ad3801a7f22e89fa786db44e1baaa7cc6ce93689bb1de9cabe372cd8510225017ed1777a0fcfe2358bd1193f9d5ba186b350197026b60da
 DIST cinder-2014.2.tar.gz 1780461 SHA256 7a96f74732b2f18a564ce477b602c83f06a3e2ae1ddc4565929f75e33f23de02 SHA512 55b26a316b3315bfd3ba41fe0eb1b7d6593ea5101e7011ea41a746326d17a78c671eb2686965e2e6839d0a5683563e7f5afb26a2f75ec19b1351da6dbe0fb3dd WHIRLPOOL 282904d7290d403794eacbd2f41971b50eed1e11dafda996c78a21a80db44e945929f8f549e031de23eab31defe8b163688796ed2050fa3f30dd17546d3d13d2
 EBUILD cinder-2014.1.3.ebuild 5364 SHA256 e0620c425125d7580fc55ad9b657e7b689d3790b7c552f683775127031f9fa9b SHA512 cbd71509fc2a6970e4155f565ca46494cab277af3650d4adb9b8840d0231475ea2b2c65c1f97cf753ac9e9bb11b59c55a71c67fa3e50f009a01e8d7d18c8604b WHIRLPOOL e0449d002ac2d98d05e8ad2e1c46a63423e6181b4478fe50f6df947ea0e2a74001379ac42e0f2c49ff8e0a709aba5d3db58f56e0853842f4ee42f42e07f2732a
 EBUILD cinder-2014.1.9999.ebuild 5374 SHA256 4ca1de03ebf7cd09b69519f0a570d4f9a880950612e7f7ddb0a00f1a282439b9 SHA512 c2abf18cdbef4a547c7819dd032130f527962c8cf7c62b3adb7fd217f1b2cb3b87bc37199359691c9639d0cdb5075088c626ba3587e10a15b8d3af4968bd1e87 WHIRLPOOL fe22d473c720d2d233050fc9cc400fb0874d295363e869767e2ade10db7990ec6ad5c2f9abe7c1af03fca78a0d9c5e0cfbef009fb9254f20e14345eed2f09612
-EBUILD cinder-2014.2.9999.ebuild 5742 SHA256 85214acc7b852116ce2677c2677bdcb73c3d961099a8463ddc6354ede0787671 SHA512 fb0b7d960d45cb9d0f9c2056291752dabde761d47537bd6472a119a82ecd0d11d1283ec184f738ba5cbf143da9614074bc6817c6606af81119c3c269b77c8030 WHIRLPOOL 9c64116b2d47c6f94e0b02d3f754383382aeac5b6a9e5c646b11c74ef908c3f4fe6e9d118cd6e52c6f49f3f7b0940aacd6853771a77944bd99a1f0a76c221755
+EBUILD cinder-2014.2.1.ebuild 5896 SHA256 6e1e2faf6fb5eeb8a30a8b699a9112f1fc23ac51e273cefe8f8a73fb7ec701e5 SHA512 4d57b4693a795690ea08f3a5721412af58649c4849085c4eaed195fdfd5e46b00180fc55801ad4e06667a3c48c0e96423c66f6838b7d3957eff9b1b587bed4f8 WHIRLPOOL 5fb8dd1ba7aaf7fd8c698e9bfd7d9600b4c7c4b2a83481e19138cbec40e635f32ec1c5e1eff21ecd6a21c00bb3fac7002f595c80f809c115e1665b46401cc3f4
+EBUILD cinder-2014.2.9999.ebuild 5906 SHA256 96bc25e68cd2d6ccb330b8ccecdeefc8069ac5aa415dbe5a31bcf215eda9c589 SHA512 bca4bdf1a8b9fd58cd94bfa5e5ba95c6cc5599a0e97c96403f3505f4bd291d53e34332afa56e9f8453f56ad8f5564777db1c5db3ae20a6ba9cc9525315d80bef WHIRLPOOL d826ade9cb2404d77e84ad0ffaeb3cc6e47eca546efea6c27f020002c3ec4764b40e1b77a110f4384fdedb895a3163d6e6a0310bc558231a77490634f01c8bc0
 EBUILD cinder-2014.2.ebuild 5730 SHA256 eaec6c510e94d3adf96ffad549f3a8219aa4850a4e8e73405e92bc5bea170a9d SHA512 0a828213be9980f9b06a231e26a3bd62f2423876143f0ac66bae83bcf10fe09f5ab8e50870440322374089da5d542b9c3cfec6fb4763d6265bd5e52a619eae6c WHIRLPOOL 87782775fb6c2d09267b84cfb5513f5e1fa93171cca6e6c9e276273ec35273adc32f24072cf58947811aaa6d4893ce3f8c6092c44b5c76aeb75196f6551263d9
 EBUILD cinder-9999.ebuild 5056 SHA256 5389ad31eaad4f91ec8e471334a2f39d46ad782dc4b435ce9d62461374f2387f SHA512 72fa172d75d72c392770232b56344c048f3ab0c07702a912b18c5ac27bcc9ed24247554a68203e8c47dc508b49bac36bf47a242f71329fde8edb848d2a15fd18 WHIRLPOOL 6d7518d72bb3bb50d207e3a4ca7cfcafe5384a8a41e0b185d6a63cb3f8116975157abc094e5f89b46d39d6cf169bf4a444f8588cb60e0f5236ca5380a40c154b
-MISC ChangeLog 8639 SHA256 4184ec5d0422760d03fea719998710a4846a57c39648221cefb8534e5aa7048d SHA512 0fdb3c374d754071065bc59a8b110affcd47ff6bcffe351ee6a41703593cee14162eac82a5ef15921652eacab498664989a5299078b2f426930704cf1b514eb6 WHIRLPOOL 2ee7d0875501c1d25105aa9a1deadb26505ea1cf246ee56e04cf2357c3100ec650feeef530ec43f9bb075572bcbf628480d4797f3fdec5a0dc4357c56fd57f10
+MISC ChangeLog 8802 SHA256 474813cace947038be91c9b5425efb21bea4a4d09b5e2fefd159b8cc8fc74634 SHA512 48ffdc49f32bcdbcde3792e93e8a0cabee687f73497d0dbcf463b79308fb3425db06fda061f7666a5f36540d4edcc1c95c51fc04fc736e80652f064c350e8aed WHIRLPOOL e570407a3bd5b82bd4d67e4b6570eb33d0ebbe867d1d3a2e2759b05fa054e3d2fcc08ce219e766bd4d967dcb098a48f4d2a649cc350549aad20a7b3591eae38b
 MISC metadata.xml 921 SHA256 33d8d60945d6b793447e7a377cc35069a01dab1c874c0dac417772e585fdb2ee SHA512 e05cc2f145099d8b9bac3f4b4298b6ae628ad328b4602181020828d39aa74ced949487388daef52c0cb2b66ea3e6c64662fc1d3dd0a0a6b2b2b513afb6fc7b41 WHIRLPOOL 7c97874b37719acdcc222ce15eab14fbbdbea628038e9ab56bc740a3476265d8cfa7108c94c5809eb995a5aca2ad596ef51d8340b0202c3d1a5ea937ce6d5dc7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJUboNTAAoJECRx6z5ArFrDsF8QAK/gRk8ra1dplAEEOkeoF0Lt
-gaxI1ql944bv/4xy7GbtNJaW8d0eK6ZW//pv1HwO8MQltOtX9JQ6TXtjhL9Z14q/
-QWxkhjHAFN05mux/6emTeHJA+wulrrHBcyWJ4AeP0+nbkCu+tstK1CS/TZKflfbC
-brpT+nAuhAvRDL53utj7A9OSI9JLMPkK8hHlVCskE7UM+zFii4Z9RI4R1lzowHOt
-pSiIN60LFoFQXVmOtIeT7Zk6gJkmdaycQaw/hQ/q6IFOlEB8cm+JcXLlIWXe8D6v
-YW0ifxMyiIdCu1xwGxTsjxXYLWH84bbEavlsfDN04TMHvYDyuRR5mxpKu8KWfGWa
-Pgvd5G5NuRflBA6NbAZnu1SZIWFUkkUxoV/Vfu4O/47z0nUBhUUbeNgYC2+/L9ro
-dibpLo/dMInTSSzamhWXlgOrNHf2ejLiPU6Ny78DeuVAvi7OFnRR77wX/HnW+V/v
-VEwBfBIPqfgntEMtZRIIEgM1/6lS1Os5N8ArwdtloNB8AI703bF8WHK8OdsTquG6
-DIX/14I2FW8ITHFd12HJ42DOBS0lQLVCMzoOLXInoN1JS1rPDKrMFxblM2iInk+k
-X64XS0g3bOANBgXDyydHq/de7/kIdpnjr4qObmEbDkb5E8Aj9H0znkyMXRlxOzC7
-1tcDHrdyjpmO3dBApdy5
-=6xz/
+iQIcBAEBCAAGBQJUhlFdAAoJECRx6z5ArFrD+vAP/0MJcmCK/K31o65AZVXMASqI
+joVNnZit+ioQ5n7nGD0LcQIMmrWmYE/T/aKpQSZsmlaTh1du6rJHxLReaw670C9q
+P+PkCZy7x9awXboTsSxCEOzFA+YBA8bv4aNYG+yHCTdKGLO939BwcXzruE2YGCbb
+wRhCC4lP+dTspbDkirG7HXvpGAC8NUl3oIQolfTQEIGgEXjhuJ89PBDo0YJ70yMz
+RV0bNaRkut3LLldXlcb64iIrZXPpswCvyUM3aJ5uG1s6wJSjw6c/zeM0WLzhUhil
+Ngo0syfbK8gI0Te6fFB82E5bzsqyiiduoy3/5EbWTaraMljETKMAjwGBEpz70HoF
+qireTnbAFHuJlSBsRcn7H3E7zowhbX3UvTPj3HU86D2pZ2vn1XtZooHtJXYQDLPe
+1oDtCbCqwmcSws12F7e6y1kiAqc2WoaRxnwJvAkmubxezFTB3bLtIwEBBobYZyVd
+eE4qVQD5ulwVn/HgRO01sIMR/Az2LQQOsBciNsRrmA3p18Qk+iUUjth9HFTaeIdA
+BfwdBatImd4/Bxmig4VwxC802BQS4qHHkvbBrfez4cjdzo9AgL1nHkCo9K2S7skf
+CzUc8dLYBWe57VADSSL/+q/H08P7ChzcPNxQqt+FeVQvmW1iDinD0C7fiUuu249T
+c7enCnq4jY0+ZPbSUHql
+=a82r
 -----END PGP SIGNATURE-----
diff --git a/sys-cluster/cinder/cinder-2014.2.1.ebuild b/sys-cluster/cinder/cinder-2014.2.1.ebuild
new file mode 100644 (file)
index 0000000..640bd9c
--- /dev/null
@@ -0,0 +1,172 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/cinder/cinder-2014.2.1.ebuild,v 1.1 2014/12/09 01:32:14 prometheanfire Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1 eutils linux-info user
+
+DESCRIPTION="Cinder is the OpenStack Block storage service, a spin out of nova-volumes"
+HOMEPAGE="https://launchpad.net/cinder"
+SRC_URI="http://launchpad.net/${PN}/juno/${PV}/+download/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+api +scheduler +volume iscsi lvm mysql postgres sqlite test"
+REQUIRED_USE="|| ( mysql postgres sqlite )"
+
+#sudo is a build dep because I want the sudoers.d directory to exist, lazy.
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+               >=dev-python/pbr-0.8[${PYTHON_USEDEP}]
+               <dev-python/pbr-1.0[${PYTHON_USEDEP}]
+               app-admin/sudo
+               test? ( >=dev-python/hacking-0.9.2[${PYTHON_USEDEP}]
+                               <dev-python/hacking-0.10[${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/mox-0.5.3[${PYTHON_USEDEP}]
+                               mysql? ( dev-python/mysql-python[${PYTHON_USEDEP}] )
+                               postgres? ( dev-python/psycopg[${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/subunit-0.0.18[${PYTHON_USEDEP}]
+                               >=dev-python/testtools-0.9.34[${PYTHON_USEDEP}]
+                               !~dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
+                               >=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
+                               >=dev-python/oslo-sphinx-2.2.0[${PYTHON_USEDEP}] )"
+
+RDEPEND="
+       >=dev-python/anyjson-0.3.3[${PYTHON_USEDEP}]
+       >=dev-python/Babel-1.3[${PYTHON_USEDEP}]
+       >=dev-python/eventlet-0.15.1[${PYTHON_USEDEP}]
+       >=dev-python/greenlet-0.3.2[${PYTHON_USEDEP}]
+       >=dev-python/iso8601-0.1.9[${PYTHON_USEDEP}]
+       >=dev-python/keystonemiddleware-1.0.0[${PYTHON_USEDEP}]
+       >=dev-python/kombu-2.5.0[${PYTHON_USEDEP}]
+       >=dev-python/lxml-2.3[${PYTHON_USEDEP}]
+       >=dev-python/netaddr-0.7.12[${PYTHON_USEDEP}]
+       >=dev-python/oslo-config-1.4.0[${PYTHON_USEDEP}]
+       >=dev-python/oslo-db-1.0.0[${PYTHON_USEDEP}]
+       >=dev-python/oslo-messaging-1.4.0[${PYTHON_USEDEP}]
+       !~dev-python/oslo-messaging-1.5.0[${PYTHON_USEDEP}]
+       >=dev-python/oslo-rootwrap-1.3.0[${PYTHON_USEDEP}]
+       >=dev-python/osprofiler-0.3.0[${PYTHON_USEDEP}]
+       >=dev-python/paramiko-1.13.0[${PYTHON_USEDEP}]
+       dev-python/paste[${PYTHON_USEDEP}]
+       >=dev-python/pastedeploy-1.5.0[${PYTHON_USEDEP}]
+       >=dev-python/python-barbicanclient-2.1.0[${PYTHON_USEDEP}]
+       !~dev-python/python-barbicanclient-3.0.0[${PYTHON_USEDEP}]
+       >=dev-python/python-glanceclient-0.14.0[${PYTHON_USEDEP}]
+       >=dev-python/python-novaclient-2.18.0[${PYTHON_USEDEP}]
+       >=dev-python/python-swiftclient-2.2.0[${PYTHON_USEDEP}]
+       >=dev-python/requests-1.2.1[${PYTHON_USEDEP}]
+       !~dev-python/requests-2.4.0[${PYTHON_USEDEP}]
+       >=dev-python/routes-1.12.3[${PYTHON_USEDEP}]
+       !~dev-python/routes-2.0[${PYTHON_USEDEP}]
+       >=dev-python/taskflow-0.4[${PYTHON_USEDEP}]
+       >=dev-python/rtslib-fb-2.1.39[${PYTHON_USEDEP}]
+       >=dev-python/six-1.7.0[${PYTHON_USEDEP}]
+       sqlite? (
+               || (
+                       (
+                               >=dev-python/sqlalchemy-0.8.4[sqlite,${PYTHON_USEDEP}]
+                               <=dev-python/sqlalchemy-0.8.99[sqlite,${PYTHON_USEDEP}]
+                       )
+                       (
+                               >=dev-python/sqlalchemy-0.9.7[sqlite,${PYTHON_USEDEP}]
+                               <=dev-python/sqlalchemy-0.9.99[sqlite,${PYTHON_USEDEP}]
+                       )
+               )
+       )
+       mysql? (
+               dev-python/mysql-python
+               || (
+                       (
+                               >=dev-python/sqlalchemy-0.8.4[${PYTHON_USEDEP}]
+                               <=dev-python/sqlalchemy-0.8.99[${PYTHON_USEDEP}]
+                       )
+                       (
+                               >=dev-python/sqlalchemy-0.9.7[${PYTHON_USEDEP}]
+                               <=dev-python/sqlalchemy-0.9.99[${PYTHON_USEDEP}]
+                       )
+               )
+       )
+       postgres? (
+               dev-python/psycopg:2
+               || (
+                       (
+                               >=dev-python/sqlalchemy-0.8.4[${PYTHON_USEDEP}]
+                               <=dev-python/sqlalchemy-0.8.99[${PYTHON_USEDEP}]
+                       )
+                       (
+                               >=dev-python/sqlalchemy-0.9.7[${PYTHON_USEDEP}]
+                               <=dev-python/sqlalchemy-0.9.99[${PYTHON_USEDEP}]
+                       )
+               )
+       )
+       >=dev-python/sqlalchemy-migrate-0.9.1[${PYTHON_USEDEP}]
+       !~dev-python/sqlalchemy-migrate-0.9.2[${PYTHON_USEDEP}]
+       >=dev-python/stevedore-1.0.0[${PYTHON_USEDEP}]
+       >=dev-python/suds-0.4[${PYTHON_USEDEP}]
+       >=dev-python/webob-1.2.3-r1[${PYTHON_USEDEP}]
+       >=dev-python/oslo-i18n-1.0.0[${PYTHON_USEDEP}]
+       iscsi? (
+               || ( >=sys-block/iscsitarget-1.4.20.2_p20130821 sys-block/tgt )
+               sys-block/open-iscsi )
+       lvm? ( sys-fs/lvm2 )
+       sys-fs/sysfsutils
+"
+
+PATCHES=( )
+
+pkg_setup() {
+       linux-info_pkg_setup
+       CONFIG_CHECK_MODULES="ISCSI_TCP"
+       if linux_config_exists; then
+               for module in ${CONFIG_CHECK_MODULES}; do
+                       linux_chkconfig_present ${module} || ewarn "${module} needs to be built as module (builtin doesn't work)"
+               done
+       fi
+       enewgroup cinder
+       enewuser cinder -1 -1 /var/lib/cinder cinder
+}
+
+#python_compile_all() { leave for next attempt
+#      use doc && emake -C doc html
+#}
+
+python_test() {
+       # Let's track progress of this # https://bugs.launchpad.net/swift/+bug/1249727  
+       nosetests -I test_wsgi.py cinder/tests/ || die "tests failed under python2.7"
+}
+
+python_install() {
+       distutils-r1_python_install
+       keepdir /etc/cinder
+       dodir /etc/cinder/rootwrap.d
+
+       for svc in api scheduler volume; do
+               newinitd "${FILESDIR}/cinder.initd" cinder-${svc}
+       done
+
+       insinto /etc/cinder
+       newins "${S}/etc/cinder/cinder.conf.sample" "cinder.conf"
+       newins "${S}/etc/cinder/api-paste.ini" "api-paste.ini"
+       newins "${S}/etc/cinder/logging_sample.conf" "logging_sample.conf"
+       newins "${S}/etc/cinder/policy.json" "policy.json"
+       newins "${S}/etc/cinder/rootwrap.conf" "rootwrap.conf"
+       insinto /etc/cinder/rootwrap.d
+       newins "${S}/etc/cinder/rootwrap.d/volume.filters" "volume.filters"
+
+       dodir /var/log/cinder
+       fowners cinder:cinder /var/log/cinder
+
+       #add sudoers definitions for user nova
+       insinto /etc/sudoers.d/
+       insopts -m 0440 -o root -g root
+       newins "${FILESDIR}/cinder.sudoersd" cinder
+}
index e1a7d596736c1295b6f1aa88a1f613e522acd73c..eb1fe20e22fc1f1023a17bc09e9d29e8405aa9f4 100644 (file)
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/cinder/cinder-2014.2.9999.ebuild,v 1.2 2014/11/21 00:11:13 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/cinder/cinder-2014.2.9999.ebuild,v 1.3 2014/12/09 01:32:14 prometheanfire Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -36,6 +36,7 @@ DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
                                <dev-python/sphinx-1.3[${PYTHON_USEDEP}]
                                >=dev-python/subunit-0.0.18[${PYTHON_USEDEP}]
                                >=dev-python/testtools-0.9.34[${PYTHON_USEDEP}]
+                               !~dev-python/testtools-1.4.0[${PYTHON_USEDEP}]
                                >=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
                                >=dev-python/oslo-sphinx-2.2.0[${PYTHON_USEDEP}] )"
 
@@ -52,12 +53,14 @@ RDEPEND="
        >=dev-python/oslo-config-1.4.0[${PYTHON_USEDEP}]
        >=dev-python/oslo-db-1.0.0[${PYTHON_USEDEP}]
        >=dev-python/oslo-messaging-1.4.0[${PYTHON_USEDEP}]
+       !~dev-python/oslo-messaging-1.5.0[${PYTHON_USEDEP}]
        >=dev-python/oslo-rootwrap-1.3.0[${PYTHON_USEDEP}]
        >=dev-python/osprofiler-0.3.0[${PYTHON_USEDEP}]
        >=dev-python/paramiko-1.13.0[${PYTHON_USEDEP}]
        dev-python/paste[${PYTHON_USEDEP}]
        >=dev-python/pastedeploy-1.5.0[${PYTHON_USEDEP}]
        >=dev-python/python-barbicanclient-2.1.0[${PYTHON_USEDEP}]
+       !~dev-python/python-barbicanclient-3.0.0[${PYTHON_USEDEP}]
        >=dev-python/python-glanceclient-0.14.0[${PYTHON_USEDEP}]
        >=dev-python/python-novaclient-2.18.0[${PYTHON_USEDEP}]
        >=dev-python/python-swiftclient-2.2.0[${PYTHON_USEDEP}]