standardize on memcached as the use flag (instead of memcache)

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

5 files changed, 33 insertions, 31 deletions

diff --git a/sys-cluster/swift/ChangeLog b/sys-cluster/swift/ChangeLog
index 86765ca23e37..8961822e310a 100644
--- a/sys-cluster/swift/ChangeLog
+++ b/sys-cluster/swift/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-cluster/swift
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/swift/ChangeLog,v 1.45 2015/05/02 20:46:02 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/swift/ChangeLog,v 1.46 2015/06/17 21:12:59 prometheanfire Exp $
+
+  17 Jun 2015; Matthew Thode <prometheanfire@gentoo.org> metadata.xml,
+  swift-2.2.2-r1.ebuild, swift-2.3.0.ebuild:
+  standardize on memcached as the use flag (instead of memcache)
 
   02 May 2015; Matthew Thode <prometheanfire@gentoo.org> swift-2.3.0.ebuild:
   removing unneeded (broken) patch
diff --git a/sys-cluster/swift/Manifest b/sys-cluster/swift/Manifest
index 3657b2129b32..90907a025a40 100644
--- a/sys-cluster/swift/Manifest
+++ b/sys-cluster/swift/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX cve-2015-1856-master-kilo.patch 11096 SHA256 c57f05cae2a7543a757222ea3bd6543789c4d6abd73e85b6ccffa0a5ef8b06a7 SHA512 65b4d016f11fe97efa95749e3033aefbc06750cbc1e17ece245bbd1bb6bf20c9cc65d14fa10e763188cd49648413e8cd88b8684b0502ac8596fd25d214f89afe WHIRLPOOL 8ba9422600bd6edd220c949c15e651371b416f0600953429b641d7575902176ea021c6d628d549ddbdc97945c24919b77f9118a350af9a28a599bb86b130300d
 AUX swift-account.initd 992 SHA256 a920abae629964eace9edb9e15e754bbb6765dcd6845a7f2819ed07831ea7c8b SHA512 f2ff3a7054a240d58c8b6584539365908fabcee8fdbe067dba2fb6562306a96f94450ed56a93c16e985813e266e7e0afa34e921b8d9bed754bbd85c5dab85670 WHIRLPOOL 757ccd49fcf9afbfaa5f3f7df3ee45cd30104b1c5f190a10f452bdbcdc5c1dfdc6cd9eae85d2c60c80a062f56af2cad7bc7ce80dd552ac0e812a1bc2f0e72a8e
@@ -8,26 +8,24 @@ AUX swift-object.initd 986 SHA256 e53fd0e15faad19da10258d9857f24ceb0c589d06bff57
 AUX swift-proxy.initd 1502 SHA256 65e8d40f51324e7c61121ea0d38b607084d9d1bec0859cdefb8b09a86ba993cb SHA512 17e9875b3e7f5dfaa1681279cb59708dfa12fdd866a5fb9c3968dd081a4c95d0bc51ab652916073b0b42b2ce9cfbf997093ce9c0e5d4c66b43242ef4f6dd7387 WHIRLPOOL d800071bd7e44e97ef97f4beff5f4aa8c932a01c8ddd067b3f5b1d7256554cb1d9d8eac80b738198cb3870fb88b7cf11ef41e8b842b8b898e510a11b376c6570
 DIST swift-2.2.2.tar.gz 1038850 SHA256 d97ff8e3c1381611ca2f9cd3eb13000e3339166e06d67ec079ce9ec958d1a088 SHA512 5abe34679305df18dabf49e6e9a6ddf7b890718a4586b1a33cadf0eb47412861a4af53d6124d2a238e463603d11b134a5afa2867939cb3cea49774ae9601d8e6 WHIRLPOOL 57f7364c0e2fa9094837b7127d4380df52a263150be05d84142e1d1256911d0466e7098a7f2a0380b087fb5da313d5a65a973f42b1e39bc102be46f21000c8ef
 DIST swift-2.3.0.tar.gz 1346492 SHA256 7225061f92597e7eaf6196c9336c5e590c7626b7e84126c51e8ca5bf5b7bdae1 SHA512 cf8e1e640f1f679516ce1af772c93f860d7d1f1b6712fa9b89dda1688a4b02cd3fdadc443f4911be5927544f0cffe365ff4174ef6e44d118cb56c7b05cd630b9 WHIRLPOOL aade05a7b8f23e680aa932150e8edbc2e9b6bb83528ffa62becdf4d29c8597b20e873017c3c6a95e66448c13c60531abee6ed0bd9b524b6319642c0436ad5e4c
-EBUILD swift-2.2.2-r1.ebuild 4091 SHA256 e636fc3daf38751da971e52573888bbf9a13713effff418ef71945dc0d542f04 SHA512 018521764c18349ba0e9d32a0418103c861bb1576ea57c080ae7656cb6839bf10c9d40bbedbf7b6a99d25dfef194aa16fdf82e38297a59a0ffa9a5417a81b333 WHIRLPOOL 076d22eb72af072f882f018e9c42e95e84b898c2a43b19c743413dbb36eb449deebf46be4966bdd43c1370a4cfdf10852edcab69874bcd243c85aad83a077a3d
-EBUILD swift-2.3.0.ebuild 4136 SHA256 79a0d9ce0616d3fb761de99c0f567e9eb04987a97376e5a3993e0c6978782044 SHA512 9c8ffcc0a5df0850b5bee55697889cdb32d5b11522f1ee9ab19d19af16e2a61bb4ec7b11441b2c0b8f2b1123ceb5e1a27f3a695ce7f14244ae8a723dfd269e7c WHIRLPOOL a0b2eb1f3fe848202e4aa93e3661045e4ce765475b5fa116b9bd1bc8e9a703edde857231612a2fd718c15e096b01a523a20d509224b7f2123356a9ef68f896ff
-MISC ChangeLog 7975 SHA256 80720ded2cb164d6826efd7384e92d2892e26c8cadadba2364ff6c1a183667ac SHA512 c08f7c4d3abd4b0948a118f544d13eb2ab47453e55579907d64cbe496ed658d6f4a29e073d0d3fecf5611ec5e885e54bbf9ff33c966c636dccaf74907c5e227b WHIRLPOOL d723fa4cb3300e7ef4b73e76b709294e3fe9b34c9070a1603efeaf5bf49ae5e83b66e74831dae76b36c80441e938db2aabc05929c57f0a74a67ce70a6ab9b98e
-MISC metadata.xml 794 SHA256 6a648df240ff06cb2e1513fc8cb1e281aca0fba86e1f21bd2d733448a55c9240 SHA512 f784d06632b45153702579dc090719c857f11d967e7f3f5a7fa7c6ef7b59ee7093c25f04bcde426e906e99dfa964c3647cc7e675e2aad0d9b48f9e28221aa4f7 WHIRLPOOL 4f6c3cdab89a7828f80d48f2653d720b810b4012a863712655cdcdfcc5df02e0e5ab43be5999d7fc697708adedc76952b3f6b8cbd8a011505badd73ab5c3eb04
+EBUILD swift-2.2.2-r1.ebuild 4094 SHA256 46ff7cca2d7ed02c63fcfb99f9e6c14def6b6287cc21ea35f35a94096620e0d5 SHA512 368f741e2fe1b0d531f6cef7a87921671408a54c7c5d9c2b534b523ecee0dd406a257fc763058b4855fb0b30f2cd143647614f7a770bad4e6e644d1c367b63c7 WHIRLPOOL 1b3bc33510dbbe02425a1b373547eb477169f0ecde2bd19462a501775b0d32c2d4493ae09b8854bbc11ffe5aa5d41c4166b9289b36f25c7e304e362749afe73c
+EBUILD swift-2.3.0.ebuild 4139 SHA256 60ba804e0d67012dc788fdf11a6b6b96be72621c8944f4e4fd1520e46861ab4b SHA512 bd80e83956e788db493d7d7b490f3a7160edffaa552c566b69ffedf1d72dd63cca6c8910d5d39a46973b4065e70b133a3153915c665eb5ab918731c90e553b8b WHIRLPOOL 88ddb8763e51692ad065e792d6dbdfdab64be142ff98f49c1544f363cc9bbf8cb331002688c1bd7a5aca66101cf92b988b50c7ae4426f418ec047c40c1afee0b
+MISC ChangeLog 8157 SHA256 eef66125b516971dd6629a694a0b93ef03edddff00031d95b275b1a0e15a1e0d SHA512 723ead41ede471439b96582ae834c48eb592449d4737ed240105656d64002ecae2d8727af56f9aa3933b7fca40e152b11584cf8e181824603ac674fe45f993d7 WHIRLPOOL face64805233974aacff7df82a9d4a9f01ac96ecd2bf968dd0865d37cb1d84e53ab8e9e888849e15f53896e9605805253db1e374db1b46b80e4e41a86e1d22a9
+MISC metadata.xml 795 SHA256 45f35ebed31acbb4832ee4ce5aab007c70fb011373bdcf1a0d8764c75d82f054 SHA512 2db43560576bfbb1118e6203fdd95eb59ad00818f543d0d62e4e8f317cd4161a4c1dd72f40554650bec2d2274ddbb550b6a42988f9d98017d0f22e677a1a0eea WHIRLPOOL 01e560e383157c568b3d4d6e473f1495f05d4bca44ab84535edbee60843895f7ce71c2f827be37414848e98f42575972cec803035cbe72cbf05698e1ca2ec8bc
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0
+Version: GnuPG v2
 
-iQJ8BAEBCgBmBQJVfyh2XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ0QUU0N0I4NzFERUI0MTJFN0EyODE0NUFF
-OTQwMkE3OUIwMzUyOUEyAAoJEOlAKnmwNSmifwAQAJmgAWCR6IB1dNzNTrntQb8g
-Tk5DZIc5mfxU6ksMeB458iVy2VQdSYx4M/gHXPd+NXCzChx1B/jaOJ/O9HD2J5nx
-BhBQGETxdKRdVhwfAAMVA88wMXUrwhNhe4TxMp4SFisD5/XM/MWaWftc2x4XyEjg
-a/L7uF1cIXrrqD4e86EVHDy0SLUbrNShwB+QDjQFtlGZukUSam2dmOb/GPcRxfEP
-vIceFouQzB8qwijas2CZY40h4r9uMQ3dfQT2wMuXW7tA4Vkd5LafH6UQyyRH1dyU
-loEzumy2c99I1xncMmnjNyZhx6G0UBJLxSu767BZ7OWPk4TL2mg6MdK56YH+sSN8
-5hFtQOvWfCEX684nheOK0KsIYttcHEySrAJczsTCAFaOfYfKwPKeJZnWent4B4Dp
-nqaLvq9cQTAhAkxIiB9svvJaJvKudU5DMMwljpdsOYiCBXCp+3qaattzw5VPGGXL
-AyKdNp2JhUbL2G6vzdjNa0GzFwsooByAs5+CBWEVZG9POdJmwA1swZfc8RGkWwZa
-bLlwZqQtplBqHbrAKSosuSzeW/kZ+eK6Y3+NFE5pvnP3fXZ9cKt2jSGgUGjjvM5g
-qxOaolGVlgf8YSiGn+lx+rjUpFg7aEVhbbXGpWevpVRfgxaP0MXCr/SGTPgaP+By
-zrssQn471xSYcIPiLnNC
-=IWlp
+iQIcBAEBCAAGBQJVgeMXAAoJEGSje+quGaToyBwQAL//jd9IRB4OIs2aBGaDzohs
+//SxZfgiuavNGdxzKEEzHRT3W6P8HTfHJ483e0TbSNJpu+PuCuJRkFPiYOS5mSmo
+cL9QZbJkbyFbFYwXcxIREFUY3TaFbHCmQhYdiCXzkigGMPz8K3D1DwjQ908frJ+X
+plmC6dZR/e5GrjTmvXhIpqs/Rrh17E8F/tThRSr47UErbAbVadWoEDWdzafhWuGK
+keOzRH2QPySgG1oV6CF8e2Hnhpr4t8h43e5NBpz7/lvDTQaXRO2vNJ81JAv+pupx
+3BQJn37DXmbqqLp34bpV79Khk+QwjOqikt1QRYYcxiFU7YVYKIGlKV3b3EyEcbt3
+1CnpD6dRGDq9atxXf2EcMQgSxHwgTQhIgnyW32lcxALrM3AfzA+p7LkJMFCuYBSu
+GELPQ3pstkSsIWcd7nkfO1DtvVyRJw+W2jNAGr6a/8tev7eZ9F+hKC5NM4AjU2CV
+g9ewMZn5mRna77+rohFMf+llXd8+CEVbW8skzTd0kSPOevfmwJeKPjTR/esryPCe
+dUdTESB2hAbzZdhjxSnQHz8tKeknTrxFFE1FgihLntVvMLumCSXXaJ0F6PMjEOBz
+bHPxtwZ1m1ySP7RJztHXB+yG8HSQivK9P+h3rZ3BNbL8Xew/2e8hnE4ktFMN5XqR
+ttP4zjk27apLNLMBM42W
+=4Az+
 -----END PGP SIGNATURE-----
diff --git a/sys-cluster/swift/metadata.xml b/sys-cluster/swift/metadata.xml
index 68889444c8f1..9f7df66f121e 100644
--- a/sys-cluster/swift/metadata.xml
+++ b/sys-cluster/swift/metadata.xml
@@ -5,7 +5,7 @@
   <use>
     <flag name="account">adds swift account support</flag>
     <flag name="container">adds swift container support</flag>
-    <flag name="memcache">adds memcached support</flag>
+    <flag name="memcached">adds memcached support</flag>
     <flag name="object">adds swift object support</flag>
     <flag name="proxy">adds swift proxy support</flag>
   </use>
diff --git a/sys-cluster/swift/swift-2.2.2-r1.ebuild b/sys-cluster/swift/swift-2.2.2-r1.ebuild
index d876a07e04f5..4cefcdda2f8b 100644
--- a/sys-cluster/swift/swift-2.2.2-r1.ebuild
+++ b/sys-cluster/swift/swift-2.2.2-r1.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/swift/swift-2.2.2-r1.ebuild,v 1.1 2015/04/14 15:25:39 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/swift/swift-2.2.2-r1.ebuild,v 1.2 2015/06/17 21:12:59 prometheanfire Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -14,7 +14,7 @@ SRC_URI="http://launchpad.net/${PN}/kilo/${PV}/+download/${P}.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="proxy account container object test +memcache"
+IUSE="proxy account container object test +memcached"
 REQUIRED_USE="|| ( proxy account container object )"
 
 DEPEND="
@@ -47,7 +47,7 @@ RDEPEND="
 	>=dev-python/pastedeploy-1.3.3[${PYTHON_USEDEP}]
 	>=dev-python/simplejson-2.0.9[${PYTHON_USEDEP}]
 	dev-python/pyxattr[${PYTHON_USEDEP}]
-	memcache? ( net-misc/memcached )
+	memcached? ( net-misc/memcached )
 	net-misc/rsync[xattr]"
 
 CONFIG_CHECK="~EXT3_FS_XATTR ~SQUASHFS_XATTR ~CIFS_XATTR ~JFFS2_FS_XATTR
@@ -90,7 +90,7 @@ 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
+		if use memcached; then
 			sed -i '/depend/a\
     need memcached' "${D}/etc/init.d/swift-proxy"
 		fi
diff --git a/sys-cluster/swift/swift-2.3.0.ebuild b/sys-cluster/swift/swift-2.3.0.ebuild
index 435aa1bceb31..b4d563623fe7 100644
--- a/sys-cluster/swift/swift-2.3.0.ebuild
+++ b/sys-cluster/swift/swift-2.3.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/swift/swift-2.3.0.ebuild,v 1.2 2015/05/02 20:46:02 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/swift/swift-2.3.0.ebuild,v 1.3 2015/06/17 21:12:59 prometheanfire Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -14,7 +14,7 @@ SRC_URI="http://launchpad.net/${PN}/kilo/${PV}/+download/${P}.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="proxy account container object test +memcache"
+IUSE="proxy account container object test +memcached"
 REQUIRED_USE="|| ( proxy account container object )"
 
 DEPEND="
@@ -49,7 +49,7 @@ RDEPEND="
 	>=dev-python/simplejson-2.0.9[${PYTHON_USEDEP}]
 	dev-python/pyxattr[${PYTHON_USEDEP}]
 	>=dev-python/PyECLib-1.0.7[${PYTHON_USEDEP}]
-	memcache? ( net-misc/memcached )
+	memcached? ( net-misc/memcached )
 	net-misc/rsync[xattr]"
 
 CONFIG_CHECK="~EXT3_FS_XATTR ~SQUASHFS_XATTR ~CIFS_XATTR ~JFFS2_FS_XATTR
@@ -91,7 +91,7 @@ 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
+		if use memcached; then
 			sed -i '/depend/a\
     need memcached' "${D}/etc/init.d/swift-proxy"
 		fi