Gentoo Archives: gentoo-commits

From: "Matt Thode (prometheanfire)" <prometheanfire@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in sys-cluster/swift: swift-9999.ebuild ChangeLog swift-1.13.0-r1.ebuild swift-2013.2.9999.ebuild
Date: Fri, 01 Aug 2014 04:53:31
Message-Id: 20140801045324.9784D2004E@flycatcher.gentoo.org
1 prometheanfire 14/08/01 04:53:23
2
3 Modified: swift-9999.ebuild ChangeLog
4 Removed: swift-1.13.0-r1.ebuild swift-2013.2.9999.ebuild
5 Log:
6 removing the old and jankey
7
8 (Portage version: 2.2.8-r1/cvs/Linux x86_64, signed Manifest commit with key 0x2471eb3e40ac5ac3)
9
10 Revision Changes Path
11 1.8 sys-cluster/swift/swift-9999.ebuild
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/swift/swift-9999.ebuild?rev=1.8&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/swift/swift-9999.ebuild?rev=1.8&content-type=text/plain
15 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/swift/swift-9999.ebuild?r1=1.7&r2=1.8
16
17 Index: swift-9999.ebuild
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/sys-cluster/swift/swift-9999.ebuild,v
20 retrieving revision 1.7
21 retrieving revision 1.8
22 diff -u -r1.7 -r1.8
23 --- swift-9999.ebuild 8 Jan 2014 05:59:48 -0000 1.7
24 +++ swift-9999.ebuild 1 Aug 2014 04:53:23 -0000 1.8
25 @@ -1,6 +1,6 @@
26 # Copyright 1999-2014 Gentoo Foundation
27 # Distributed under the terms of the GNU General Public License v2
28 -# $Header: /var/cvsroot/gentoo-x86/sys-cluster/swift/swift-9999.ebuild,v 1.7 2014/01/08 05:59:48 vapier Exp $
29 +# $Header: /var/cvsroot/gentoo-x86/sys-cluster/swift/swift-9999.ebuild,v 1.8 2014/08/01 04:53:23 prometheanfire Exp $
30
31 EAPI=5
32 PYTHON_COMPAT=( python2_7 )
33 @@ -10,7 +10,6 @@
34 DESCRIPTION="A highly available, distributed, eventually consistent object/blob store"
35 HOMEPAGE="https://launchpad.net/swift"
36 EGIT_REPO_URI="https://github.com/openstack/swift.git"
37 -EGIT_BRANCH="master"
38
39 LICENSE="Apache-2.0"
40 SLOT="0"
41 @@ -19,25 +18,27 @@
42 REQUIRED_USE="|| ( proxy account container object )"
43
44 DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]
45 - test? ( dev-python/nose[${PYTHON_USEDEP}]
46 + >=dev-python/pbr-0.6.0[${PYTHON_USEDEP}]
47 + <dev-python/pbr-1.0[${PYTHON_USEDEP}]
48 + test? ( >=dev-python/hacking-0.8.0[${PYTHON_USEDEP}]
49 + <dev-python/hacking-0.9[${PYTHON_USEDEP}]
50 dev-python/coverage[${PYTHON_USEDEP}]
51 + dev-python/nose[${PYTHON_USEDEP}]
52 dev-python/nosexcover[${PYTHON_USEDEP}]
53 dev-python/openstack-nose-plugin[${PYTHON_USEDEP}]
54 dev-python/nosehtmloutput[${PYTHON_USEDEP}]
55 - ~dev-python/pep8-1.4.5[${PYTHON_USEDEP}]
56 - >=dev-python/pyflakes-0.7.2[${PYTHON_USEDEP}]
57 - >=dev-python/flake8-2.0[${PYTHON_USEDEP}]
58 + >=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}]
59 + <dev-python/sphinx-1.2[${PYTHON_USEDEP}]
60 >=dev-python/mock-0.8.0[${PYTHON_USEDEP}]
61 - >=dev-python/sphinx-1.1.2[${PYTHON_USEDEP}] )"
62 + dev-python/python-swiftclient[${PYTHON_USEDEP}] )"
63
64 -RDEPEND=">=dev-python/eventlet-0.9.15[${PYTHON_USEDEP}]
65 +RDEPEND=">=dev-python/dnspython-1.9.4[${PYTHON_USEDEP}]
66 + >=dev-python/eventlet-0.9.15[${PYTHON_USEDEP}]
67 >=dev-python/greenlet-0.3.1[${PYTHON_USEDEP}]
68 >=dev-python/netifaces-0.5[${PYTHON_USEDEP}]
69 >=dev-python/pastedeploy-1.3.3[${PYTHON_USEDEP}]
70 >=dev-python/simplejson-2.0.9[${PYTHON_USEDEP}]
71 dev-python/pyxattr[${PYTHON_USEDEP}]
72 - >=dev-python/dnspython-1.10.0-r1[${PYTHON_USEDEP}]
73 - dev-python/python-swiftclient[${PYTHON_USEDEP}]
74 memcache? ( net-misc/memcached )
75 net-misc/rsync[xattr]"
76
77 @@ -45,6 +46,8 @@
78 ~TMPFS_XATTR ~UBIFS_FS_XATTR ~EXT2_FS_XATTR ~REISERFS_FS_XATTR ~EXT4_FS_XATTR
79 ~ZFS"
80
81 +#PATCHES=( "${FILESDIR}/CVE-2014-0006-master.diff" )
82 +
83 pkg_setup() {
84 enewuser swift
85 enewgroup swift
86 @@ -52,13 +55,14 @@
87
88 src_prepare() {
89 sed -i 's/xattr/pyxattr/g' "${S}/swift.egg-info/requires.txt"
90 - sed -i 's/xattr/pyxattr/g' "${S}/tools/pip-requires"
91 + sed -i 's/xattr/pyxattr/g' "${S}/requirements.txt"
92 + distutils-r1_python_prepare_all
93 }
94
95 src_test () {
96 # https://bugs.launchpad.net/swift/+bug/1249727
97 - find . -name test_wsgi.py -delete || die
98 - sh .unittests || die
99 + find . \( -name test_wsgi.py -o -name test_locale.py -o -name test_utils.py \) -delete || die
100 + SKIP_PIP_INSTALL=1 PBR_VERSION=0.6.0 sh .unittests || die
101 }
102
103 python_install() {
104 @@ -67,7 +71,7 @@
105 insinto /etc/swift
106
107 newins "etc/swift.conf-sample" "swift.conf"
108 - newins "etc/swift-bench.conf-sample" "swift-bench.conf-sample"
109 +# newins "etc/swift-bench.conf-sample" "swift-bench.conf-sample"
110 newins "etc/rsyncd.conf-sample" "rsyncd.conf"
111 newins "etc/mime.types-sample" "mime.types-sample"
112 newins "etc/memcache.conf-sample" "memcache.conf-sample"
113 @@ -106,19 +110,3 @@
114 elog " * cd /etc/swift"
115 elog " * openssl req -new -x509 -nodes -out cert.crt -keyout cert.key"
116 }
117 -
118 -#src_install()
119 -#{
120 -# distutils_src_install
121 -#
122 -# dodir "/var/run/swift"
123 -#
124 -# if use proxy-server; then
125 -# newinitd "${FILESDIR}/swift-proxy-server.initd" swift-proxy-server
126 -# fi
127 -#
128 -# if use storage-server; then
129 -# newinitd "${FILESDIR}/swift-storage-server.initd" swift-storage-server
130 -# newconfd "${FILESDIR}/swift-storage-server.confd" swift-storage-server
131 -# fi
132 -#}
133
134
135
136 1.33 sys-cluster/swift/ChangeLog
137
138 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/swift/ChangeLog?rev=1.33&view=markup
139 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/swift/ChangeLog?rev=1.33&content-type=text/plain
140 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-cluster/swift/ChangeLog?r1=1.32&r2=1.33
141
142 Index: ChangeLog
143 ===================================================================
144 RCS file: /var/cvsroot/gentoo-x86/sys-cluster/swift/ChangeLog,v
145 retrieving revision 1.32
146 retrieving revision 1.33
147 diff -u -r1.32 -r1.33
148 --- ChangeLog 8 Jul 2014 23:30:31 -0000 1.32
149 +++ ChangeLog 1 Aug 2014 04:53:23 -0000 1.33
150 @@ -1,6 +1,10 @@
151 # ChangeLog for sys-cluster/swift
152 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
153 -# $Header: /var/cvsroot/gentoo-x86/sys-cluster/swift/ChangeLog,v 1.32 2014/07/08 23:30:31 prometheanfire Exp $
154 +# $Header: /var/cvsroot/gentoo-x86/sys-cluster/swift/ChangeLog,v 1.33 2014/08/01 04:53:23 prometheanfire Exp $
155 +
156 + 01 Aug 2014; Matthew Thode <prometheanfire@g.o>
157 + -swift-1.13.0-r1.ebuild, -swift-2013.2.9999.ebuild, swift-9999.ebuild:
158 + removing the old and jankey
159
160 *swift-2.0.0 (08 Jul 2014)