bup
authorMatt Thode <prometheanfire@gentoo.org>
Tue, 18 Nov 2014 23:17:20 +0000 (23:17 +0000)
committerMatt Thode <prometheanfire@gentoo.org>
Tue, 18 Nov 2014 23:17:20 +0000 (23:17 +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.9999.ebuild [new file with mode: 0644]
sys-cluster/cinder/cinder-2014.2.ebuild [new file with mode: 0644]

index 332e6284ca39e2c5d88c043af68c79d85cc61abb..e83ea7b59960554e032e347ded57f082a16a1323 100644 (file)
@@ -1,6 +1,13 @@
 # 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.45 2014/10/11 23:11:57 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/cinder/ChangeLog,v 1.46 2014/11/18 23:17:13 prometheanfire Exp $
+
+*cinder-2014.2 (18 Nov 2014)
+*cinder-2014.2.9999 (18 Nov 2014)
+
+  18 Nov 2014; Matthew Thode <prometheanfire@gentoo.org>
+  +cinder-2014.2.9999.ebuild, +cinder-2014.2.ebuild:
+  bup
 
   11 Oct 2014; Matthew Thode <prometheanfire@gentoo.org> cinder-2014.1.3.ebuild,
   cinder-2014.1.9999.ebuild:
index e5d3c1e57a8b043e1e59eb07a812a76599ae0fff..ac8420dd85cfa28ce4b720f73810da734fa0a970 100644 (file)
@@ -7,25 +7,28 @@ 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.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 5625 SHA256 38a39a3deff95d2ee0812ac4d9b2516bf339c0bc2a8853b1105e4754df18413e SHA512 6a340d09f5f8f17af99cd846295b8996ae29227b24ff8bacef065f61abb952c2469bc1eadb20991b3f923e04cee65af4b6bcdae72337e8b52ffe7d62bccc88b0 WHIRLPOOL 3348b4669b739d2dd069e2d42bd2d7d7f8c3a3e506960b4927fd9a60cfbd80588d6290d08e888acec324015331a17d6dce1b3b56912d04c78eb619641b0f82f1
+EBUILD cinder-2014.2.ebuild 5613 SHA256 a92890b4291d437d9434273cf7696f7cffece3f2552b9ce1c7d57e9066908501 SHA512 6e9b00e5c2c9713e3ba2fccc71c9fece39a2b82179ab4f06cb3a97f24d27719fd3c2c668ceeed570ca47dbc5fe6dd3a0c732806bfa6498acde1a2e5cf1d2a0b3 WHIRLPOOL 3967800ed4179605eeeebd5d9ba06fb5a75cf9010b23e4e6201e835977748abd0ba1701ab30a56247a84aa6f59c55591fa01c447af750f2af139a1a885c334f2
 EBUILD cinder-9999.ebuild 5056 SHA256 5389ad31eaad4f91ec8e471334a2f39d46ad782dc4b435ce9d62461374f2387f SHA512 72fa172d75d72c392770232b56344c048f3ab0c07702a912b18c5ac27bcc9ed24247554a68203e8c47dc508b49bac36bf47a242f71329fde8edb848d2a15fd18 WHIRLPOOL 6d7518d72bb3bb50d207e3a4ca7cfcafe5384a8a41e0b185d6a63cb3f8116975157abc094e5f89b46d39d6cf169bf4a444f8588cb60e0f5236ca5380a40c154b
-MISC ChangeLog 8324 SHA256 34c97bdb5463e3fc6ce60cd44b40e1ae12d434d2265893ed57b7712dd08e3468 SHA512 50d7cc2627ea4d8903ec8254b7b86d3dd35ebda9f92e11970f39b897f1d24363a4f076c11ce70dbf5b7fc7f1a583036abfec69e5e04a96f94f5ed8760151d993 WHIRLPOOL cf2db30705cbc61ab9a1bd0afc93dd2ab7d106400b46ee6813da0b8a17c27192b3797039705a1734fd686d61f63b03fca64949447a68c046c03c17845ea981bf
+MISC ChangeLog 8505 SHA256 53bce1c35c719959f2ad871c464a40c3f28340543c502941a9e22dca1fd2c911 SHA512 8c92181286d1e7a4f3235a2defc020e6d0e8caf14e8013299854ba4dc451dd2a88470a1232449bb3d9b5f1c61eeb507748d92f8c7112fa3a00c7024e5c0b668b WHIRLPOOL 70f10a8fd9d48e73d1e29344bb46bd9d868ba24fe015248f012d0b9ae137fb5e421193fb97dea039c30ba3766f850c0242be9a273ffd9d64e029ffa78412c5e7
 MISC metadata.xml 921 SHA256 33d8d60945d6b793447e7a377cc35069a01dab1c874c0dac417772e585fdb2ee SHA512 e05cc2f145099d8b9bac3f4b4298b6ae628ad328b4602181020828d39aa74ced949487388daef52c0cb2b66ea3e6c64662fc1d3dd0a0a6b2b2b513afb6fc7b41 WHIRLPOOL 7c97874b37719acdcc222ce15eab14fbbdbea628038e9ab56bc740a3476265d8cfa7108c94c5809eb995a5aca2ad596ef51d8340b0202c3d1a5ea937ce6d5dc7
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJUObldAAoJECRx6z5ArFrDLtoP/1+1zZDMkKKS5Cw3Ps1e/s5n
-2A519D6XnCW7lYAPX7FYd/yA1oFKXtrEcVjVzyixU32Aa3dkA4OKPWD1gfI/zmSb
-HqCMTvMucmUwAN/9GB6mMF0lnegihLQRaaULcRRXk50nrfAHZJ02jlKn3slzr2Xf
-4D+c8q3VemKsEAgmbapOlai5I4w+zyAAyw5cFVQYw9MsQHs3EzZWe1HnIdkl01sO
-0OduMML7Pn/S66XwmxT2UM9xkQWoyXRwNHEduiU41LH7678dqI+0W08yNLgt8/Fk
-LwOF9Fca33lqYDCaO2RWt+EkqM6fenF3mfZZYjpGMhZtCGloNzIxZx9hTf4Jvf9x
-6wFB06QYaTEfbUOkawu1gkdPPiM28kns1KBy9AhvyRt7I/eR+cNy6Skz3mTveHF8
-xDwaZQtKi0voTomS++2WXJWvmevkLuoqVP+arkC5IaxlGHSEdFJNTgK+icUHYqU2
-CFdLADf/fWOHxi+p5F0xPt1FkdQExsQ4NvHcFjbCtPMGb9PCUX2bxDyskcHQgG1C
-UjG7HQYP6qIX9wXwZ79WPwxqucuFwhZAiLrt79VG2jD7dnZmZTd/A5lhfEhasslm
-Qk2ABfpVJAZUR8ZHZveUBP4j+gL9HOwjntYb8fNSGqG4FLkblcLOY7JGFX89jhMc
-CpM8RXBek0bS99T1HuP/
-=09mB
+iQIcBAEBCAAGBQJUa9OpAAoJECRx6z5ArFrDB7oP/20h5ic+5AZoqs3y6BROVktv
+RDs8upeTS2MH3HA6+l+rLOJKkPYfCC4X5fheOELsjEB5OGo5aF+xfQRQRreGr0Rs
+0dwxLsKwnaT0A7p5kPrYH7cp9+Fhvw7l8kl4vPpJTCsSZRzUZ8mngoskRYQVHOnh
+FsxqOzTWyJjL6lVVUHK6yARGI5JR8pqfYBP0+UR7WHBZ94uyAuo9JlLsTz0MdI4I
+bHsCTSYtJ3H7ae5JKLBAo2j/kEjFz5oTbxXEt6J1XyvdUBtOS86oDnYokswOVdhL
+n1u+cwshJ6DxybABW5rQcNSbdE4QpLF39QZKlU1NJESbaGiFghpXVs+IMeIFPzHx
+Q1qv9FnRCIIAPORck/Uso4aXQBSg9wCmHdl+0pOND+IvRI1aLJyLNn3LoQmGqDGy
+kRCnJAZrPg/TgjbKUQc1eWc3F9htuLwpD3k3XqOGy8hnTqDyOOBURgDyc5LL1m8i
+f++y2CE3C5JLGoNyba42x1lVQA/P+fAL5AZ19YpEBIXeKSUXpRHtg4WGQW4pHw34
+nqW0IXrNz05MZObExsVan/TkYUA1p+NwGhxz5nyKIMra298GUcJ7mslBiOrg5MEP
+ZomfcQYWOikBGOGHgUuYPBHdobS7FBdzC+SdMeRi34J2xbGI6lj1Ie6U9d1SqiiJ
+EwpO1ikFgTaAaZwq3gTg
+=dg7q
 -----END PGP SIGNATURE-----
diff --git a/sys-cluster/cinder/cinder-2014.2.9999.ebuild b/sys-cluster/cinder/cinder-2014.2.9999.ebuild
new file mode 100644 (file)
index 0000000..9933c0f
--- /dev/null
@@ -0,0 +1,152 @@
+# 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.1 2014/11/18 23:17:13 prometheanfire Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1 eutils git-2 linux-info user
+
+DESCRIPTION="Cinder is the OpenStack Block storage service, a spin out of nova-volumes"
+HOMEPAGE="https://launchpad.net/cinder"
+EGIT_REPO_URI="https://github.com/openstack/cinder.git"
+EGIT_BRANCH="stable/juno"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS=""
+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/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-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-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
+}
diff --git a/sys-cluster/cinder/cinder-2014.2.ebuild b/sys-cluster/cinder/cinder-2014.2.ebuild
new file mode 100644 (file)
index 0000000..fa08f1f
--- /dev/null
@@ -0,0 +1,151 @@
+# 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.ebuild,v 1.1 2014/11/18 23:17:13 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/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-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-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
+}