you know, stuff

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

5 files changed, 38 insertions, 34 deletions

diff --git a/sys-cluster/cinder/ChangeLog b/sys-cluster/cinder/ChangeLog
index 4712f9f3e126..e89041ca95ba 100644
--- a/sys-cluster/cinder/ChangeLog
+++ b/sys-cluster/cinder/ChangeLog
@@ -1,6 +1,10 @@
 # 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.54 2015/05/10 00:01:50 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/cinder/ChangeLog,v 1.55 2015/05/12 05:25:33 prometheanfire Exp $
+
+  12 May 2015; Matthew Thode <prometheanfire@gentoo.org> cinder-2015.1.0.ebuild,
+  cinder-2015.1.9999.ebuild:
+  fixed config gen for kilo
 
   10 May 2015; Matthew Thode <prometheanfire@gentoo.org> cinder-2015.1.0.ebuild,
   cinder-2015.1.9999.ebuild:
diff --git a/sys-cluster/cinder/Manifest b/sys-cluster/cinder/Manifest
index 9a0c385dfc18..7336daacf100 100644
--- a/sys-cluster/cinder/Manifest
+++ b/sys-cluster/cinder/Manifest
@@ -12,24 +12,23 @@ DIST cinder-2015.1.0.tar.gz 2060773 SHA256 d89d588f35ce66dc7af6e9d63ebb9b3a92967
 EBUILD cinder-2014.2.2.ebuild 5650 SHA256 76398d96edce4fed41949883527224e53efcf52c46b143a7c0b934f3f017358f SHA512 999b55fed869f687d44223e20ab22a556ad4bd4988eac9c0277ff199e5fe2941b610389af7d229631eb3d49fc2faf0a8dd16e40fc10a3453357cec2aceada949 WHIRLPOOL 305918fdf146291684be969766b88e297a8e7ffb2106a60d8144a5d0e2abf9a1fc97e52b430d42cb1cd069a6fda2a5ffcceb78989a9737c7c88115d055ac84c1
 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.ebuild 6958 SHA256 aa821a3ca51c4084ca241affe62d2bf5db3a457db6ffce846b5244485139c5ef SHA512 a44f3202e6874dea51bad0c8ddf80bd938d59aa07988fb8592286dcf10f278766de2cb7a8470bfdd39e5399f89b9ed43725e67f3d182cda59e1b435583f59a56 WHIRLPOOL 8e7f397e0920896556ab35bab57c2969401c55a26adba8178a9a1f3021ade1b9b922733d5007278cf525756ade67f9756da7e2a9439f535bd626eb509dd1450e
-EBUILD cinder-2015.1.9999.ebuild 6968 SHA256 8087babe7b8aafba6d8b19673385c527734e64261abd44d529e9a8df35024fcf SHA512 7f6340238e1cee3a919be5a3aa7b8eb7d6a3e39524b238d2d1972fe87afc41d7baf387492dcaded0d7bc873c788a6286dd33bcbf0276155faacc2c8b2a151e45 WHIRLPOOL 5682e348a72c30bcf78838d02740c2c632d940c0d91eeb3ba98bdd60fc8fe349be63b9ee1a39801741dd94689e1411fb4887cf2a4ee07589a7015c7e880f5139
-MISC ChangeLog 9800 SHA256 29e87e988ef0edb2af1685236c4689f8d30baff8c8f7c9790e9e525eb20a6fb7 SHA512 cc33bb80d8f465535ea4dfa5dd4333824c821143a084d28427d7095ddcb420e197b7de42c65475db7c4cbfeeee6722d30f82dace8e67d8a4847e8668f0e042ec WHIRLPOOL 300495dd1093854ac963968ef347e8a946699dcb57ee9089ed4e07f6a32c376d51a908de404873bd51a4b91ca3a3e9522daa7d9ed6ccae506f904bbf75e20c2e
-MISC metadata.xml 921 SHA256 33d8d60945d6b793447e7a377cc35069a01dab1c874c0dac417772e585fdb2ee SHA512 e05cc2f145099d8b9bac3f4b4298b6ae628ad328b4602181020828d39aa74ced949487388daef52c0cb2b66ea3e6c64662fc1d3dd0a0a6b2b2b513afb6fc7b41 WHIRLPOOL 7c97874b37719acdcc222ce15eab14fbbdbea628038e9ab56bc740a3476265d8cfa7108c94c5809eb995a5aca2ad596ef51d8340b0202c3d1a5ea937ce6d5dc7
+EBUILD cinder-2015.1.0.ebuild 7093 SHA256 f22519fa8ebb27c5823118b6135ed2c907c52c8b6e5ee5c7314d607c90f7b65c SHA512 ae8f9c5821c056aa217d267d871cec5ca4435948aeb0a7f67ec3a47e0eb10ad34b3ae3996c8ab7eb22d0329513684dbe632733bc42ec45682ac5f507dad71ce4 WHIRLPOOL bbb2e247f7ea11df62e117f5041ac0d58f964d7f00cd8c42cea9eedc0e5e3cdf4870d94bff3ef31373e7540859bc33e7ed55f1a634277cadf4b7fc4dd0740124
+EBUILD cinder-2015.1.9999.ebuild 7103 SHA256 f4ad6c527514f4f3fa19a3556cdaaaf0ca231de6af6d91ce7ae9a0d2e2d8e2ab SHA512 fb409199196950f58723f22b4f2d6a3aa4818b51d8a573a236400545e52ffa268049fb011a503ad6ed78eb8b4118ceef153ed999315106b329df183bbef11e08 WHIRLPOOL aa2d2cc77305da7f94addb2b6d980c579b37f74c3e16906af69e3bf53577e602c3985694fe7e469c0e043c7c1c8148739c551c46b3f3334482fea19ddb5104ef
+MISC ChangeLog 9939 SHA256 c25bc314d1271a17367e3767a1191af9f4a223ad37207cee751f2c977c8afbe3 SHA512 13e16d9da9a4dabe1a73b16864d673273302091ae5b0bbebb098af80b90dc05a300628a55a738fd017bc408fc78876273f5ee5edf4c49d39c3121b2f0ea4f07e WHIRLPOOL 55ee78fad2358dea28d9a245b6611e38487479ee10d300ef6ef9ed214c56e7d696a7749a32fd862f6e8624446d09e929067a6aea55af6e7dbcc2cf9d1656e337
+MISC metadata.xml 891 SHA256 1ffb7aac585e4f3a607d814c86a6a74e56439cbd4fd044835dc77b3a7170fd4a SHA512 90b348378b22e3f5becc5c4d3c057f44f2a149580f5ffcbd8a22dcdcafb772f513fde7e66bca0f82b8fd5f6c6c939424543291bbd696bc26502781792cec4bfe WHIRLPOOL fea1b5d1f57cffad34473d082530a307a1389376154cabbc84926a7f385243098c4690c3eba404130c0a19e7873ec6721346fe01ed8ba0216fb322844cdde0c1
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2
 
-iQIcBAEBCAAGBQJVTqANAAoJEGSje+quGaToEFIP+wcPnEfepVxEK3gBRM11EzvL
-XRvHdb4mBCOxX3284yfhei4mI4bWRZr8Mwq17sJoawHicsTK23kknXLXzXrS/dml
-FiY8L7t1JvdOAqNQABvvBsCDbbjaXsm3Y6woAEpCybi3yHZHyuPRnQjGZwb4QeFL
-k2jAp2mt2RSBvFywLa4kBDdICdX6ywsuesccwiI6SfsbS+V/Tgq1uX4sTEMpo+rv
-ca2n8kOM9cCIstfinEJjrSkvYNLbeyAun1fkQNG99T2tb828O2GvEPQzXCxqyCS+
-TVp6XzsVHyQSparDSgPvt6TrcwkykRsTJ61ew0DVhmauXKz0vQK+J/lllpj1pUp8
-ylMWgzPZHVi3dlbyVh+PXroOanYJ71E1d/hegbuo5eLcITwqcGbytsd3jW/dEyDd
-q6CmIAAvlx4HEwsVoBaKsGzKxQqSeLy4TAWuCGGaUdxd5+5rx3uEdXRbIRiMpYJy
-uFOdspdBLz/08lLGWwvkj4Nyu5kkwlevmt1G+eLyKLv14ljZiN4MOPTQaplj0rMb
-mnePWC4tCQ12apjNz0FXAT9v8EoJqih+N4SI5T3VdU/umt8d+Ue/kJOLlTA+YKm6
-nvIVGAk75f2XNNcu5BEHl9jCzdtMvWP/YljW7m1OaLEH9exaSBxd4DCjqnWQZPAM
-qozn9W6YLlEGUX2vTjxV
-=2c9k
+iQIcBAEBCAAGBQJVUY7UAAoJEGSje+quGaTo/cMP/AneWhfQYeRKZbz8g0uUIyOl
+wXvrVAv6Exk9L7bRgNl3rkeIM6ocp7fEB/Eb9BhBqoCdyCYxcDlfECb9V98WTALc
+RtLruVMLOENGoSVFYH9exhO1t+Q2vCQdcamUxGmx1ICSr1FB7qkcqFbRSIYY/1+7
+FjUUr2if8hE7H4O8RlWZXd6j07ZjQ38fKYzN1ecASDcmgvjQH+7pbwkd87BEG4HQ
+oJEvgU8sYk2NC2zhbGAn/Ua9Nl79d5Al2HkFoAAvFGhQNvpLRp90iXawPf/f0ZDI
+7VMqLYCDKFBlIJq+4uUiSb/rBoOzMAdhqkvJyBMiXxz0BEnPt++wFYILkvDBS8ik
+nJCXhNbj0Fwn6ovu8qV+YQvDoc9EjnK3NP83yd75ZJ0Zh4TP4GffHmB048YZw+X6
+k0LZI8u7X+hEIu9m/I2Qr7Mrag7U9z0cTEQzUCLuBRW7pe1J89Qien8NQmhReal5
+1JWJKNdDhW+Tvmmyp0WvcmceVsNCsm/wkva83iWaoSZ0ZFskmfsx15jrXIi79ZOm
+Jrp7vnWkT+k/RZoNJrTN9uLXMfx5BIkUgWRXohPDbIgl/r2znco7+IKDBxZRhp/o
+Hi8mq6h7CzK17ADDV48I7xNM8sF0IfsbS4GqhYRG+vFcIGMoOsxz9GAUmYNplxfM
+DQK8VXhqkJ1bdtDQUt+Y
+=Unc4
 -----END PGP SIGNATURE-----
diff --git a/sys-cluster/cinder/cinder-2015.1.0.ebuild b/sys-cluster/cinder/cinder-2015.1.0.ebuild
index 6a1edca52eb5..eaeb2a769c97 100644
--- a/sys-cluster/cinder/cinder-2015.1.0.ebuild
+++ b/sys-cluster/cinder/cinder-2015.1.0.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.0.ebuild,v 1.3 2015/05/10 00:01:50 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/cinder/cinder-2015.1.0.ebuild,v 1.4 2015/05/12 05:25:33 prometheanfire Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -143,9 +143,12 @@ pkg_setup() {
 	enewuser cinder -1 -1 /var/lib/cinder cinder
 }
 
-#python_compile_all() { leave for next attempt
-#	use doc && emake -C doc html
-#}
+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
diff --git a/sys-cluster/cinder/cinder-2015.1.9999.ebuild b/sys-cluster/cinder/cinder-2015.1.9999.ebuild
index d760d48ef5f8..117568e48502 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.3 2015/05/10 00:01:50 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/cinder/cinder-2015.1.9999.ebuild,v 1.4 2015/05/12 05:25:33 prometheanfire Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -144,9 +144,12 @@ pkg_setup() {
 	enewuser cinder -1 -1 /var/lib/cinder cinder
 }
 
-#python_compile_all() { leave for next attempt
-#	use doc && emake -C doc html
-#}
+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
diff --git a/sys-cluster/cinder/metadata.xml b/sys-cluster/cinder/metadata.xml
index 652d3ddc4ed3..16205444cf27 100644
--- a/sys-cluster/cinder/metadata.xml
+++ b/sys-cluster/cinder/metadata.xml
@@ -13,13 +13,8 @@
     <flag name="api">Installs the initscripts for the cinder api service</flag>
     <flag name="scheduler">Installs the initscripts for the cinder scheduler service</flag>
     <flag name="volume">Installs the initscripts for the cinder volume service</flag>
-    <flag name="iscsi">
-      Allow using an iSCSI remote storage server as pool for disk image storage
-    </flag>
-    <flag name="lvm">
-      Allow using the Logical Volume Manager (<pkg>sys-apps/lvm2</pkg>) as pool for disk image
-      storage
-    </flag>
+    <flag name="iscsi">Allow using an iSCSI remote storage server as pool for disk image storage</flag>
+    <flag name="lvm">Allow using the Logical Volume Manager (<pkg>sys-apps/lvm2</pkg>) as pool for disk image storage</flag>
 
   </use>
 </pkgmetadata>