updated init scripts :D

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0x2471EB3E40AC5AC3

10 files changed, 55 insertions, 150 deletions

diff --git a/sys-auth/keystone/ChangeLog b/sys-auth/keystone/ChangeLog
index 77ffcd2fe535..cad16fa8259c 100644
--- a/sys-auth/keystone/ChangeLog
+++ b/sys-auth/keystone/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-auth/keystone
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/keystone/ChangeLog,v 1.57 2014/01/20 05:58:14 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/keystone/ChangeLog,v 1.58 2014/01/20 06:08:12 prometheanfire Exp $
+
+  20 Jan 2014; Matthew Thode <prometheanfire@gentoo.org>
+  -files/keystone.initd.havana, files/keystone.confd, files/keystone.initd,
+  keystone-2013.1.4-r2.ebuild, keystone-2013.1.9999.ebuild,
+  keystone-2013.2.1-r1.ebuild, keystone-2013.2.9999.ebuild,
+  keystone-9999.ebuild:
+  updated init scripts :D
 
 *keystone-2013.2.1-r1 (20 Jan 2014)
 *keystone-2013.1.4-r2 (20 Jan 2014)
diff --git a/sys-auth/keystone/Manifest b/sys-auth/keystone/Manifest
index 8be3a65c8d7d..fbe5bc281108 100644
--- a/sys-auth/keystone/Manifest
+++ b/sys-auth/keystone/Manifest
@@ -5,33 +5,32 @@ AUX 2012.2.4-CVE-2013-4222.patch 4815 SHA256 3a5018cf7788fb0498ac50cb022d4ecf780
 AUX 2013.1.4-CVE-2013-4477.patch 3344 SHA256 6b4ff925ec1451eefb869ed85911f23fd90220f9394c482ee133feddd10eae32 SHA512 8a8a610603f05a27b2986637f9822389ef61e92c02d1837f13f30e56ce90de3733a2f8c5517179bbd3d1e4b0c69e8307262bbfba3fbd088b526c3c909d9d0a11 WHIRLPOOL 3e11c0ccd401ffedfc9549255e2843f3a9e0807bd37bb292adbe6e6a0beb736465ca126aff2022ea5d19fab59836aa51106d26d5e998b870a61cc42cd2378537
 AUX keystone-cve-2013-4294-folsom.patch 5662 SHA256 69b07e87cf021b21168fe40fedd2dabd492991e0b4192f86fad378e24ef0429c SHA512 502cca91cfd71bd43f1a0dd0ada718cc9020071e41b13abd7310de175a794453bdb529e1ffb641e60e199fef9a2226aa44395f32eb3b0af8dc0b56dbf739b307 WHIRLPOOL 58f95de485b6351f78a680a65531bee8bcc2d725329aefa21116443a8a5ad6759a32d0ff39aa97a5226fa32fdcf0ac689bab1e7730207677334d1559f8c8d790
 AUX keystone-grizzly-2-CVE-2013-2157.patch 3371 SHA256 7f4e10e1c559dc8f3ece1a42115f17dc069d86140b4e4ecd6309eae5b787d341 SHA512 a9245c718548da6cd60b29e7cf6c0bd61b18a94cead8200b74d657342b5ef68ad4b4a0e1104121eb32359f960f96ad3840fec285a1d72b26b9729845ae4a8ac7 WHIRLPOOL a8494a2d6f4b5151780e6bcd1a21c409ca8921a4907aca529b72473745fd895c75dfcf926889a1a00f6d3d7446d849e44ce88c25dcfbdd74fdf96421ff78f1eb
-AUX keystone.confd 107 SHA256 b26daf41539aff7f69aff9f8416b8b503282f10e61752f5221f01e132001d623 SHA512 9209798fba236bbf1850e20ee085fe3ba08a3f5c6927f99a2207afe27020e74f7a185e5029bdc79bbcc2a2530f694e815018b0137b2887f1c69a501c122b14e2 WHIRLPOOL 5ea1fe2f04d4ca48479d7c075842686afd2f4bffba18fff35f984575ce1bd8ffc9c34e55a5fc03ddff14066e1042806c84fc734ad6689d5e5b965d891222de83
-AUX keystone.initd 1259 SHA256 cc96eb421fc4c0c04d391507a713aa5b4f426815404317d24a63e37338fca22c SHA512 093746f1f182a4348018c104a69e8e15e181f23c6fdf6eb0d330d364fbcc0ea9816762fc313efafe0128bfb772214072a3ac50b717f8b938373f044ba1b8dbd7 WHIRLPOOL 5792137774bfa78659691188a4751b65da697693dafcc5ce7f84141326b3c8eb4a27534c47868748774461e7ca37f77d3973fecc96346051b8ec6a0fb9d89317
-AUX keystone.initd.havana 1286 SHA256 0218d7abf00fe62cde4bfc1fdcdec9cd0784dad4c75cf7c34e1a90beece88f20 SHA512 1052b2bb3bedcd2b24ea7fc0cd28a09284419867339745fd94e5d13addbf33c88f1c1146e427f307383912d5624e3b86e8deb6c5747f1c10d59ba8fe1c3ed6ca WHIRLPOOL 093a488f6ae3e98914a43fa79ad833659e17940f950ed12ad57e46c699f0e70f1226bd69ca5595cba7293191ee410e473e8dc9be098cb48d5ddea88f3f7a7466
+AUX keystone.confd 124 SHA256 50daa09c5922190a6663e36a32e9b6e5c512672e5be776fcc9b0805da40b6e8d SHA512 1cf50ddcd55421481f8b34f91f35787299b2f9044bcc0a63c70ffff372d740cb84c399d31e52d708fdacad3455d77867d02b438ec2fb39b35ac2e106a2c9e0ad WHIRLPOOL e6c2b76131846cd0ce86e8d766d3f5bbd0d8cd0643de9100d7946afa44c3f13500719feca3ee4ea49644f6881fa34bdc17c08d65a001841ae8f40fc820d334fc
+AUX keystone.initd 674 SHA256 fc556365de7198de035ebf083b10f59043aa3266270d3ab708d613311f1a719a SHA512 10066c2197973aeee2444ae1bff0ffc3d2a7360a632b55b9c2f66bf064285491e698721ec1525a22b18c0b74a8a6c5c4b84d2cf73812a0f93b2dbfffba799718 WHIRLPOOL 7969003cec68ca8017de003e6a5cfb4bd239a149b06dd9304c9ba8200b4fedfe8ae7e8d3c443e741d1c19cedc5d67150f1d236eef565685a64aa4a998c1ec509
 AUX no_admin_token_auth-paste.ini 2646 SHA256 f98d9151f222d2143820bdc98727ce0cf3f4450a4dbdc54f1fb6e36bb63bf2df SHA512 c855dd2bb05e765c6594359f55b76f7f6e0649c8e8f4517b274c7432f136e51c408168ec24e0074f4ebc49eb641d658acfda205aef97fe68fe8fc016be4cb08d WHIRLPOOL faad0f98d0684cf206e2f2afb5fba6c6aab73f97bcf63e38038be49a2ae1303e8cb5434d8fab34492888c666462dcd751c678c04cd0039d9024fd42ddde30646
 DIST keystone-2013.1.4.tar.gz 799682 SHA256 3673f5d7c1c19fca7529934308e2d9a6efa55bf7d100d20de1aa85e431d259b2 SHA512 7b1d9d9ae0fc6b1cadef8eb0d85f6a71fcfab754f8908076d38b14c14c3eb46d2d3c6266ec7482a60d7ae8cf54d54ba604c4d903dde65ec1243f862423060c14 WHIRLPOOL dea8adbb504ee9e3cda416f6e5a12cb0e606b88db7c0fe9b83fb8487e6f18e313e7d53041fcdaab408ae4201e355b72324cf35585b113c8769f51daf1c3f4ea4
 DIST keystone-2013.2.1.tar.gz 1404077 SHA256 1e52362557e5641e0dad580a68654d7813ad11f7761ad42af15e4786aaad34da SHA512 f65e153d847ca897f54cedabdfb0f9baee60791927132486d2a9a371724a0282a851dacbfde7629430c26c50763199ee06c92909b66e2880d0010ec46fd21c86 WHIRLPOOL cc6f9e2eb7be7ffeb210f35b4ab4c5bbcd666a6363941b9774dc9733231748beab18d08a24ef1042afc984c4f40acb160b14e60adcdccf332f16327e602db220
-EBUILD keystone-2013.1.4-r2.ebuild 3129 SHA256 046159e9d8b576cff8eb8895eb5f4c70e882f07b98feb774309c3a255f305735 SHA512 4e47118b8f3de95cfd60f3e226bc263e53b4ef4bef00bfe2ab9810a3d58d211622766f23da25db6377d6704ccef2cbc1a2e05b22bcfa8b9cc7f6c3b5166e91a3 WHIRLPOOL 8ae7ba69003705514dc4929e361431744e2b14fe416586cdbfa4c88d4ad7ed6cc5273cd87bd1004db21f3e5cc446579ee686d60bcab0c7bbdb62b14a0da47311
-EBUILD keystone-2013.1.9999.ebuild 3077 SHA256 da4acfcb28df8bf2e599335ed88f42085e235acd4a8005efb4df876934ac38a1 SHA512 cd8211c1bda6b33ebba43a02ef80bddf5bec74680a8272abad92d87e937e8d252ce82941b64adafa9999832df6c1e688b68351e105aa9997ff2bcce2dc40b340 WHIRLPOOL c7fefd443501ebcca02e21d45b71893b4112a6df0f0eae00df4ca8712bea7b972dd7058865b5174fe386dedff74fd58fb450249f25c94ae4dadd1e4229af327b
-EBUILD keystone-2013.2.1-r1.ebuild 4788 SHA256 fb60a7402b7e56019062c1a000dc1ccf74790462440ac0d02098698f9e797a30 SHA512 7c2c9d068d8ceab82430d69020a9508c7a509ae2744a216d5198eb14f0aa87e66cbb9b3239902b74d1613c15a9b774aca4b2b2cb1f9d1ce3b754543988820690 WHIRLPOOL a1abd452dd84f5d67ab7ec5ca38ca44a0f57d0bdcecee2989cd67c5e421a01f3a21baee538501a5362b16f3adba22a4f1664245b503ebcdc850978f533111ce2
-EBUILD keystone-2013.2.9999.ebuild 4415 SHA256 106746caec8bfe0c755a7f08e1877dfc7469b053e2522e00f6a75f8c54e93c13 SHA512 221dfaa8edd079ec767b556229680eff5707d41871fea0235ea157d91bda5841169c431899cdf8480d22b76bc09f87cf3a220b90892283b95884e3be6bda92f7 WHIRLPOOL c134aee953b032e5beea895f0296a1736ead23d82cc2e1b9701d3e187237b4442af824cee3702f3ba2a67d89316ee55ef8d33e8d4224c876f080ad098cc31c81
-EBUILD keystone-9999.ebuild 4402 SHA256 522134285d25eae87cfb549db3160972e42e966efb8381ca43c1e280f662c964 SHA512 921a522e7d8ef01bffcb09744d10506ac6b6d49f8994419091d1a3065364775f905d60da822f53c3e401f56280113d671e9d3c770a8c8867fe9f606573f0593b WHIRLPOOL 39bfec9c30210644cced5dc2b2b8ef696db303854b5d25db52bd8694225df8593b81a2569110ac675265317624f65c36e3af105ccaa6719a9fa80ce88672138c
-MISC ChangeLog 12484 SHA256 dbecd01396ce96249d1d7eefb57b87b94c088c1a6588ccb2900bcbc6796dbfc0 SHA512 ac512f21f5494294c31ee296f720502487ce9deacd57780d36622c478db878536d34b423de9b6eb4c5f3729af74299b8819f28a69b5dab68bdaa92eb57593765 WHIRLPOOL 069640287aa96800f762bc57dedfd9994f457c5f24aa31dae054844f7663f589a6d8d0661cefb3afb5489e6c6557a050039559be32fa06c70e84b39939b74c84
+EBUILD keystone-2013.1.4-r2.ebuild 3108 SHA256 93b1fbb3dd9a55f2bbc1652b3255b6f6394ca3575de91878728e83fb0f28f7b5 SHA512 fcbd32999d5c12ac2ba87d8f9fdde8ee3eb5ef190689adb6a7ae05c77bdcbe9766d938e1f4d014bbefb95cd6196112395fd1e4f6a020989cc38534eecf62bb12 WHIRLPOOL 7b4e6c4d1cd0211850ec7db56355091f2d5832a03482d1df12db11f8dc5e6d5e32186a8d4ebe6dfd05a3604dc1fa3542a75776427ca6f5fea563d5069f26bda6
+EBUILD keystone-2013.1.9999.ebuild 3057 SHA256 a514c974621787ae1625561ef62fb60082f12a14d78aaa747c0151752bcb9af8 SHA512 68a02f884659c3762a2330f4388a586a454ddf8fcc19ac5f454a69167c7080c9977b27d7e085ea36eccb52d02dd1e6e4b5b5dac51b178754202bac64f68ccdf0 WHIRLPOOL 191b24cc36e53d28c3bddd1387bb319cb492a59deaf62e1dd1c1c4aa9133804bad969f176e7dab683a0728ceae7b9e948391df875abee6c85a46ceda04bc8b34
+EBUILD keystone-2013.2.1-r1.ebuild 4767 SHA256 6a04fa03ba0b02afc5e3744734488ead8f9de733928d5eecd79b6b67fc66f78e SHA512 f5940dd8b18c3e532a7ef7331e8d926f4d9acb6faab6afc532ed32204cb3347da44d39ad4b632f91a99725a686cbf9b91a5dd73107dd9a9d99f14aa6706d90f9 WHIRLPOOL a7e1959db159f38c7a2a8d70040a97709e0425051cdaa3cbc781f3ed8d32625ffe7c8335176dce82e344d4c274bd43c4e700bdf81427d54873ee97bd278a4a4f
+EBUILD keystone-2013.2.9999.ebuild 4395 SHA256 5dbdee3a80720d89d6b9eb44801fd0bbca01aa77bd1005a5f05e6936792612e7 SHA512 6412b32640a29783ff8bb71b6e86243128b6fb4f49ddde187eff5468ed6e22154ee1645e8694c43c0b342e27a9a7c64cf89ff54bcd7a0e6d62f5a19954e0e274 WHIRLPOOL 30eb74991df263cd0afc8e84311bb008469a16afa8c248e00eda9c78a5cb9fe46d679b7cc3c7528157f0590b18ec6db25fe0187db41f3748e3dfa4d39919bdca
+EBUILD keystone-9999.ebuild 4381 SHA256 3e9891ca3f756591b3c7f68f0fb8e287c3eaf43ba3ab12cc5b92ed48d9915e9e SHA512 e8ca3d0568fbcbd5b567e6a25d851e4f19749735596261b448d2ed64e7035f586db5d3d5fbfa8b7ec58bf6656e2b958bd4b16db49814838d7d3739953a1ba260 WHIRLPOOL a9bb8b8b5566a9ab8889e4d3d7e20afba8ec31578da583ce6e2852ce6536de064f4ffcf2ec4cf60288d82ce95e0963d218d8b596f9d55a3c119e9066cab8c7e2
+MISC ChangeLog 12788 SHA256 6458f246e5a923c77c57200a76a34ddb553414e1383ec2d3eee3fe8c3a79e3e8 SHA512 baa3e8aa0400e37ce55d72dc4abbab6a86a8ca078e65e6a1572a326b7ae165629c7fc9c4bbdf11386d5b1d19ac0a41fa14c699a984557064e5f1a6a8ad4e8b72 WHIRLPOOL 4e5515719ae443c3a1677dcae64773fa847665503353eba835e45a54565838d980293b265640b394ddc7f8a4b16c6011adfc5b7777de51af7a649ef9db541f53
 MISC metadata.xml 424 SHA256 c89c0232e90df5d811d17941c1594e4c4c45db48c2b6240a3c62b232caad4e84 SHA512 9d7fcca89a6f35a93f1a57790103249cdc25424cbdb374bf26b691e81b27182dc3380a8ff67b77e7aabf4ce944e4a813d619838d4bc97086b4208e5312d76f11 WHIRLPOOL 4ec9d4c5ff5c484c341b06fe77fcac8e6fdd0e0b651dbd58b6f2d5aecd05db5bf70218b94733eb749ced7436f9df5ba5c93496bae06c0ff9a62b91ecb53ab77a
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJS3LtLAAoJECRx6z5ArFrDiRMP/jMqSxbRFiRcCZgWIStMacrP
-vKq4lz+EZfiORQgfU8OZsms0kaMrne8aNX3/3niXhzVOE0EmWXwyMJaC5bXPFH3W
-+VhsAoR4cuyYDXVG4Gft3yb0WI+0PSeHhhT0NJ+BN+9NmJOAWf+f4Nd8+MLG5J1F
-3+I0PYaFkIX3mJ3TzZ5baHzQ6wrSBKnh9HA7EFpxrrkvgKeSzMHfTw7TuiAcXDoD
-GrLUyax/A0+UcEw2khGWYPtMxhwTh/buVKkT/tOJmYDp/2KyciNe2QiZwACcZ8mJ
-MH2G7Iqkgyn+33mNGIMMtk/lhsLPpI+wuAcZDL0Y6XkpFdGaLbUVn4dc1zbBXHPv
-6MjAOtDfKS/dG8J6NIK3qR7Nu0Ov6PEVBmesXEH9BBjQWPRB7/3jTikx512MwmP3
-mKyPJjpJvcCgco45XZ8kztRMLAB9pMC0d6pERWeec97DfozLa2y7evpw7XyGFSHu
-Jz13UbPLblZt12d9qJoRYernEdPbSkMsRgYJasaqMBBdhvzFZidj2Okx3CMoe7EA
-5ENpNtE+AgigYrK1WQbX5BiV+2ESrtZeuGkjJ2XiuC8wvaJpZAPhDYmj2vWYu8rD
-Jvt9QpgyvjiQE51arFciAVxhL4aT8MBsJHQB2XJOc2bk6dIPSbUcRDdValnf4eXb
-HFGptV0/vLK4r2xPhnGO
-=dBVB
+iQIcBAEBCAAGBQJS3L2KAAoJECRx6z5ArFrDdKkQANqiDjSeTlqlwWsVbu3+mTs7
+0IJ9+QCOVX78w6ZU4P8j3Uzmmhp2N4qOwLzdbV9wZRGZsgn2ZBA9AWZwJW9r9Q+o
+tP49AjQoOD9/ZGU5UCWG4QVAWOxMZMnKjStklsIXSX85qMIyu2GJKDIbX6UMtSp3
+VsxFNP/4JvCxqOuRxIBvno3B6lnABlqiFxF8nqZ91zf9EfrjlS/T8qq6lO9G7pyr
+O2WIhU45a4I2PqPH5ht0i0nX6P7KIxrUmkSoIur0M2BHiWuloP0lueGpT+ssPdaQ
+Cp94MCPDesA8gEI/ggoeW6dGp7fohEwbTdQEybLlZkH8AURb/jvzPFRY0tek+LWm
+ShaTa7nRJZJ/tOTgAPSWtsOHuCKKuYJb/aZqmhRP3qcK8qgM6A5trWDli10ga2vS
+0O4gOt+rH7/phATUVSOPfExWJ3W7u7MVgxDRHVazR9lskqR+9mSEXUMKRGI4e8q0
+7Df5jp0yTt1w2e1qvWHTfOZHRnnk2TaGGE41k2usnyBiZl2tJHHe44th1CxeouUN
+1RzwxnCShhdrPwm+/9VbOqDq0OG8ghBKOOO+aCQ44q6sC4gZfZ22V7jd2KJT0xiI
+ZuPQrQtYpr90rpFtIjpQn9LQ5neWAsKOgLdUrBjQLv7hG1klc54Mp0296353rH5y
+fguKd0V1TTQ5bhXgh8jz
+=pTLi
 -----END PGP SIGNATURE-----
diff --git a/sys-auth/keystone/files/keystone.confd b/sys-auth/keystone/files/keystone.confd
index 670ec22b3757..669fa0a7ad11 100644
--- a/sys-auth/keystone/files/keystone.confd
+++ b/sys-auth/keystone/files/keystone.confd
@@ -1,3 +1,3 @@
-CONFIG_FILE=/etc/keystone/keystone.conf
-LOG_FILE=/var/log/keystone/keystone.log
-PID_PATH=/var/run/keystone
+#KEYSTONE_CONF=/etc/keystone/keystone.conf
+#KEYSTONE_USER=keystone
+KEYSTONE_ARGS="--logfile /var/log/keystone/keystone.log"
diff --git a/sys-auth/keystone/files/keystone.initd b/sys-auth/keystone/files/keystone.initd
index f7c4acd01626..c6eca47e2355 100644
--- a/sys-auth/keystone/files/keystone.initd
+++ b/sys-auth/keystone/files/keystone.initd
@@ -1,56 +1,17 @@
 #!/sbin/runscript
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/keystone/files/keystone.initd,v 1.3 2013/11/18 03:24:30 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/keystone/files/keystone.initd,v 1.4 2014/01/20 06:08:12 prometheanfire Exp $
 
-depend() {
-	need net
-}
-
-BASENAME=$(echo $SVCNAME | cut -d '-' -f 1)
+description="Starts both the service and administrative APIs in a single process to provide catalog, authorization, and authentication services for OpenStack"
 
-checkconfig() {
-	if [ ! -r /etc/conf.d/$BASENAME ]; then
-		eerror "No keystone service confd file found: /etc/conf.d/$BASENAME)"
-		return 1
-	fi
-	. /etc/conf.d/$BASENAME
-
-	if [ ! -r ${CONFIG_FILE} ]; then
-		eerror "No keystone config file found: ${CONFIG_FILE})"
-		return 1
-	fi
-
-	return 0
-}
+command=/usr/bin/keystone-all
+pidfile=/var/run/keystone.pid
+required_files="${KEYSTONE_CONF:-/etc/keystone/keystone.conf}"
 
+start_stop_daemon_args="--background --make-pidfile --user ${KEYSTONE_USER:-keystone}"
+command_args="${KEYSTONE_ARGS}"
 
-start() {
-	checkconfig || return $?
-	. /etc/conf.d/$BASENAME
-
-    if [ ! -d ${PID_PATH} ]; then
-        mkdir ${PID_PATH}
-    fi
-	
-	ebegin "Starting ${SVCNAME}"
-	
-	start-stop-daemon --start --quiet --make-pidfile --pidfile "${PID_PATH}/${SVCNAME}.pid" --exec /usr/bin/${SVCNAME}-all --background -- --config-file=${CONFIG_FILE} --log-file=${LOG_FILE}
-	
-	eend $? "Failed to start ${SVCNAME}"
-}
-
-stop() {
-	checkconfig || return $?
-	. /etc/conf.d/$BASENAME
-	
-	ebegin "Stopping ${SVCNAME}"
-	
-	start-stop-daemon --stop --pidfile "${PID_PATH}/${SVCNAME}.pid" \
-					  --exec /usr/bin/${SVCNAME}-all
-	eend $? "Failed to stop ${SVCNAME}"
+depend() {
+	need net
 }
-
-#restart() {
-#
-#}
diff --git a/sys-auth/keystone/files/keystone.initd.havana b/sys-auth/keystone/files/keystone.initd.havana
deleted file mode 100644
index 44be4b82f124..000000000000
--- a/sys-auth/keystone/files/keystone.initd.havana
+++ /dev/null
@@ -1,57 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/keystone/files/keystone.initd.havana,v 1.1 2013/12/13 17:31:30 prometheanfire Exp $
-
-depend() {
-	need net
-}
-
-BASENAME=$(echo $SVCNAME | cut -d '-' -f 1)
-
-checkconfig() {
-	if [ ! -r /etc/conf.d/$BASENAME ]; then
-		eerror "No keystone service confd file found: /etc/conf.d/$BASENAME)"
-		return 1
-	fi
-	. /etc/conf.d/$BASENAME
-
-	if [ ! -r ${CONFIG_FILE} ]; then
-		eerror "No keystone config file found: ${CONFIG_FILE})"
-		return 1
-	fi
-
-	return 0
-}
-
-
-start() {
-	checkconfig || return $?
-	. /etc/conf.d/$BASENAME
-
-    if [ ! -d ${PID_PATH} ]; then
-        mkdir ${PID_PATH}
-    fi
-	
-	ebegin "Starting ${SVCNAME}"
-	
-	start-stop-daemon --start --quiet --user keystone \
-		--make-pidfile --pidfile "${PID_PATH}/${SVCNAME}.pid" --exec /usr/bin/${SVCNAME}-all --background -- --config-file=${CONFIG_FILE} --log-file=${LOG_FILE}
-	
-	eend $? "Failed to start ${SVCNAME}"
-}
-
-stop() {
-	checkconfig || return $?
-	. /etc/conf.d/$BASENAME
-	
-	ebegin "Stopping ${SVCNAME}"
-	
-	start-stop-daemon --stop --pidfile "${PID_PATH}/${SVCNAME}.pid" \
-					  --exec /usr/bin/${SVCNAME}-all
-	eend $? "Failed to stop ${SVCNAME}"
-}
-
-#restart() {
-#
-#}
diff --git a/sys-auth/keystone/keystone-2013.1.4-r2.ebuild b/sys-auth/keystone/keystone-2013.1.4-r2.ebuild
index 15c1edbefefa..41189ad0e4a6 100644
--- a/sys-auth/keystone/keystone-2013.1.4-r2.ebuild
+++ b/sys-auth/keystone/keystone-2013.1.4-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/keystone/keystone-2013.1.4-r2.ebuild,v 1.1 2014/01/20 05:58:14 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/keystone/keystone-2013.1.4-r2.ebuild,v 1.2 2014/01/20 06:08:12 prometheanfire Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -82,8 +82,7 @@ python_install() {
 	newinitd "${FILESDIR}/keystone.initd" keystone
 
 	diropts -m 0750
-	dodir /var/log/keystone /etc/keystone
-	keepdir /etc/keystone
+	keepdir /etc/keystone /var/log/keystone
 	insinto /etc/keystone
 	doins etc/keystone.conf.sample etc/logging.conf.sample
 	doins etc/default_catalog.templates etc/policy.json
diff --git a/sys-auth/keystone/keystone-2013.1.9999.ebuild b/sys-auth/keystone/keystone-2013.1.9999.ebuild
index e87e8c0362b4..cc8ef4e2e284 100644
--- a/sys-auth/keystone/keystone-2013.1.9999.ebuild
+++ b/sys-auth/keystone/keystone-2013.1.9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/keystone/keystone-2013.1.9999.ebuild,v 1.9 2014/01/20 05:58:14 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/keystone/keystone-2013.1.9999.ebuild,v 1.10 2014/01/20 06:08:12 prometheanfire Exp $
 
 EAPI=5
 #test restricted becaues of bad requirements given (old webob for instance)
@@ -82,8 +82,7 @@ python_install() {
 	newinitd "${FILESDIR}/keystone.initd" keystone
 
 	diropts -m 0750
-	dodir /var/log/keystone /etc/keystone
-	keepdir /etc/keystone
+	keepdir /etc/keystone /var/log/keystone
 	insinto /etc/keystone
 	doins etc/keystone.conf.sample etc/logging.conf.sample
 	doins etc/default_catalog.templates etc/policy.json
diff --git a/sys-auth/keystone/keystone-2013.2.1-r1.ebuild b/sys-auth/keystone/keystone-2013.2.1-r1.ebuild
index 73018da07da3..a072f2647111 100644
--- a/sys-auth/keystone/keystone-2013.2.1-r1.ebuild
+++ b/sys-auth/keystone/keystone-2013.2.1-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/keystone/keystone-2013.2.1-r1.ebuild,v 1.1 2014/01/20 05:58:14 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/keystone/keystone-2013.2.1-r1.ebuild,v 1.2 2014/01/20 06:08:12 prometheanfire Exp $
 
 EAPI=5
 
@@ -98,14 +98,13 @@ python_install() {
 	newinitd "${FILESDIR}/keystone.initd" keystone
 
 	diropts -m 0750
-	dodir /var/log/keystone /etc/keystone
-	keepdir /etc/keystone
+	keepdir /etc/keystone /var/log/keystone
 	insinto /etc/keystone
 	doins etc/keystone.conf.sample etc/logging.conf.sample
 	doins etc/default_catalog.templates etc/policy.json
 	doins etc/policy.v3cloudsample.json etc/keystone-paste.ini
 
-	fowners keystone:keystone /var/log/keystone /etc/keystone
+	fowners keystone:keystone /etc/keystone /var/log/keystone
 }
 
 pkg_postinst() {
diff --git a/sys-auth/keystone/keystone-2013.2.9999.ebuild b/sys-auth/keystone/keystone-2013.2.9999.ebuild
index 157787829944..405d807fb031 100644
--- a/sys-auth/keystone/keystone-2013.2.9999.ebuild
+++ b/sys-auth/keystone/keystone-2013.2.9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/keystone/keystone-2013.2.9999.ebuild,v 1.9 2014/01/20 05:58:13 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/keystone/keystone-2013.2.9999.ebuild,v 1.10 2014/01/20 06:08:12 prometheanfire Exp $
 
 EAPI=5
 
@@ -100,14 +100,13 @@ python_install() {
 	newinitd "${FILESDIR}/keystone.initd" keystone
 
 	diropts -m 0750
-	dodir /var/log/keystone /etc/keystone
-	keepdir /etc/keystone
+	keepdir /etc/keystone /var/log/keystone
 	insinto /etc/keystone
 	doins etc/keystone.conf.sample etc/logging.conf.sample
 	doins etc/default_catalog.templates etc/policy.json
 	doins etc/policy.v3cloudsample.json etc/keystone-paste.ini
 
-	fowners keystone:keystone /var/log/keystone /etc/keystone
+	fowners keystone:keystone /etc/keystone /var/log/keystone
 }
 
 pkg_postinst() {
diff --git a/sys-auth/keystone/keystone-9999.ebuild b/sys-auth/keystone/keystone-9999.ebuild
index e6314486675b..d7d253fc6b6b 100644
--- a/sys-auth/keystone/keystone-9999.ebuild
+++ b/sys-auth/keystone/keystone-9999.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-auth/keystone/keystone-9999.ebuild,v 1.13 2014/01/20 05:58:13 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-auth/keystone/keystone-9999.ebuild,v 1.14 2014/01/20 06:08:12 prometheanfire Exp $
 
 EAPI=5
 
@@ -100,14 +100,13 @@ python_install() {
 	newinitd "${FILESDIR}/keystone.initd" keystone
 
 	diropts -m 0750
-	dodir /var/log/keystone /etc/keystone
-	keepdir /etc/keystone
+	keepdir /etc/keystone /var/log/keystone
 	insinto /etc/keystone
 	doins etc/keystone.conf.sample etc/logging.conf.sample
 	doins etc/default_catalog.templates etc/policy.json
 	doins etc/policy.v3cloudsample.json etc/keystone-paste.ini
 
-	fowners keystone:keystone /var/log/keystone /etc/keystone
+	fowners keystone:keystone /etc/keystone /var/log/keystone
 }
 
 pkg_postinst() {