[gentoo-commits] repo/gentoo:master commit in: sys-cluster/cinder/, sys-cluster/cinder/files/, ...

2018-01-27 Thread Matt Thode 
commit: 6799a9e358e3cc74e0ebc01ea6186693bb05e99b
Author: Matthew Thode  gentoo  org>
AuthorDate: Sun Jan 28 03:48:34 2018 +
Commit: Matt Thode  gentoo  org>
CommitDate: Sun Jan 28 04:13:04 2018 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6799a9e3

sys-cluster/cinder: remove ocata

Package-Manager: Portage-2.3.19, Repoman-2.3.6

 sys-cluster/cinder/Manifest|   8 -
 sys-cluster/cinder/cinder-10.0.6.ebuild| 193 ---
 sys-cluster/cinder/cinder-11.0.2.ebuild|   2 +-
 sys-cluster/cinder/cinder-2016.2..ebuild   | 194 ---
 sys-cluster/cinder/cinder-2017.1..ebuild   | 194 ---
 sys-cluster/cinder/cinder-2017.2..ebuild   |   4 +-
 sys-cluster/cinder/cinder-9.1.4.ebuild | 195 ---
 sys-cluster/cinder/files/cinder.initd  |  16 +-
 sys-cluster/cinder/files/cinder.initd-2|  17 --
 .../cinder/files/etc.liberty/api-httpd.conf|  16 --
 sys-cluster/cinder/files/etc.liberty/api-paste.ini |  60 --
 .../cinder/files/etc.liberty/logging_sample.conf   |  93 -
 sys-cluster/cinder/files/etc.liberty/policy.json   |  99 --
 sys-cluster/cinder/files/etc.liberty/rootwrap.conf |  27 ---
 .../files/etc.liberty/rootwrap.d/volume.filters| 207 -
 15 files changed, 8 insertions(+), 1317 deletions(-)

diff --git a/sys-cluster/cinder/Manifest b/sys-cluster/cinder/Manifest
index 51ab6a5f0fa..e462e21ce38 100644
--- a/sys-cluster/cinder/Manifest
+++ b/sys-cluster/cinder/Manifest
@@ -1,10 +1,2 @@
-DIST cinder-10.0.6.tar.gz 4624145 BLAKE2B 
c3e12c4f49b9b06b674d12354e867328eaaef565930ac1d3078c4611f14f61463d458a2bfd679a0a6cb8ce5b677b037618a800d229bf352797b20b57c8383e6b
 SHA512 
28c84260909d0c1a9b0cd6a7409dad3e09d0d7bd662b8ca61c6c3ca04fb797723bc0f4df7db3a6951d1ce354a84b907bf1832190c02a5992c8ac70cf95fb00b9
 DIST cinder-11.0.2.tar.gz 5794973 BLAKE2B 
a7b59afbe3e27a2fde28a3dcb2ba3707c67223ae7e98cb34d0ac92beb16ab8f10c07f22fda091c9db9a02fd2eff4769a6e574a94cb19df1e9506c36321a12014
 SHA512 
6340150aa010a4372a7e51dc976974839f89b180eef61c9307c5b477dae98c8629a3f54cbc3d114dca28ca75c715930357cfc96d08f80acaabacee8f8c0bf3a6
-DIST cinder-9.1.4.tar.gz 4195597 BLAKE2B 
a35b3c588d0589baf2887ebe6c9c6c4803a6819476c822fa3d314b8cb74f4fabae19cf224a3b9dc2c6255338eff6413be189e3555f5e49578451604f091169ba
 SHA512 
8039d5208296ea54fc869fb05dd91451ac3575eb3dd2ed97d0c63120d18b67b02b835a849cd1ec3dae349920895e13665c15a6daa53f67138823053c49ab87a9
-DIST newton-cinder-policy.json 6412 BLAKE2B 
90c6a2733b0c20a95375e9a588c311e48f9f189aff43ce9a89a808e6693b2f14ca0485fbea4d000674414081171989dc8050c0079e4e137f728decbdf8a5cec0
 SHA512 
3473b5790487bd037d54e4a1a89bab9d145bc34d137d52da2b6b311d2dfee2344fec75c6c96bc518a3e0b175fbd6cde71fb546406c0ef835898e3c1c88eb6d56
-DIST newton-cinder-volume.filters 11025 BLAKE2B 
ac87bb2aaab3bd492ea2f7ce7526e7ff444778ce516c71bce769f2cff1badebe7cbf520c604a0193b03f615e0d34dff21cee34f4798cc03151711b205924728b
 SHA512 
311a636180a18bb45867d55f9d33f1eff053cc7b278b41149c58a14450ff8e6d2016d749cc3fb81d1976c4ab78f7701a908bd9c81eb6e9da31c20820a4eaff3d
-DIST newton-cinder.conf.sample 50793 BLAKE2B 
4537ae2f7dc70fd6711a0a07a301b036af8eab72372317a96355956fa05f67562374a5ad45b60d84d569f5c52a3d36b34fde4d2defcde4d11e69c99a64e22997
 SHA512 
bf3b5fa262d7df57ca8a496724df449eb6c49ea951c1384b216af334db7cb948af5f7a5f24ddcebd4c80cca40da65e8aaa3a65f09ae2e184794ec1bf9bf466db
-DIST ocata-cinder-policy.json 6614 BLAKE2B 
7b47da231386543e6fa438796a747882daa8b39453b6940c9ce454e3989ccc76cec9aebdc96b0820786cad978c6ed834bca6e25f812c8e07028edf100dfba299
 SHA512 
6a3da28674e7bf828a2be8de0b41e6abe59567d0abf2a41781580ba611ca888e072960f3e702e834a1599e6bbb49beb1cd37f7a32e35afaf8dfc73f2852e2302
-DIST ocata-cinder-volume.filters 11067 BLAKE2B 
84e642296960124126155ab725cbbb1754d8303bcb97d85117123671fbf2e96e84c1b38f74d88f6adda9a7f89a784669f45dcb9fadabdace30fc4f53c89d34e5
 SHA512 
9600ca77a63db04844ab9d658ffd0d97abe1c669d91f69d126b364b2700d749cd45d7df1e31ffd7e80698157e9267c3138cae098f36d77995bab73afdf32ff9f
-DIST ocata-cinder.conf.sample 173024 BLAKE2B 
11c53b4507d8ad53cfb49fa4c79760f2d3d8bf65f142a4bdec6731e732e5503a217ae5ab1c7220f73fea4ff2d91b5a84b6230484df672b5022c66d7f4f3eefa0
 SHA512 
bbecf45ad20b3193023a137b5c3237dfc15bd6a232dda5de631096bf55916eb0fffba7506eeffdc1a3c848ac042cb286dea44387ff0eef84ec7bbcaffb4aa58e
 DIST pike-cinder.conf.sample 185310 BLAKE2B 
6f6a626537098107d63cd33ef6f8cc63dd5064711fcab3b6a7ebd0bb4170d3cc18e1cc414491859c63ca02d39602f496068823975f1cd5de731402696ade0868
 SHA512 
12c44b7a31888fbf4c70e037a2f5d0b778018e10bd0fc1cb97391bbe2fc6f97bbe4bec0d1504513ee0235ce50decda6883fe64a7d8fd5e329d8ad73e6bb74654

diff --git a/sys-cluster/cinder/cinder-10.0.6.ebuild 
b/sys-cluster/cinder/cinder-10.0.6.ebuild
deleted file mode 100644
index 50016f1ae5d..000
--- a/sys-cluster/cinder/cinder-10.0.6.ebuild
+++ /dev/null
@@ -1,193 +0

[gentoo-commits] repo/gentoo:master commit in: sys-cluster/cinder/, sys-cluster/cinder/files/etc.liberty/rootwrap.d/, ...

2015-10-18 Thread Matt Thode 
commit: 3b307350bbb4ba4f61320cf4293c50f43b931338
Author: Matthew Thode  gentoo  org>
AuthorDate: Mon Oct 19 04:48:40 2015 +
Commit: Matt Thode  gentoo  org>
CommitDate: Mon Oct 19 04:49:04 2015 +
URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3b307350

sys-cluster/cinder: fixing etc install stuff

Package-Manager: portage-2.2.20.1

 sys-cluster/cinder/Manifest|   1 +
 sys-cluster/cinder/cinder-2015.2..ebuild   |  21 +--
 sys-cluster/cinder/cinder-7.0.0.ebuild |  20 +-
 .../files/etc.liberty/README-cinder.conf.sample|   5 +
 .../cinder/files/etc.liberty/api-httpd.conf|  16 ++
 sys-cluster/cinder/files/etc.liberty/api-paste.ini |  60 ++
 .../cinder/files/etc.liberty/logging_sample.conf   |  93 +
 sys-cluster/cinder/files/etc.liberty/policy.json   |  99 ++
 sys-cluster/cinder/files/etc.liberty/rootwrap.conf |  27 +++
 .../files/etc.liberty/rootwrap.d/volume.filters| 207 +
 10 files changed, 523 insertions(+), 26 deletions(-)

diff --git a/sys-cluster/cinder/Manifest b/sys-cluster/cinder/Manifest
index c9a50c9..f898fca 100644
--- a/sys-cluster/cinder/Manifest
+++ b/sys-cluster/cinder/Manifest
@@ -1,3 +1,4 @@
 DIST cinder-2015.1.1.tar.gz 2068679 SHA256 
11c6c7e749021978b9daeb631aa9f776a9ab70ea1549e8443a225a20ca98a945 SHA512 
8d0cb81ef474b82ce4e377818916b1c2cf3566993c58f756ead17ee57d3316d61cfc0603cfce4e4460c43a6ef17813f5d85126fbaceed54c86060f3e22e39313
 WHIRLPOOL 
a3a896c33a436c485490dd95169252e014757f8c6f555ffa61e26406b9405dbedd90f89bf424b2cfd2f145770f064ce551b59395b337f9b6d883301ca50d49b9
 DIST cinder-2015.1.2.tar.gz 2079511 SHA256 
8baa42a3008b0bb0870df678237c0d06ab8ee148b3bf5c00c6b95cfe05c52333 SHA512 
312b89068b80c642b8055084575e378ae449b615b6135f15f7aa327808e7a4f05887d0626dc69329c8d08001cf8a8488453b783a81c0f083340e15a8dd411f26
 WHIRLPOOL 
dc3b532603167ac7a910120aca122d54646190c9d1a38a024d03675051b726f09f62d55f8bf5e404d83f8a9df8968bd953c3abf30d6eb45851134d399177fa7e
 DIST cinder-7.0.0.tar.gz 2584282 SHA256 
8c6b0729ca6a5eaed273b1ca918064e0fd29bcbc537e19ba4dd9cdc73a090933 SHA512 
6c34c28450f7eee435df9a59ea4ddbb8209e168b5399e203aa76001fd31d00ae0b0012cee5a32f887321a6c3b9f02d206edf99b08fd08d909734e0720f44
 WHIRLPOOL 
5a116e024d7bc0aad5aef70b59b2d4de8dbbc64f79f0a348d102bed57ecbfcb8f24f79f0e52dbd2bbfd74d6585d01529bea4126e2228cd2cc13507a5cf8d0781
+DIST liberty-cinder.conf.sample 13 SHA256 
dad765cbe995576c23b4aa45e316272826fd9a293bf111bcdcb2da9ab562fb43 SHA512 
64696a606233fa6a0f2c844924a61e48552f38ce54dadbc8202455d32b9fa37575c8e1d5c1b3e086d37f832e60f754007f2bfa9cd4915e3ae5fd52e283896f64
 WHIRLPOOL 
2d03754cfe60be0b0f278181e3b9cec399227e643032d9bb53fdafb4504793da6459ceb9b93802d5452ab9b77d9b613ff87f04605833553011a0847d9d3f7e2c

diff --git a/sys-cluster/cinder/cinder-2015.2..ebuild 
b/sys-cluster/cinder/cinder-2015.2..ebuild
index 9e75c43..a17e9de 100644
--- a/sys-cluster/cinder/cinder-2015.2..ebuild
+++ b/sys-cluster/cinder/cinder-2015.2..ebuild
@@ -9,6 +9,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";
+SRC_URI="https://dev.gentoo.org/~prometheanfire/dist/cinder/liberty/cinder.conf.sample
 -> liberty-cinder.conf.sample"
 EGIT_REPO_URI="https://github.com/openstack/cinder.git";
 EGIT_BRANCH="stable/liberty"
 
@@ -202,13 +203,6 @@ python_prepare_all() {
distutils-r1_python_prepare_all
 }
 
-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"
@@ -225,13 +219,14 @@ python_install() {
 
insinto /etc/cinder
insopts -m0640 -o cinder -g 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"
+   newins "${FILESDIR}/etc.liberty/api-httpd.conf" "api-httpd.conf"
+   newins "${FILESDIR}/etc.liberty/api-paste.ini" "api-paste.ini"
+   newins "${DISTDIR}/liberty-cinder.conf.sample" "cinder.conf.sample"
+   newins "${FILESDIR}/etc.liberty/logging_sample.conf" 
"logging_sample.conf"
+   newins "${FILESDIR}/etc.liberty/policy.json" "policy.json"
+   newins "${FILESDIR}/etc.liberty/rootwrap.conf" "rootwrap.conf"
insinto /etc/cinder/rootwrap.d
-   newins "${S}/etc/cinder/rootwrap.d/volume.filters"