prometheanfire 15/06/17 21:12:59 Modified: metadata.xml swift-2.2.2-r1.ebuild swift-2.3.0.ebuild ChangeLog Log: standardize on memcached as the use flag (instead of memcache) (Portage version: 2.2.18/cvs/Linux x86_64, signed Manifest commit with key 0x33ED3FD25AFC78BA)
Revision Changes Path 1.5 sys-cluster/swift/metadata.xml file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/swift/metadata.xml?rev=1.5&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/swift/metadata.xml?rev=1.5&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/swift/metadata.xml?r1=1.4&r2=1.5 Index: metadata.xml =================================================================== RCS file: /var/cvsroot/gentoo-x86/sys-cluster/swift/metadata.xml,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- metadata.xml 15 Jun 2015 19:33:10 -0000 1.4 +++ metadata.xml 17 Jun 2015 21:12:59 -0000 1.5 @@ -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> 1.2 sys-cluster/swift/swift-2.2.2-r1.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/swift/swift-2.2.2-r1.ebuild?rev=1.2&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/swift/swift-2.2.2-r1.ebuild?rev=1.2&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/swift/swift-2.2.2-r1.ebuild?r1=1.1&r2=1.2 Index: swift-2.2.2-r1.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/sys-cluster/swift/swift-2.2.2-r1.ebuild,v retrieving revision 1.1 retrieving revision 1.2 diff -u -r1.1 -r1.2 --- swift-2.2.2-r1.ebuild 14 Apr 2015 15:25:39 -0000 1.1 +++ swift-2.2.2-r1.ebuild 17 Jun 2015 21:12:59 -0000 1.2 @@ -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 @@ 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 @@ >=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 @@ 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 1.3 sys-cluster/swift/swift-2.3.0.ebuild file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/swift/swift-2.3.0.ebuild?rev=1.3&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/swift/swift-2.3.0.ebuild?rev=1.3&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/swift/swift-2.3.0.ebuild?r1=1.2&r2=1.3 Index: swift-2.3.0.ebuild =================================================================== RCS file: /var/cvsroot/gentoo-x86/sys-cluster/swift/swift-2.3.0.ebuild,v retrieving revision 1.2 retrieving revision 1.3 diff -u -r1.2 -r1.3 --- swift-2.3.0.ebuild 2 May 2015 20:46:02 -0000 1.2 +++ swift-2.3.0.ebuild 17 Jun 2015 21:12:59 -0000 1.3 @@ -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 @@ 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 @@ >=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 @@ 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 1.46 sys-cluster/swift/ChangeLog file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/swift/ChangeLog?rev=1.46&view=markup plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/swift/ChangeLog?rev=1.46&content-type=text/plain diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/swift/ChangeLog?r1=1.45&r2=1.46 Index: ChangeLog =================================================================== RCS file: /var/cvsroot/gentoo-x86/sys-cluster/swift/ChangeLog,v retrieving revision 1.45 retrieving revision 1.46 diff -u -r1.45 -r1.46 --- ChangeLog 2 May 2015 20:46:02 -0000 1.45 +++ ChangeLog 17 Jun 2015 21:12:59 -0000 1.46 @@ -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 <prometheanf...@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 <prometheanf...@gentoo.org> swift-2.3.0.ebuild: removing unneeded (broken) patch