better depends in init files and better memcached support

6 files changed, 13 insertions, 12 deletions

diff --git a/sys-cluster/swift/Manifest b/sys-cluster/swift/Manifest
index fa2ffb8..db16b39 100644
--- a/sys-cluster/swift/Manifest
+++ b/sys-cluster/swift/Manifest
@@ -1,8 +1,8 @@
-AUX swift-account.initd 881 SHA256 7278241b34cea3d3544bcf3d64f406e5cc37250093f51cec160c7ec265f122a4 SHA512 f9bc66fd410cbc306075377ca89cf50c8a33630b2cf4020294f33fe83f3531eee10c08997f910c4ec6148925e6f36aab0cd56491770cdfd6ffcaaf4e8eeadffc WHIRLPOOL d51b2de925235f0973163728d1c0bec15bd201c5786c5a38ef7d655c24aef56b63a0c912e77a47e6b9afd194c9dc325695f78c45a82196558ef583a8a7800a72
-AUX swift-container.initd 891 SHA256 82d61cfbe600f782e0f408366be5283e52ecb503dfa24ef2b56080bb3fae997c SHA512 82bc22570a57620b7497368de5a4b79d5ee87599e39ab9cd6ab5a28c606646ca2d4eb70f469acfcac3d51b2f3bb58e6386f033d1aee679d13366bac98999fafc WHIRLPOOL aa1dcaf9e21acab942d463f109eaaa099f9bebb638259db75956feadad1f0f0df530661e0bc469717aa6a9524c69f40efa0103ac076a31a34df2ddb42b738e1c
-AUX swift-object.initd 876 SHA256 a3ec074cd0ef70b3b641e86054519da3a4fa18a320bd91a7d6e18b9df9ef5cf0 SHA512 803165e74e1fb5326d8520444f968d2a987dca454f9b5347fd4ebe1ab5e95093641450596da2543be9485b11be350b47873c3a1887682cd025f85231cec2767a WHIRLPOOL f2fc932d4992771edb633332cc2f672c25828e25da677a0db4bd5b6c815f89fda623927a032f45c836574ee4402d632f7dc6dd41e67b2adba9882233ce106bec
-AUX swift-proxy.initd 1393 SHA256 5b8cfd787dd47468fef31e261ef9529db32e9a2c540c586f9f20b829cab51a4c SHA512 f45253ff68bfb6e5149c0823c5b9692b37e9037f0e12eca32c7c1a28f8877bcdc255a0efd461e170df5bebdae427dd13f312da43525d6e946e32366371362070 WHIRLPOOL c234643758ccf75b3843cd6a65bc3679370cef072eccea7b6470440c380bbe24a687eac6381ccf9a904985e367e4b45930184d0f6a6d1bb4ee6f830f379d5da2
+AUX swift-account.initd 882 SHA256 d95e032cc56ea009da763dff4b6bca9c0c7a90ec7c7246e11e33cab6f2171fbc SHA512 69f0ed11ea27cda895c301c6c9c6b9de415d2edc2b47de8d145faf21527d052904273830f52c7b70415ce4304579b1be6f4c9d7f40f0b2fdf8a0734e298bbf1e WHIRLPOOL 27977b06a1f63111f9f9193e3b5f5555a7bf4228a5647e7061a91e764a199c757d2b02b1939297c0aaf6eed51982bf1f85e5128457a0dddfb9965df6a353d834
+AUX swift-container.initd 892 SHA256 e6fe709688fe9fe97c5fd242747bbeef3f581711845b6219fdcab317146f124c SHA512 33a500373fbe6f8984eb287824963906f2af53f604b225f173f2e880c5efd87fa9be0bdf78f34a4123dba87a6e3b6afd8c04bbe9a68911178fe69987f5eee48b WHIRLPOOL 6e2562bf10fd9ed5ea409ddf76ce8f333c2d8b7245b16e39443878a82681136c66f9a39c8a0e85b84a30b38d04a5b268367c45ddaa85338129bfa23ad5973f83
+AUX swift-object.initd 877 SHA256 22d529497e876a43b09a37238c90c6c46517973872850377014077c23df54857 SHA512 a2bbb3f3bdab0130748b0041d67da1064508ffad9578cce14361106a52bed7ef9cbd87d42ce23c74e86c3d8ac569de82b7d3383b3facbf7c37ebf9d2573d2516 WHIRLPOOL 75d77f037a1809e54548432d989d3efc8759eafd6e38eaf744cdcc1da3174cc9fc3d3ebc6992ffd56f8cde9454669d010f7940f6a0601c648fcca5344204f635
+AUX swift-proxy.initd 1394 SHA256 abd2aa12882c58ddb00a70a72fe74ce42e5aef0c861063e33e34643b26addc7a SHA512 05dde5c9e5778345cd00fa32683e102deeb9f98b526b8c01da2ab6f0bb5a4915872a5c800d9fdc976a7c40ad77b154de46d2422ea2ee897fab9c032f9d030376 WHIRLPOOL 965799071d7ca4c5442f3be738473b01655d17ac46765eb4bc72db18962fa41303887f48e4cc96990606b244f213dd70ea79f7fa5240db9d3a94c9daa9f00dff
 DIST swift-1.7.4.tar.gz 461286 SHA256 5c927cfd6aeba38689c1b8e0d1b6fd697999ad56012f6a4aff011d6018d55cd2 SHA512 c7527593beaede09a70e92b85823eb4661992a568377aea6254c7470dddf9ab64238361c84298b1c046c05abb781507bd7634fdff05d30c1e35e465d7f86cf78 WHIRLPOOL f78325e57a02a34e3f4a052778604115df71f2225861b6b4e9516c25d9b83d7bec7251de34da98f34618b7b586eaac747948192822f2998f3ddeb23fc12f999a
-EBUILD swift-1.7.4.ebuild 3304 SHA256 db013bef9cc3079aaf26f1d9f85005ff7e0b659fbc5df39f8c67259bda6a7d2c SHA512 5a9901c03b754da83ae807e24bb253da03c3118f4001c85ba022f2b7ddac32d2217ac5d3fdbb5982be5bbfa19be04308aa251b14052f1056b39db149f638d017 WHIRLPOOL b76832c2578403b7c7d429b49e40cfe909985cf9e9ec8d79ba6f1557314d3907c7179bacdc65843ad2493f3194b3df3d2055587f2c4c42f472a7f2e328ec289c
+EBUILD swift-1.7.4.ebuild 3365 SHA256 107c405df1cddda5c7fed07b8cba9edba9a981ae6f43f6f5efdc83e3d9d781ad SHA512 16189640a0315f740d6c9140fbcce59554db71f9b6cb491e8f95cdd646861189b806f72d83cbebb1a4e6125b05de96174dcbe7ce040aca72fdbbd11cd8b910d2 WHIRLPOOL a629ade49e6fb0ed4891c1aad8395360afb0beaf4e0cfb87a4972fbab02ab6a762a22ee8d01da4ce7987349ff7d6fc1b89479d7071bad0ca287446faeafdecf5
 MISC ChangeLog 380 SHA256 b66d44e1c09f502aa77ecb43804d948b25876cda652c23a303fa9ba82b6575dd SHA512 c8ee612811758a02596ae00b0ad739fa3e828880a610bb60d49d8ba18f1810578f4d0cb738d43d2480ecb7a8e34bf2e642042f06d1cb9f2d1501868a2d68c52a WHIRLPOOL 30a86afe00b7365f693a22e4a1078c41f289d8d07975b157b2a1556e5bed075b08adb2d10bfb7bb38c266c0e24680bcbd978935afff686142a0c3c0c4c621625
 MISC metadata.xml 386 SHA256 7ec5608fefa5f710bb2feeee1cf65c6d5d97c215e041ff996c05ab72096a048a SHA512 58521380599a366ccad1cc1da26d75e5356f55fe7d6ff2a25a5888fe34a4e18401429296e2e24100f4d33f9ff02123f14db7a3cc04833f8970c97be7451664b1 WHIRLPOOL 0e7f1c0f6b1dd7f3d3f30a652f819ddf6588f98f0b3a1239cd7ca8ae8f3e5d166b04ed652a019106d53d8faf59c3bdbb73d37a89dd3f70c009964d6fa6727da1
diff --git a/sys-cluster/swift/files/swift-account.initd b/sys-cluster/swift/files/swift-account.initd
index 6002820..88fe05c 100644
--- a/sys-cluster/swift/files/swift-account.initd
+++ b/sys-cluster/swift/files/swift-account.initd
@@ -7,7 +7,7 @@ COMMAND=/usr/bin/swift-init
 PIDFILE=/var/run/swift/swift-account.pid
 
 depend() {
-    need net
+    after net
 }
 
 checkconfig() {
diff --git a/sys-cluster/swift/files/swift-container.initd b/sys-cluster/swift/files/swift-container.initd
index 1ac9c80..0cde618 100644
--- a/sys-cluster/swift/files/swift-container.initd
+++ b/sys-cluster/swift/files/swift-container.initd
@@ -7,7 +7,7 @@ COMMAND=/usr/bin/swift-init
 PIDFILE=/var/run/swift/swift-container.pid
 
 depend() {
-    need net
+    after net
 }
 
 checkconfig() {
diff --git a/sys-cluster/swift/files/swift-object.initd b/sys-cluster/swift/files/swift-object.initd
index 8092981..0c547fd 100644
--- a/sys-cluster/swift/files/swift-object.initd
+++ b/sys-cluster/swift/files/swift-object.initd
@@ -7,7 +7,7 @@ COMMAND=/usr/bin/swift-init
 PIDFILE=/var/run/swift/swift-object.pid
 
 depend() {
-    need net
+    after net
 }
 
 checkconfig() {
diff --git a/sys-cluster/swift/files/swift-proxy.initd b/sys-cluster/swift/files/swift-proxy.initd
index 3dea8a0..54ba467 100644
--- a/sys-cluster/swift/files/swift-proxy.initd
+++ b/sys-cluster/swift/files/swift-proxy.initd
@@ -7,7 +7,7 @@ COMMAND=/usr/bin/swift-init
 PIDFILE=/var/run/swift/swift-proxy.pid
 
 depend() {
-    need net
+    after net
 }
 
 opts="reload"
diff --git a/sys-cluster/swift/swift-1.7.4.ebuild b/sys-cluster/swift/swift-1.7.4.ebuild
index a50cbc9..21ee191 100644
--- a/sys-cluster/swift/swift-1.7.4.ebuild
+++ b/sys-cluster/swift/swift-1.7.4.ebuild
@@ -71,6 +71,10 @@ python_install() {
 	if use proxy; then
 		newinitd "${FILESDIR}/swift-proxy.initd" "swift-proxy"
 		newins "etc/proxy-server.conf-sample" "proxy-server.conf"
+		if use memcache; then
+			sed '/depend/a\
+    need memcached' "/etc/swift/proxy-server.conf"
+		fi
 	fi
 	if use account; then
 		newinitd "${FILESDIR}/swift-account.initd" "swift-account"
@@ -85,9 +89,6 @@ python_install() {
 		newins "etc/object-server.conf-sample" "object-server.conf"
 		newins "etc/object-expirer.conf-sample" "object-expirer.conf"
 	fi
-	if use memcache; then
-		sed blah
-	fi
 
 	fowners swift:swift "/etc/swift" || die "fowners failed"
 }