bump and sync with stable/juno

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

diff --git a/sys-cluster/cinder/ChangeLog b/sys-cluster/cinder/ChangeLog
index fab8a2a2fa5606d77b73664b222706a07c800745..1e69c8adb82263f456ee83d555a0ae5835457fed 100644 (file)
--- 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.50 2015/02/08 02:15:29 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/cinder/ChangeLog,v 1.51 2015/04/13 03:13:37 prometheanfire Exp $
+
+*cinder-2014.2.3 (13 Apr 2015)
+
+  13 Apr 2015; Matthew Thode <prometheanfire@gentoo.org>
+  +cinder-2014.2.3.ebuild, cinder-2014.2.9999.ebuild:
+  bump and sync with stable/juno
 
 *cinder-2014.2.2 (08 Feb 2015)
 

diff --git a/sys-cluster/cinder/Manifest b/sys-cluster/cinder/Manifest
index bf6e586496f04d037c0fe974a0a37e6bacabbe97..0dfd7b4c04583b65ca34e268f677d2c813eb77f7 100644 (file)
--- a/sys-cluster/cinder/Manifest
+++ b/sys-cluster/cinder/Manifest
@@ -1,10 +1,32 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX cinder-confd 75 SHA256 178148ecb30d9d1a03e4f5210dfa235be3028dc2af7d6f7a4c2e4d0ef190f0f3 SHA512 4dd3db170c1234906fa679ec6684cde16a6bdad4ac90d6a9c00bc0c4afc7ee40ebcebdc7071ad0a34f8eb5bd9c0ab32c6f8fc40624b6c575c4fbb58dad1c91e3 WHIRLPOOL 3f32cbe4f4935a5c5c34de77d638b4cbc10a7a75ba230be5be75af85b12179741bb970603252ec74f098319dffce6eef7e5f0c9bfa34a5b84119fb7642f22d22
 AUX cinder-init 1436 SHA256 ef93804e171364da98232fca2bf25adfb16e062c8b4dd69ce12f280b08ca8154 SHA512 b6d9d5a949cd43669a28b4e2c54cf795c92f070d10b56130f5a024fcbf9934d9e4f910e78972f427c979e68ee71c55006ecc9008eacf5c8abbe4c81c7b0731bf WHIRLPOOL 5983f6cbf500359d4e03b89d240f7652bd22655c0edcb858052062c4886c4da1d72ded228dd79847f74c279d5592dab2945807f611db1bf847a2c6d2b9f8f619
 AUX cinder-sudoers 86 SHA256 a2c2b8f50b21deaceaa2184c00725492cd96db44736cb3fe4bf4aaecc0805b6f SHA512 c158be54e721abc6916db2e710092ca75aac65ac88b19849ccd0f3ebbb7c8879aab6b73aba36537e806abd5b8b5e8fbc24fca79d00015d3308198d5270e51fe1 WHIRLPOOL 52642c53b34b089fb9c82c1307c02cd611ea834492a2919a12902bc974a146348a3dcde3db6058eb417395acaff8131398e70fbfa74c7325abcd695102f372c3
 AUX cinder.initd 744 SHA256 187237abfa1bef35136a95d0e2addffdf2fc3cff0e7c4f05e3523c31a16d377d SHA512 473aa626026adbcc132753f620702fcbe1bedef2b122cf212994b3bc453c27d56a3be1bec7229944f9be0478776001dba80f7cb7498cb46f314d2ee06a39f5f5 WHIRLPOOL 3b1667b2a1e089ecef68d9fa5315266d486c462820ea2304c76a5954c0b718983293de9c6a955695ae4fa7d9faedf36490d3ceda49775b4b81a441f67b4875d7
 AUX cinder.sudoersd 86 SHA256 a2c2b8f50b21deaceaa2184c00725492cd96db44736cb3fe4bf4aaecc0805b6f SHA512 c158be54e721abc6916db2e710092ca75aac65ac88b19849ccd0f3ebbb7c8879aab6b73aba36537e806abd5b8b5e8fbc24fca79d00015d3308198d5270e51fe1 WHIRLPOOL 52642c53b34b089fb9c82c1307c02cd611ea834492a2919a12902bc974a146348a3dcde3db6058eb417395acaff8131398e70fbfa74c7325abcd695102f372c3
 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
 EBUILD cinder-2014.2.2.ebuild 5650 SHA256 76398d96edce4fed41949883527224e53efcf52c46b143a7c0b934f3f017358f SHA512 999b55fed869f687d44223e20ab22a556ad4bd4988eac9c0277ff199e5fe2941b610389af7d229631eb3d49fc2faf0a8dd16e40fc10a3453357cec2aceada949 WHIRLPOOL 305918fdf146291684be969766b88e297a8e7ffb2106a60d8144a5d0e2abf9a1fc97e52b430d42cb1cd069a6fda2a5ffcceb78989a9737c7c88115d055ac84c1
-EBUILD cinder-2014.2.9999.ebuild 5660 SHA256 bdead6cb4ca0fc9ad56056026950351df1bdcfbe80e2a845fb57e7589920c406 SHA512 8f0ef86791a31644d1ec31f2f638cae6a204584f7736a9ee0763fbaf572ac4f4cc35b9e5a2e0ec549e108c348ca7843af7809087c670fbccf834fbfd56d6f9cd WHIRLPOOL d74b5a59ce4cb2ce81c42377a0557e52e77ede2736cd0d2d4aa894876379e3677f6d4c0b37cadfe02976d9887ca2765d4a44861431402569d4479ea4d71bef0c
-MISC ChangeLog 9171 SHA256 d299fe5dfbdf2e4f3b93ce16a1b0525d8ff1284ed923355f998365eaa18236ab SHA512 e1b3685cae80a75df47326af073f78a2adab86c46a3f5556954f0c2573ff834bedd9acc8d9d706b5937992c81a97d4014bc2f7094b6028c391a302f67013f4ae WHIRLPOOL 64c685375ab6935f63c6683203efb4ffd859901ac6cf50c79a304e44417f927bf8b676cf8a08b2eadb6bfa3bea8d20f89fd4d434ed48941bb40246c7503e14c7
+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
+MISC ChangeLog 9348 SHA256 7abd2585bb0b32084162ca2c0a47bda1421b131e6e2c64e0ae7a4465c1386ec5 SHA512 1c2497bfc47b8ee2628ca924ffbed55e7e77a446663804dca019e06e07fd68ec2829bff1836600cc49ecf5160aa8a81d4dea7a58bbc7558a53408dd66cdbcf40 WHIRLPOOL 249a239eac0b94d59e91eae886ad1ef0aa430b0badc08f62b10e23fc760a8031cd91d50071fd32f38429ae8752bf100e1640f49259e6fd24a736a666b29b110a
 MISC metadata.xml 921 SHA256 33d8d60945d6b793447e7a377cc35069a01dab1c874c0dac417772e585fdb2ee SHA512 e05cc2f145099d8b9bac3f4b4298b6ae628ad328b4602181020828d39aa74ced949487388daef52c0cb2b66ea3e6c64662fc1d3dd0a0a6b2b2b513afb6fc7b41 WHIRLPOOL 7c97874b37719acdcc222ce15eab14fbbdbea628038e9ab56bc740a3476265d8cfa7108c94c5809eb995a5aca2ad596ef51d8340b0202c3d1a5ea937ce6d5dc7
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2
+
+iQIcBAEBCAAGBQJVKzRqAAoJEGSje+quGaTorx0QAJmjEwttlyxyAzf7x4RUIdSL
+zZcsY1fsXs1KYa+/1AQZu6eEZ5CCiHdVxZy86N1wupioI4CxYbXN/NVuuPqhtN4V
+5bzrI/c1KdjAUcUM00o4xCk4t5eBtiMggqBT0t1c0scu4p+oYk0HPp/nyts4ju/D
+qQ8T35R3nOuC++weybEnsHR7M0wnDn58hopMLGk1IZAdYHftoJTGJ++dq9Xvvfi3
+RooSy5kb5/V43Lpqssp8iw3yMoQjZawNGBR+GxGD2/9x7x9SEkz+GJ3a4nRw0pyX
+kImU9XvjmZXrd8WPIu5xq1WzCMnsXqQIqcpxLuEZsto6YBw+/11H8u3OiadM84GJ
+SFGXkmAV4poNGvrOeJ7xrDYQaXAIgGlArNMQ09a1YUkQ5Q245TM+OMuuLLl6uTKz
+XgA/JwelfhcR+u9VcuDsYDCgk8GGNSfQOgnAxA9zgYRMidEn1DfLofrPtn7cT60U
+eqdrYyL12CYcD5AsXgsYJaNPr6kuF51QhA6VmFVXST3uepgN+9WdGQmJaomksINH
+5GeztkYj/KmAuVMd4jPq6plfeNMGcJgKQhpmJEdJqLrrE1hov03K4q3mHwbtVJUj
+fM8qK0J7MrCo/RXhYetiTzIGj/wMnGJHABKIe+1FX/hZeCEr4sr7Qd5JM/XUGmbn
+85gqYpDXwX2bWc6XPzA3
+=uqec
+-----END PGP SIGNATURE-----

diff --git a/sys-cluster/cinder/cinder-2014.2.3.ebuild b/sys-cluster/cinder/cinder-2014.2.3.ebuild
new file mode 100644 (file)
index 0000000..38cfc81
--- /dev/null
+++ b/sys-cluster/cinder/cinder-2014.2.3.ebuild
@@ -0,0 +1,154 @@
+# 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-2014.2.3.ebuild,v 1.1 2015/04/13 03:13:37 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? (
+                       ${RDEPEND}
+                       >=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/eventlet-0.16.0[${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-db-1.1.0[${PYTHON_USEDEP}]
+       >=dev-python/oslo-messaging-1.4.0[${PYTHON_USEDEP}]
+       !~dev-python/oslo-messaging-1.5.0[${PYTHON_USEDEP}]
+       <dev-python/oslo-messaging-1.6.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-barbicanclient-3.0.2[${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-2.1.0[${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/taskflow-0.7.0[${PYTHON_USEDEP}]
+       >=dev-python/rtslib-fb-2.1.39[${PYTHON_USEDEP}]
+       >=dev-python/six-1.7.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.1[${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.9999.ebuild b/sys-cluster/cinder/cinder-2014.2.9999.ebuild
index 5fbb3925af28c006b4b9c6f7f10291dfde042f2e..7eb44a5c18f23e998706f21d6cacd9fa779b3c5d 100644 (file)
--- a/sys-cluster/cinder/cinder-2014.2.9999.ebuild
+++ b/sys-cluster/cinder/cinder-2014.2.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-2014.2.9999.ebuild,v 1.5 2015/04/02 18:57:23 mr_bones_ Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/cinder/cinder-2014.2.9999.ebuild,v 1.6 2015/04/13 03:13:37 prometheanfire Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -71,7 +71,7 @@ RDEPEND="
        >=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.1.0[${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}]