bup

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

3 files changed, 138 insertions, 15 deletions

diff --git a/sys-cluster/swift/ChangeLog b/sys-cluster/swift/ChangeLog
index 4a334db6a068..6337414f65f8 100644
--- a/sys-cluster/swift/ChangeLog
+++ b/sys-cluster/swift/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-cluster/swift
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/swift/ChangeLog,v 1.34 2014/10/11 22:15:17 prometheanfire Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/swift/ChangeLog,v 1.35 2014/11/18 19:27:57 prometheanfire Exp $
+
+*swift-2.2.0 (18 Nov 2014)
+
+  18 Nov 2014; Matthew Thode <prometheanfire@gentoo.org> +swift-2.2.0.ebuild:
+  bup
 
 *swift-2.1.0 (11 Oct 2014)
 
diff --git a/sys-cluster/swift/Manifest b/sys-cluster/swift/Manifest
index afb6a9edbe26..7f27dc6cb061 100644
--- a/sys-cluster/swift/Manifest
+++ b/sys-cluster/swift/Manifest
@@ -12,27 +12,29 @@ AUX swift-proxy.initd 1505 SHA256 8e1ee2051116e869f5e51de426d640c7f57278f1fc2681
 DIST swift-1.13.1.tar.gz 802273 SHA256 cbe6e807c0c0115570fc3da4dd7e3f3c2477fb48f865f29d648fb5714734eabd SHA512 3a18df9bb440723ff88429bea215b25b2d3790193bb1e0bef155c8cb9c260db79099794145ab7bd3a99eb25e8441cf527c82a803408078212ca0145cab8c2258 WHIRLPOOL ba10c6e110eb6b7de99b6f6733e05bb092837ce3e6aefdc0a74a9fc693625dbf3f182e8c637dbfc07d3f6ecca8fa26aebc89ba65917d952551793b28689f9523
 DIST swift-2.0.0.tar.gz 947369 SHA256 2dbe98186d6c78ab3e57708dfd46416f3a33001d94322b33e8f7a0c722a976b4 SHA512 c7f81771ae76d2b86da80d3c199a4bea84f2fe9968adaac658d56c4717c3f33f0de9e01e8bceaaa1875762ce28a943eee80f33d84e1bbe966e0e95750c01bc72 WHIRLPOOL 5db150dd48611eacc179066b633a8fe3ecd2d7e76b3dd8a76438027a79729df07ef0b189b88623505e645efd3d146a6b1b1e74dd7a2c57acee1fb88f239addfd
 DIST swift-2.1.0.tar.gz 957329 SHA256 8e4ce540fb8221a010190dc901cb076578de18b1b370bec38d3cf9739e664dd5 SHA512 4b064d00b18276a2669ba212fafddbaa03000caa8c88032f306e568e2ae100197b98f66eb4f1232a7ddab6b6a389d92455e0f76e501104e2445c9375ec047128 WHIRLPOOL 69231b596c7332dfc4b9bb905d184192cda9dd40903521de229e583ff5dd5c3c9daccc0b1d1b6a5068c373d55fb0a8fdae6f56bf881edfe6608482f8fe66b9c8
+DIST swift-2.2.0.tar.gz 996021 SHA256 be3bc94faf57af64f689bbe65855624ea711ada1eaf55d234a0536d76b3065f7 SHA512 606eaa777dea842588d59b3e751e346d144fa82312c40d62e7158f148da364686d29524fc7f5f1b3b9b3aab88332fa4a0515bb2fba5bcd310a2a0aa8572beaf6 WHIRLPOOL 8922e70afc797664e1aa70b5d43493c92ca7c44c3143fe028474b796cb76724b502db3d95a885e7c3bf427e1313a32c14844c103d9a260a841cb21d7637ad355
 EBUILD swift-1.13.1-r1.ebuild 4015 SHA256 e4d8f924f067ac8f6061d895e05cad1797d4556bbe642eb9257a29702a929a83 SHA512 4ff489f2a40719d5b3663cf8d353ded1238a11820744130a5c035b91fb5d55a0651ba09f8ae91bf5bceb5ac7a2f38b22118c0b63266ae882ada8c0eeb8e8ce2a WHIRLPOOL cd07326709cfa9d3e3036b21713e29ecb162115c0025a2fbb8c01d814c7864a6dd13620683e435699da24598771a1b28aae86bb07c6b6d94fef32ea366c1aaa1
 EBUILD swift-2.0.0.ebuild 4073 SHA256 b4f1b6e9b412562df4425d69164c68601cef9cacde83d4cded98f6e50b7ee367 SHA512 8cdfd3e297103699e3a6105575aff6a70c7eba93cba938ec1af59b7db9cd6641e5ff5747d6391ee6ad9a917231ae8a1344734ac865bd22bf4c8e34d187d27015 WHIRLPOOL 1893469bd42290b058a6b0824d6e3fdce0508214e0621185c61d75b3cfae19f023ed5bd8b2b266fdd75c4fec54a69c0340726a7adc5fd03e02a3ecc5749f69e1
 EBUILD swift-2.1.0.ebuild 4118 SHA256 37c4249e7a75b37f66bd7231151e67fbc509a7c66e5fb3de0427828639560621 SHA512 3e7930d3004e05093a320311c667975e0eb0357356d90ff2c4266f23d1ba4ce1fbc0d2560d1bfd5f5469c17f173a558f37d353941f0b653b1d95534f87c0a61a WHIRLPOOL 9e4231b6ed471bf6c35614cfdb60139e2fa4a89ea019051d625bd4c4403b3ce67bda692b6a8b519ea149d14b567e61b1ab71c7ef8d51d6a7933287a6b8f81240
+EBUILD swift-2.2.0.ebuild 4118 SHA256 1b8fff08bd913c6b75c9484cdf54549530d155d106b2c1c1577f17f95432e8e5 SHA512 def7126e0817d2445b3b68ed61a353db13656cff35a9893477d57613382a59fcf4cb618fcfe4b254c8dd6fe6ebce4e4ea87df00c90a907285b2c04a3da06315a WHIRLPOOL 42c139e41ffc6f6362a4753804fe48f0d1d57221d913723cffa7482c491e18a5bc1c350726d7af9400fb1d08ec881583b7f33e363f56c5a66be10a5e0221bcf1
 EBUILD swift-2014.1.9999.ebuild 4032 SHA256 320e03538a0367f7bde7818d66e2e6b6989204e3b0cc126ba60ec22c09695390 SHA512 78822409e7eb54934325428a55222c134d800911ae4b61a90038e5ec0b986028a426cc89a82148d77ed2b97022c956ddaf21b359449a4a480218d41e40ba6037 WHIRLPOOL e6f0b10e8ea003d0973100e2eee2d735654d397ed6c3e2d9e40cdc1451c8c59e151a28412c6a7810bf1406ae5024429188d476f54dbd0c168b1182fb0d8ebc60
 EBUILD swift-9999.ebuild 3995 SHA256 0e9b13e7327e541b2afd5cce0b25118452d2df36a0b00355b4a1bf78af07ea8f SHA512 b9dfadc3a915c5c24c6ed34415023f06ce0e736f5a892b8266311eb79a7c81f722750f5356aa7fbf2709594517df61fd1c78cb6816b98bc8f15efdfb16f73f61 WHIRLPOOL 9319a30f1c3320a81fb6c13770ca7852f2eda5f1d589a3c6d02d9c4154af6d35d6c5609a86affaf602f15774dcb4302b12ee29aa64420a114630b321ed9b194b
-MISC ChangeLog 6296 SHA256 0b7b8bf5e201bcc67291aa4d2e6d25818a50e2c281c36437ecd2e3c91d7d41fc SHA512 9a907247ed0d76d31983b67881f39ae9435edc03bf1ce495647976dfdf2b36f82b73ad6ee829dd7a76f5e11d2df757f50345cdc97930de5879c3179288f54727 WHIRLPOOL 135f1ddea999a9a5a7af1b84544c6663bcfb7c65501a1517389a5aad7009ff94a9f79ab52ab2c8b0b1ff53e937ba531940dc9fc6feabd4cb2e888788a0ef5ad2
+MISC ChangeLog 6409 SHA256 dc2b5deb77ce22446daeed5653d74f13410c21f0c8399e21f23470273138a133 SHA512 de82987f14fbf5fb61e1d4471437de11c9313a4167f963013a7f522b9989d985d3b5202e6f8c66cc1b2988ba026cca1e604355a0b4150d734783531ad407a9fa WHIRLPOOL e79ad804d6b56891ec589a4f0bb58040a6d764961bb1e30d271d10311a3c97d02727aac6af88fca448b889ada1a6e408e4187758ee4e4f0bf03fee0d337d3d53
 MISC metadata.xml 718 SHA256 3b5950b308bb7bff9c0b1e1df0ec6d2616a42225c6a60f8d23f8774cf3dcb0d8 SHA512 e86d128b5c6ccacfcb8032d33cc1a7e00ecfaa1d0e1fe325ef067f0073a5d411e27e84f89e7f843a7d242d8aca2163978f08f71f91bef43675adb5156d4716df WHIRLPOOL 8fdfc74a8b54c32edc06618e7ac59227a79ab24b32ee8757f14cd2dbed49786422bed58b4dce1808397856604027d0a148f74bb0d0e97cbaa232030fb93e0454
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJUOawQAAoJECRx6z5ArFrDwCoP/1vcq7y7udS8N0Ein4RAccBE
-2QR9JqhnGSgDVkRUUgID+OycZVtBekGujEM/gKJUuooK6BfsRq5SIhD/8D4N6+dU
-Of90CnmaxnXMlGTC5LdM8fRcMYmNjaIrDDiVy9Dzt3H+dk8VGYygMQS+7FNX17Fx
-Si3z9Tn88FgjCCl8yyRKr+OPNrVQZgTSxDpON8/bAjyDaHklBRIKTBj+nn3dynKd
-N+p06xMWcRnWepmuB9D1OpkDMylfiC8HxQMbbAsg1wFToayUyhczu/2do3EoGe66
-iUSnfpx/rYt1oDsQapuYPj02i/bAgdYcGEW2utO4fJcn2f219ADjA75d01y5BDZN
-rNQV1bLxvAZX5+wyoeX80USRRvHDN1+oWtZ3L0342+pIARPG0k4vuOuzm7OwUErE
-EKb5WGFXtBuu13hi6Pu3gql/j773+Z75yP1qMHiQx7SKFplvArMYIiADWUE6O7QR
-jIb/7uWEM5LeFK3IWO+Y1vA9F7EJjvblTGzUdGqkFAAQ7dbjpQMo/3L6tlWAJR6e
-s2UzuT85oVMRvAJnvqJoa24nE0lLo4LHZxrYiIYVkw8i5d8PCwVdtgxHFTcEVuje
-s1w4GitjOhe0jozkPHqQQcMGmIsNmdTFXhOldWMHhci15XuDH58dlXqXZmia8ypl
-O3dZvt1Ldm7HvBEBJ5kE
-=ghqB
+iQIcBAEBCAAGBQJUa53zAAoJECRx6z5ArFrDlroP/3982+8MdYG5FU61g8q5p79D
+qEk9pAzk+KX04tAqiFQjhsx2fBPeh8vK74+Fi/w2axVvuImIW0F2dqeO4aUmhvxl
+DonG4Mm17QXJQtvQ0BcFEi76MWyF+eAHN77Eii2AjdNyB/WwNKBMpcedHFI44a/b
+s32VQ3YzMmnKP1lF5fQUh3ygGj4OhZQVI7BXCPABv+VNI0Mh1s6LDVRaz3V0Ba9p
+LK//lWQ3a7+aZmwABfx4/tkevK/dy1CkiGqMXmEECZ0uejOPweYPwHO4EC/6S4GN
+rYMrVsq5c6DN6Md0XCPXUbaTFpClf4nIHqGe+5baXDDnUN1wjeki6vr0CDPUk0Gb
+tAZGCEXk0kq81Eu0TOQSe8Xr0JNOXs4ADTyp3GIQHtwFPD6jSrqj4oeAGwTehnQj
+8xlvmYdaQYKSTAD1ENqEy+BXRvI/VUKTOUEoT57SbxzaxxR4cY7v3OFmx1ZdG6cN
++rlWsdi/ygMPgAi6DD1WcQVPGww988uvkHXFWzAoSkFmIWm8X5LRBkvqdU7ZOwpT
+J73FCWaPRx71DWAHKbxtXNIHr2cwiveasnGDwX/27Qr9JbebDy4dijDzL2mtcu3r
+/aK2nN1fz0VJMA3goIDaZW1Rr9y75GfXbQt2Rtj/SfeEEE3FhCFwL4SwswkMUKgi
+BF+tnLykQCqPVBSKaFuY
+=MLQ9
 -----END PGP SIGNATURE-----
diff --git a/sys-cluster/swift/swift-2.2.0.ebuild b/sys-cluster/swift/swift-2.2.0.ebuild
new file mode 100644
index 000000000000..b0554ac5b91c
--- /dev/null
+++ b/sys-cluster/swift/swift-2.2.0.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/swift/swift-2.2.0.ebuild,v 1.1 2014/11/18 19:27:57 prometheanfire Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python2_7 )
+
+inherit distutils-r1 eutils linux-info user
+
+DESCRIPTION="A highly available, distributed, eventually consistent object/blob store"
+HOMEPAGE="https://launchpad.net/swift"
+SRC_URI="http://launchpad.net/${PN}/juno/${PV}/+download/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="proxy account container object test +memcache"
+REQUIRED_USE="|| ( proxy account container object )"
+
+DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
+		>=dev-python/pbr-0.6.0[${PYTHON_USEDEP}]
+		<dev-python/pbr-1.0[${PYTHON_USEDEP}]
+		test? ( >=dev-python/hacking-0.8.0[${PYTHON_USEDEP}]
+				<dev-python/hacking-0.9[${PYTHON_USEDEP}]
+				dev-python/coverage[${PYTHON_USEDEP}]
+				dev-python/nose[${PYTHON_USEDEP}]
+				dev-python/nosexcover[${PYTHON_USEDEP}]
+				dev-python/openstack-nose-plugin[${PYTHON_USEDEP}]
+				dev-python/nosehtmloutput[${PYTHON_USEDEP}]
+				>=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
+				<dev-python/sphinx-1.2[${PYTHON_USEDEP}]
+				dev-python/oslo-sphinx[${PYTHON_USEDEP}]
+				>=dev-python/mock-1.0[${PYTHON_USEDEP}]
+				dev-python/python-swiftclient[${PYTHON_USEDEP}] )"
+
+RDEPEND=">=dev-python/dnspython-1.9.4[${PYTHON_USEDEP}]
+		>=dev-python/eventlet-0.9.15[${PYTHON_USEDEP}]
+		>=dev-python/greenlet-0.3.1[${PYTHON_USEDEP}]
+		>=dev-python/netifaces-0.5[${PYTHON_USEDEP}]
+		!~dev-python/netifaces-0.10.0[${PYTHON_USEDEP}]
+		!~dev-python/netifaces-0.10.1[${PYTHON_USEDEP}]
+		>=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 )
+		net-misc/rsync[xattr]"
+
+CONFIG_CHECK="~EXT3_FS_XATTR ~SQUASHFS_XATTR ~CIFS_XATTR ~JFFS2_FS_XATTR
+~TMPFS_XATTR ~UBIFS_FS_XATTR ~EXT2_FS_XATTR ~REISERFS_FS_XATTR ~EXT4_FS_XATTR
+~ZFS"
+
+PATCHES=(
+)
+
+pkg_setup() {
+	enewuser swift
+	enewgroup swift
+}
+
+src_prepare() {
+	sed -i 's/xattr/pyxattr/g' "${S}/swift.egg-info/requires.txt"
+	sed -i 's/xattr/pyxattr/g' "${S}/requirements.txt"
+	distutils-r1_python_prepare_all
+}
+
+src_test () {
+	# https://bugs.launchpad.net/swift/+bug/1249727
+	find . \( -name test_wsgi.py -o -name test_locale.py -o -name test_utils.py \) -delete || die
+	SKIP_PIP_INSTALL=1 PBR_VERSION=0.6.0 sh .unittests || die
+}
+
+python_install() {
+	distutils-r1_python_install
+	keepdir /etc/swift
+	insinto /etc/swift
+
+	newins "etc/swift.conf-sample" "swift.conf"
+#	newins "etc/swift-bench.conf-sample" "swift-bench.conf-sample"
+	newins "etc/rsyncd.conf-sample" "rsyncd.conf"
+	newins "etc/mime.types-sample" "mime.types-sample"
+	newins "etc/memcache.conf-sample" "memcache.conf-sample"
+	newins "etc/drive-audit.conf-sample" "drive-audit.conf-sample"
+	newins "etc/dispersion.conf-sample" "dispersion.conf-sample"
+
+	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 -i '/depend/a\
+    need memcached' "${D}/etc/init.d/swift-proxy"
+		fi
+	fi
+	if use account; then
+		newinitd "${FILESDIR}/swift-account.initd" "swift-account"
+		newins "etc/account-server.conf-sample" "account-server.conf"
+	fi
+	if use container; then
+		newinitd "${FILESDIR}/swift-container.initd" "swift-container"
+		newins "etc/container-server.conf-sample" "container-server.conf"
+	fi
+	if use object; then
+		newinitd "${FILESDIR}/swift-object.initd" "swift-object"
+		newins "etc/object-server.conf-sample" "object-server.conf"
+		newins "etc/object-expirer.conf-sample" "object-expirer.conf"
+	fi
+
+	fowners swift:swift "/etc/swift" || die "fowners failed"
+}
+
+pkg_postinst() {
+	elog "Openstack swift will default to using insecure http unless a"
+	elog "certificate is created in /etc/swift/cert.crt and the associated key"
+	elog "in /etc/swift/cert.key.  These can be created with the following:"
+	elog "  * cd /etc/swift"
+	elog "  * openssl req -new -x509 -nodes -out cert.crt -keyout cert.key"
+}