bup and update of live ebuild deps

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

4 files changed, 221 insertions, 12 deletions

diff --git a/sys-cluster/cinder/ChangeLog b/sys-cluster/cinder/ChangeLog
index 597af7b2b920..b7e434c241ec 100644
--- a/sys-cluster/cinder/ChangeLog
+++ b/sys-cluster/cinder/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-cluster/cinder
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/cinder/ChangeLog,v 1.59 2015/07/29 17:47:58 zlogene Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/cinder/ChangeLog,v 1.60 2015/07/29 23:38:30 prometheanfire Exp $
+
+*cinder-2015.1.1 (29 Jul 2015)
+
+  29 Jul 2015; Matthew Thode <prometheanfire@gentoo.org>
+  +cinder-2015.1.1.ebuild, cinder-2015.1.9999.ebuild:
+  bup and update of live ebuild deps
 
   29 Jul 2015; Mikle Kolyada <zlogene@gentoo.org> cinder-2015.1.0-r1.ebuild:
   x86 stable wrt bug #554284
diff --git a/sys-cluster/cinder/Manifest b/sys-cluster/cinder/Manifest
index b710ee711b90..1634c6d560a4 100644
--- a/sys-cluster/cinder/Manifest
+++ b/sys-cluster/cinder/Manifest
@@ -11,20 +11,29 @@ AUX cinder.sudoersd 86 SHA256 a2c2b8f50b21deaceaa2184c00725492cd96db44736cb3fe4b
 DIST cinder-2014.2.2.tar.gz 1792693 SHA256 2c779bf9d208163af6c425da9043bbdcb345cebc5c118198482b94062862a117 SHA512 69edbbafb23c2387e48c42340cd940d85e816bef4836f86e1112f20d14b46ec39daf44aa5621db64a469349314b174c4cb894b1bc21694ab8387e2122bb62f2a WHIRLPOOL 5352ca76344b553036e75bf3753fad603b1c46c220b973838b0f0e11d81339ab5a5ba1a0d9bf7806ce97e906bfdbf218414ad7d60e71d76bca6f37e13da33ff7
 DIST cinder-2014.2.3.tar.gz 1787308 SHA256 1112da6c28b92fe6bab1ab493b5a99d8695e78272d0c1d20c1793cc9c5a0243a SHA512 2f5b00a87da50e2f5b3acc1a05e1890542834431c406d2450631b41df05fcdd8591b625c58291441a929c731b274093e034365cf599a54f2a79334a3b48143a2 WHIRLPOOL f67b73f96a923369e5d3dbfa09b3a6a858c1f85232505e99e9cdf72ce28b3a87fd07193a4fabda11cfdc1450ab44d7de9cc4aa0ac9af89a96179dd63a0daf4c2
 DIST cinder-2015.1.0.tar.gz 2060773 SHA256 d89d588f35ce66dc7af6e9d63ebb9b3a929670db90ed2ad43d129f32928a4270 SHA512 9dddab335dae0660a59ea80b2579bca16c0cc6e5220f5f8d150f239b026fdbf085c55383d44833da5ea21fb554d9ed6f0700d503322e5467a3c6959cfcb3bd93 WHIRLPOOL 6383b7482587eb1bb298a9b6650f75225a306fe2e398a6377416f182fdc8a1614e4b0a3847bf21cb31454ad3b3c7cb87884c6770b6f4c619fa078db783cc3683
+DIST cinder-2015.1.1.tar.gz 2068679 SHA256 11c6c7e749021978b9daeb631aa9f776a9ab70ea1549e8443a225a20ca98a945 SHA512 8d0cb81ef474b82ce4e377818916b1c2cf3566993c58f756ead17ee57d3316d61cfc0603cfce4e4460c43a6ef17813f5d85126fbaceed54c86060f3e22e39313 WHIRLPOOL a3a896c33a436c485490dd95169252e014757f8c6f555ffa61e26406b9405dbedd90f89bf424b2cfd2f145770f064ce551b59395b337f9b6d883301ca50d49b9
 EBUILD cinder-2014.2.2.ebuild 5650 SHA256 76398d96edce4fed41949883527224e53efcf52c46b143a7c0b934f3f017358f SHA512 999b55fed869f687d44223e20ab22a556ad4bd4988eac9c0277ff199e5fe2941b610389af7d229631eb3d49fc2faf0a8dd16e40fc10a3453357cec2aceada949 WHIRLPOOL 305918fdf146291684be969766b88e297a8e7ffb2106a60d8144a5d0e2abf9a1fc97e52b430d42cb1cd069a6fda2a5ffcceb78989a9737c7c88115d055ac84c1
 EBUILD cinder-2014.2.3-r1.ebuild 5701 SHA256 aa9b749b70aaca442ce548f895a27da763547dbaff669642f7ffd7e70d8fdae6 SHA512 899fc0bf0fdde66993b8f678027f892aaa8498f6a5ed1c15e1aa403c7c72dc129b91ab0540b41ccd301145214abb4d2e2d088732e5236eb45bd48e991d37ea59 WHIRLPOOL bae442dcc2e358ad75a09ff91cd2c074e455381c6f24135df42e593956bedb4989a9cadc4fb9661eb8dde76db185fc610a197e2e7d819cc1c243d312e098cbd6
 EBUILD cinder-2014.2.3.ebuild 5655 SHA256 a5f398acf0125c6502ea53f4eb57ea06c8ce5a8db4ad64dd84132075d360416d SHA512 5581cfdda3c2914eac8104735d7a435bc2cfc7f8a43efd1b638967702215ba912173164bc8d3d616d1d23ef763e7641e02b1891bd96fd70207400695c049f5c8 WHIRLPOOL 8cd89b218ec10ff4f14228b31a690b8eb12279ccf00b8766d3abaeb5c093083c72693110aa8fcc0b8f50b283b564bc97194d87fedd6f9031df9bfc5e73bf803f
 EBUILD cinder-2014.2.9999.ebuild 5665 SHA256 d7bd99ea76758a2891a259dcf44f2286407adfbf1262b83cdd870ae3bcc489a5 SHA512 f70a9e1a82524e895ffce6e6b8b8d39173a6493c92bc4adfa84675aad928e95035cfcb4d8c86b858a920a758ddf604eab59d2072ac976e4fe4a97d829cfd7fa7 WHIRLPOOL 50d839c6a81bb508a352c6b85a8b80aa8d9ba702c25fb2aaf892af4915d172cb97a2d47ed352025d23036bb577e181d82a988b8a739b772aaab0c5be3950c578
 EBUILD cinder-2015.1.0-r1.ebuild 7176 SHA256 5454f37f5c2ac022d42a2c4a27a6b89c8502a2580ad38fe651a24e86b0915148 SHA512 48b41d9bc077033b7db38a399b7413e62b4caaf9bf0bbd86ee3858d0e13de82dc941904b7eb98b4c9ea0673018dc551f0cb4cfaf1b08f7ad5807223efd502cea WHIRLPOOL cdfdf6a2025cf4217fc9e809b0b378ec87eb7fbf8b6666f6ea4b0a3087a81aab7667eecddc136e4efda7496f723cb30c78932032058fa1e8ae07ddbbe18fe6bc
-EBUILD cinder-2015.1.9999.ebuild 7149 SHA256 b7798b6d71f1621d26616ee800d13f3c365d0bdb5c6284c45a1d15c3f53d0a2c SHA512 9a0477d6d6e47bb55f66da809a52da127faf3188e3e1dc0253f622a55ff46ea0627a4c341285a641aa200cbf1ecc34807181ce01bca71cbd8b475ceb0e6d78df WHIRLPOOL bb39de9f23e1239ea71f3ba4a4e124d93b19de07aba63cf0c16417acb59f96f5b78ac75908ace088226c9b684856c42fe07a1384bed528dcd2964d140099e8ba
-MISC ChangeLog 10614 SHA256 fdbe898b2d7acd839ee26baad26ca914febb2a0e9a3c728591f8a9b181b4afab SHA512 1924d5d5520a0c91db697a8543278d596f59d426c49b33e6005117412ea9dfe36db12e82d4247424013110f813b348e4f99bf1b612b6fccbb6610d3612e9c756 WHIRLPOOL 65b45ddbbce7db99473a9d19466d3fc3cd1cc6fd26654f2e0c643a95fe7a7c6671f6d420efcd3b34d96fcb974d28d0bd6d4150f901d8a36ee5abd0fb9ec4268f
+EBUILD cinder-2015.1.1.ebuild 7283 SHA256 7b34cf14e42063040a647180bb6749996debd24616b0eeca509fc51eac1e63b0 SHA512 733e28c23b644721ef60d5a6d1f61d2fbb41dc4beea9b7d12fec8ab1a335e58c01de3f77e3af0f16a1710fb4de3ff28aa3aaa160d0e278d02a68cb8b8a88299d WHIRLPOOL ac483857f2faae176f1fe075a69c14e963ce95560b739c8db58fd5071ab5cf9980891bbe72a33a7888b97a4427ad5ef01ce9f5745fb9b1e59463c0aded530e9d
+EBUILD cinder-2015.1.9999.ebuild 7293 SHA256 74aa1cc40a8dbe91fef9ca464007afd6d915c30642df04d2bde111a662bfd51b SHA512 a97a57d1849b40efcfaa31b0ceb95237929ed741da20776aeb21717ad34c5f19f8978286fcb5b5b3bf8010826eb12ccf0f11cde67008d60e6aca75a6960dde50 WHIRLPOOL aa5669642b6d22904077a6416604f51224911ea8040922263c2b55ed90947f041a8fa9ea1a71fee95ac3c7ba0debdad22722e9cce1b23a187d56ac89e1af292b
+MISC ChangeLog 10802 SHA256 ff15d51f4710b1e38c4c0ac6f14e679d30234a5e394dd371954813ad0d0ab1b4 SHA512 96582fe6b4da0e7f3f95e6f97f2a30bfcd4ce4ba498cf3b0a59958442c5f6b06b186eb1fb1e9b6ae982c3c3e4b8a081905ecbbf4996c8a75c28ff6411bb83015 WHIRLPOOL f27d2d81766068c48839796b45a4ac30e2b120a8de9c00e4eea3e07fd27e3ba38b4e8c873ace2da4a6e017f0b96f3d97e62fbe08697061a5a6dd47ccffd9d4b5
 MISC metadata.xml 1031 SHA256 616141da0a68b35bdf1cb238a3ff954b5acfc05a32b5082d9cd5ee7cef31a239 SHA512 3daccea177c31c85a854c1700e4d39e79b967c4833c9156f0db7d8a133a44c380aa98b842e05830264d6ffc9fbbd1817aa88a808b2835b80f5064ff6afcc2783 WHIRLPOOL 18b4d280c105cc21e084e01c8e3b80ea48ac7c6cebad2f5fdc5716723b346362416b31a5872c486d11ce9d313446db0994c857d5fe7dd5d7cc9d391fa82ea4a3
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
 
-iJwEAQEIAAYFAlW5EUMACgkQG9wOWsQutdZvogP/fjzfWW5J9H1UdRCpDJyEQTjr
-aDgVtNHoQpmEnGPudiJ8mh8ld+RzDTTPb5vRnwilrOiy8MarIISrPI06IXRB84I6
-l9+mAnxU02Eqn4W4IeVz5FYsm9qYb5iI+0sVWuCSC12+XAQXyFEcNtZsrwnUt8G1
-xL2Cv8QIvIFWaZSkvgg=
-=+1R4
+iQIcBAEBCAAGBQJVuWREAAoJEGSje+quGaToHScP/2TW875kxC2Z8AN9Iw2s01TN
+8PPFZsIni8lDh3UEQa2rsmcGW0qLILRT1O0wDqaxmbNX4RMTyepYn1Hmw1iRyWyV
+vSj7gbyxtfaFoc50HNFTT8/ZJWMQx/44PneNHqdved6UeWMpaeufsW/mUKns8Glp
+nC6S9wxqs4zaMMYoyByegbRNSNl0IvA3PdvCEHgE0vddjIRKnflu3GGpsfBDLBHJ
+JC24d42SzDn2JxT8D89TP0CtfADIF55f+8kRK2/fyXrrVcZaB5EsSuhZftgt3hqz
+38J88PycRBL3I1+uMIYt1bsXGWvthnKdY3zcpoZoehmrU+aa25XMy/pHIysWD9Lx
+MuPZ1oAagW8y5OjNZr0AaWaT8sOEMIv8V3TwUs9mcEbGANmZi0G6U5LMCtXv/v2f
+mvSWjdO68TEKUr4l/RLkGtyed/UlNXEQjroQ3MADlvLMEXJjgOzDUu1sT9WNyJzS
+mu41suwmOuWWPLvIFLAaiCd5gciv6b1pcZ3CqZCd+T8GgRy3ToM7J6JQJxq4UDAs
+xXNTt51iuNTGZ6I5/wFr/oNllmTdwUNYfoDnhhuTU6QieV11z+GQ5Q8W9nC0jngj
+fDUkhDB+wdhNXH2mKqxiyySb3i8I+kWyltDX4mMtTloYp0mCDJPrVZnGJYxSgNLu
+IH7jVIVXW7MHpNIdK/BA
+=2A9b
 -----END PGP SIGNATURE-----
diff --git a/sys-cluster/cinder/cinder-2015.1.1.ebuild b/sys-cluster/cinder/cinder-2015.1.1.ebuild
new file mode 100644
index 000000000000..3b54bef530aa
--- /dev/null
+++ b/sys-cluster/cinder/cinder-2015.1.1.ebuild
@@ -0,0 +1,189 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/cinder/cinder-2015.1.1.ebuild,v 1.1 2015/07/29 23:38:30 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}/kilo/${PV}/+download/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="+api +scheduler +volume iscsi lvm mysql +memcached 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? (
+			${RDEPEND}
+			>=dev-python/hacking-0.10.0[${PYTHON_USEDEP}]
+			<dev-python/hacking-0.11[${PYTHON_USEDEP}]
+			>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
+			>=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}]
+			<dev-python/fixtures-1.3.0[${PYTHON_USEDEP}]
+			>=dev-python/mock-1.0[${PYTHON_USEDEP}]
+			<dev-python/mock-1.1.0[${PYTHON_USEDEP}]
+			>=dev-python/mox-0.5.3[${PYTHON_USEDEP}]
+			dev-python/mysql-python[${PYTHON_USEDEP}]
+			dev-python/psycopg[${PYTHON_USEDEP}]
+			>=dev-python/oslotest-1.5.1[${PYTHON_USEDEP}]
+			<dev-python/oslotest-1.6.0[${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.36[${PYTHON_USEDEP}]
+			!~dev-python/testtools-1.2.0[${PYTHON_USEDEP}]
+			>=dev-python/testrepository-0.0.18[${PYTHON_USEDEP}]
+			>=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
+			<dev-python/oslo-sphinx-2.6.0[${PYTHON_USEDEP}]
+			>=dev-python/tempest-lib-0.4.0[${PYTHON_USEDEP}]
+			<dev-python/tempest-lib-0.5.0[${PYTHON_USEDEP}]
+		)"
+
+RDEPEND="
+	>=dev-python/anyjson-0.3.3[${PYTHON_USEDEP}]
+	>=dev-python/Babel-1.3[${PYTHON_USEDEP}]
+	>=dev-python/eventlet-0.16.1[${PYTHON_USEDEP}]
+	!~dev-python/eventlet-0.17.0[${PYTHON_USEDEP}]
+	>=dev-python/greenlet-0.3.2[${PYTHON_USEDEP}]
+	>=dev-python/iso8601-0.1.9[${PYTHON_USEDEP}]
+	>=dev-python/keystonemiddleware-1.5.0[${PYTHON_USEDEP}]
+	<dev-python/keystonemiddleware-1.6.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.9.3[${PYTHON_USEDEP}]
+	<dev-python/oslo-config-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-concurrency-1.8.0[${PYTHON_USEDEP}]
+	<dev-python/oslo-concurrency-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-context-0.2.0[${PYTHON_USEDEP}]
+	<dev-python/oslo-context-0.3.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-db-1.7.0[${PYTHON_USEDEP}]
+	<dev-python/oslo-db-1.8.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-log-1.0.0[${PYTHON_USEDEP}]
+	<dev-python/oslo-log-1.1.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-messaging-1.8.0[${PYTHON_USEDEP}]
+	<dev-python/oslo-messaging-1.9.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-middleware-1.0.0[${PYTHON_USEDEP}]
+	<dev-python/oslo-middleware-1.1.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-rootwrap-1.6.0[${PYTHON_USEDEP}]
+	<dev-python/oslo-rootwrap-1.7.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-serialization-1.4.0[${PYTHON_USEDEP}]
+	<dev-python/oslo-serialization-1.5.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-utils-1.4.0[${PYTHON_USEDEP}]
+	<dev-python/oslo-utils-1.5.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-3.0.1[${PYTHON_USEDEP}]
+	<dev-python/python-barbicanclient-3.1.0[${PYTHON_USEDEP}]
+	>=dev-python/python-glanceclient-0.15.0[${PYTHON_USEDEP}]
+	<dev-python/python-glanceclient-0.18.0[${PYTHON_USEDEP}]
+	>=dev-python/python-novaclient-2.22.0[${PYTHON_USEDEP}]
+	<dev-python/python-novaclient-2.24.0[${PYTHON_USEDEP}]
+	>=dev-python/python-swiftclient-2.2.0[${PYTHON_USEDEP}]
+	<dev-python/python-swiftclient-2.5.0[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.2.0[${PYTHON_USEDEP}]
+	!~dev-python/requests-2.4.0[${PYTHON_USEDEP}]
+	>=dev-python/retrying-1.2.3[${PYTHON_USEDEP}]
+	!~dev-python/retrying-1.3.0[${PYTHON_USEDEP}]
+	>=dev-python/routes-1.12.3[${PYTHON_USEDEP}]
+	!~dev-python/routes-2.0[${PYTHON_USEDEP}]
+	>=dev-python/taskflow-0.7.1[${PYTHON_USEDEP}]
+	<dev-python/taskflow-0.8.0[${PYTHON_USEDEP}]
+	>=dev-python/rtslib-fb-2.1.41[${PYTHON_USEDEP}]
+	>=dev-python/six-1.9.0[${PYTHON_USEDEP}]
+	sqlite? (
+		>=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.9.7[${PYTHON_USEDEP}]
+		<=dev-python/sqlalchemy-0.9.99[${PYTHON_USEDEP}]
+	)
+	postgres? (
+		dev-python/psycopg:2
+		>=dev-python/sqlalchemy-0.9.7[${PYTHON_USEDEP}]
+		<=dev-python/sqlalchemy-0.9.99[${PYTHON_USEDEP}]
+	)
+	>=dev-python/sqlalchemy-migrate-0.9.5[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.3.0[${PYTHON_USEDEP}]
+	<dev-python/stevedore-1.4.0[${PYTHON_USEDEP}]
+	>=dev-python/suds-0.4[${PYTHON_USEDEP}]
+	>=dev-python/webob-1.2.3-r1[${PYTHON_USEDEP}]
+	>=dev-python/oslo-i18n-1.5.0[${PYTHON_USEDEP}]
+	<dev-python/oslo-i18n-1.6.0[${PYTHON_USEDEP}]
+	>=dev-python/oslo-vmware-0.11.1[${PYTHON_USEDEP}]
+	<dev-python/oslo-vmware-0.12.0[${PYTHON_USEDEP}]
+	iscsi? (
+		|| ( >=sys-block/iscsitarget-1.4.20.2_p20130821 sys-block/tgt )
+		sys-block/open-iscsi )
+	lvm? ( sys-fs/lvm2 )
+	memcached? ( net-misc/memcached )
+	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() {
+		distutils-r1_python_compile
+		mv cinder/test.py cinder/test.py.bak || die
+		./tools/config/generate_sample.sh -b ./ -p cinder -o etc/cinder || die
+		mv cinder/test.py.bak cinder/test.py || die
+}
+
+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-2015.1.9999.ebuild b/sys-cluster/cinder/cinder-2015.1.9999.ebuild
index 58a281448139..411c5cc6982e 100644
--- a/sys-cluster/cinder/cinder-2015.1.9999.ebuild
+++ b/sys-cluster/cinder/cinder-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/cinder/cinder-2015.1.9999.ebuild,v 1.5 2015/06/17 21:16:47 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/cinder/cinder-2015.1.9999.ebuild,v 1.6 2015/07/29 23:38:30 prometheanfire Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -15,7 +15,7 @@ EGIT_BRANCH="stable/kilo"
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS=""
-IUSE="+api +scheduler +volume iscsi lvm +memcached mysql postgres sqlite test"
+IUSE="+api +scheduler +volume iscsi lvm mysql +memcached postgres sqlite test"
 REQUIRED_USE="|| ( mysql postgres sqlite )"
 
 #sudo is a build dep because I want the sudoers.d directory to exist, lazy.
@@ -29,7 +29,9 @@ DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
 			<dev-python/hacking-0.11[${PYTHON_USEDEP}]
 			>=dev-python/coverage-3.6[${PYTHON_USEDEP}]
 			>=dev-python/fixtures-0.3.14[${PYTHON_USEDEP}]
+			<dev-python/fixtures-1.3.0[${PYTHON_USEDEP}]
 			>=dev-python/mock-1.0[${PYTHON_USEDEP}]
+			<dev-python/mock-1.1.0[${PYTHON_USEDEP}]
 			>=dev-python/mox-0.5.3[${PYTHON_USEDEP}]
 			dev-python/mysql-python[${PYTHON_USEDEP}]
 			dev-python/psycopg[${PYTHON_USEDEP}]
@@ -45,6 +47,7 @@ DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
 			>=dev-python/oslo-sphinx-2.5.0[${PYTHON_USEDEP}]
 			<dev-python/oslo-sphinx-2.6.0[${PYTHON_USEDEP}]
 			>=dev-python/tempest-lib-0.4.0[${PYTHON_USEDEP}]
+			<dev-python/tempest-lib-0.5.0[${PYTHON_USEDEP}]
 		)"
 
 RDEPEND="
@@ -131,7 +134,9 @@ RDEPEND="
 	memcached? ( net-misc/memcached )
 	sys-fs/sysfsutils"
 
-PATCHES=( )
+PATCHES=(
+
+)
 
 pkg_setup() {
 	linux-info_pkg_setup