Gentoo Archives: gentoo-commits

From: "Michał Górny" <mgorny@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/twisted-core/
Date: Wed, 03 May 2017 06:15:28
Message-Id: 1493792098.a49cd7c524f297abab6fa61169583f5919ece480.mgorny@gentoo
1 commit: a49cd7c524f297abab6fa61169583f5919ece480
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Tue May 2 20:38:35 2017 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Wed May 3 06:14:58 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a49cd7c5
7
8 dev-python/twisted-core: Clean old versions up
9
10 dev-python/twisted-core/Manifest | 2 -
11 .../twisted-core/twisted-core-13.0.0-r3.ebuild | 110 ------------------
12 dev-python/twisted-core/twisted-core-15.1.0.ebuild | 129 ---------------------
13 3 files changed, 241 deletions(-)
14
15 diff --git a/dev-python/twisted-core/Manifest b/dev-python/twisted-core/Manifest
16 index 2ff98c8d607..6ee7503522b 100644
17 --- a/dev-python/twisted-core/Manifest
18 +++ b/dev-python/twisted-core/Manifest
19 @@ -1,4 +1,2 @@
20 -DIST TwistedCore-13.0.0.tar.bz2 1495753 SHA256 989706fd39c8a28785bdecaa0145b81f7e159b9209d463b5885be7e5c34ff32f SHA512 624d73d267742cb5b97bed2a39e78caeb01ee5fa871a0a2133455809b1d2a695f0d375c022ae21e91ef20f92fdee05a08a11db7b6b1e92ec810d3e097f929972 WHIRLPOOL 02c25eb94ad0aaafea8e1599df387607c6a1323ac55c31b0e98a366f927da2245fc839f5a3509367ed18690694f8599ebb22c0b21b8c90dfbfe2e3727a7846ff
21 DIST TwistedCore-13.2.0.tar.bz2 1496299 SHA256 396ee27f0e824772bf26c636c69c2751127738127e283112e72c2de6c28e36be SHA512 90cf2019f0d5b125c7bbb5a9e3e7d2dedcd8efd5f9b2ab057e0b41f899d394b995fe599128223c82b1a634fb881ad7ae8ddc5b86b26adb28a3834c05da45f2c6 WHIRLPOOL 21a90a98b36775db4e6154c30ea697ef53f4b94a30e1be125e420019d5200cbbf31178937c41b12ffb841b028875dbc6b1234cebf8036f4165d2908c431a6de4
22 -DIST TwistedCore-15.1.0.tar.bz2 1139396 SHA256 c769ecc62d65a33f04f932ec727c367eb557610392e9f7bab37eaf169fb1cebf SHA512 3978429d57b7929bd65103f86d5e150950de48d27382d23a08b97be5c62c218e7cbaa06067ba6c1b926fb372cc290baf5d629af91053cf338e331d996bf8c99a WHIRLPOOL 3baa9a5986e415fee15cbdb33263a9c9ba84a4c7c79a2f744acd28881de2043b56f97137acf5b97d243fe5d6b6885eebaae2b90cced5e81ac4bef5176fd6a1f7
23 DIST TwistedCore-15.2.1.tar.bz2 1179442 SHA256 42efb31330e09b5ffdb8caf735fdb925692c6cfdc03ab7ad25104c3dc41154bb SHA512 c5923d71903afac7dec15d130ff3bd247dc1a6cdeb35cc642912a43f1e5640088971ddfc7abe3e18ca1853e59ba6a417d4b465fb422aba1a052bc156d7c6e820 WHIRLPOOL 8abb2522447fd2e9ad0d3d2e3e0cac8e17e07cd80695b95f12fda6af6ccd6576f4b808f322731445667d194c2216669ad3d4d58c0bc5f798449f1d0a35bcc638
24
25 diff --git a/dev-python/twisted-core/twisted-core-13.0.0-r3.ebuild b/dev-python/twisted-core/twisted-core-13.0.0-r3.ebuild
26 deleted file mode 100644
27 index ce4282f6be6..00000000000
28 --- a/dev-python/twisted-core/twisted-core-13.0.0-r3.ebuild
29 +++ /dev/null
30 @@ -1,110 +0,0 @@
31 -# Copyright 1999-2017 Gentoo Foundation
32 -# Distributed under the terms of the GNU General Public License v2
33 -
34 -EAPI=5
35 -PYTHON_COMPAT=( python2_7 )
36 -PYTHON_REQ_USE="threads(+)"
37 -
38 -inherit eutils flag-o-matic twisted-r1
39 -
40 -DESCRIPTION="An asynchronous networking framework written in Python"
41 -
42 -KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 ~s390 ~sh sparc x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
43 -IUSE="crypt gtk serial"
44 -
45 -DEPEND="
46 - dev-python/zope-interface[${PYTHON_USEDEP}]
47 - crypt? ( >=dev-python/pyopenssl-0.10[${PYTHON_USEDEP}] )
48 - gtk? ( dev-python/pygtk:2[${PYTHON_USEDEP}] )
49 - serial? ( dev-python/pyserial[${PYTHON_USEDEP}] )"
50 -RDEPEND="${DEPEND}
51 - !dev-python/twisted
52 -"
53 -
54 -PATCHES=(
55 - # Give a load-sensitive test a better chance of succeeding.
56 - "${FILESDIR}/${PN}-2.1.0-echo-less.patch"
57 -
58 - # Skip a test if twisted conch is not available
59 - # (see Twisted ticket #5703)
60 - "${FILESDIR}/${PN}-12.1.0-remove-tests-conch-dependency.patch"
61 -
62 - # Respect TWISTED_DISABLE_WRITING_OF_PLUGIN_CACHE variable.
63 - "${FILESDIR}/${PN}-9.0.0-respect_TWISTED_DISABLE_WRITING_OF_PLUGIN_CACHE.patch"
64 -)
65 -
66 -python_prepare_all() {
67 - if [[ "${EUID}" -eq 0 ]]; then
68 - # Disable tests failing with root permissions.
69 - sed \
70 - -e "s/test_newPluginsOnReadOnlyPath/_&/" \
71 - -e "s/test_deployedMode/_&/" \
72 - -i twisted/test/test_plugin.py
73 - fi
74 -
75 - distutils-r1_python_prepare_all
76 -}
77 -
78 -python_compile() {
79 - if ! python_is_python3; then
80 - # Needed to make the sendmsg extension work
81 - # (see http://twistedmatrix.com/trac/ticket/5701 )
82 -
83 - local -x CFLAGS="${CFLAGS} -fno-strict-aliasing"
84 - local -x CXXFLAGS="${CXXFLAGS} -fno-strict-aliasing"
85 - fi
86 -
87 - distutils-r1_python_compile
88 -}
89 -
90 -python_test() {
91 - # NOTE: on pypy a couple of failures (refcounting, version-checking) is
92 - # expected
93 -
94 - distutils_install_for_testing
95 -
96 - pushd "${TEST_DIR}"/lib > /dev/null || die
97 -
98 - # Skip broken tests.
99 - sed -e "s/test_buildAllTarballs/_&/" -i twisted/python/test/test_release.py || die "sed failed"
100 -
101 - # http://twistedmatrix.com/trac/ticket/5375
102 - sed -e "/class ZshIntegrationTestCase/,/^$/d" -i twisted/scripts/test/test_scripts.py || die "sed failed"
103 -
104 - # tap2rpm is already skipped if rpm is not installed, but fails for me on a Gentoo box with it present.
105 - # I currently lack the cycles to track this failure down.
106 - rm twisted/scripts/test/test_tap2rpm.py
107 -
108 - # Prevent it from pulling in plugins from already installed twisted packages.
109 - rm -f twisted/plugins/__init__.py
110 -
111 - # An empty file doesn't work because the tests check for doc strings in all packages.
112 - echo "'''plugins stub'''" > twisted/plugins/__init__.py || die
113 -
114 - if ! "${TEST_DIR}"/scripts/trial twisted; then
115 - die "Tests failed with ${EPYTHON}"
116 - fi
117 -
118 - popd > /dev/null || die
119 -}
120 -
121 -python_install() {
122 - distutils-r1_python_install
123 -
124 - cd "${D%/}$(python_get_sitedir)" || die
125 -
126 - # create 'Twisted' egg wrt bug #299736
127 - local egg=( Twisted_Core*.egg-info )
128 - [[ -f ${egg[0]} ]] || die "Twisted_Core*.egg-info not found"
129 - ln -s "${egg[0]}" "${egg[0]/_Core/}" || die
130 -
131 - # own the dropin.cache so we don't leave orphans
132 - touch twisted/plugins/dropin.cache || die
133 -}
134 -
135 -python_install_all() {
136 - distutils-r1_python_install_all
137 -
138 - newconfd "${FILESDIR}/twistd.conf" twistd
139 - newinitd "${FILESDIR}/twistd.init" twistd
140 -}
141
142 diff --git a/dev-python/twisted-core/twisted-core-15.1.0.ebuild b/dev-python/twisted-core/twisted-core-15.1.0.ebuild
143 deleted file mode 100644
144 index 01c63009d39..00000000000
145 --- a/dev-python/twisted-core/twisted-core-15.1.0.ebuild
146 +++ /dev/null
147 @@ -1,129 +0,0 @@
148 -# Copyright 1999-2017 Gentoo Foundation
149 -# Distributed under the terms of the GNU General Public License v2
150 -
151 -EAPI=5
152 -PYTHON_COMPAT=( python2_7 )
153 -PYTHON_REQ_USE="threads(+)"
154 -
155 -inherit eutils flag-o-matic twisted-r1
156 -
157 -DESCRIPTION="An asynchronous networking framework written in Python"
158 -
159 -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~s390 ~sh ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
160 -IUSE="crypt gtk serial test"
161 -
162 -RDEPEND=">=dev-python/zope-interface-3.6.0[${PYTHON_USEDEP}]
163 - crypt? ( >=dev-python/pyopenssl-0.10[${PYTHON_USEDEP}]
164 - dev-python/service_identity[${PYTHON_USEDEP}] )
165 - gtk? ( dev-python/pygtk:2[${PYTHON_USEDEP}] )
166 - serial? ( dev-python/pyserial[${PYTHON_USEDEP}] )"
167 -DEPEND="
168 - test? ( ${RDEPEND} )
169 -"
170 -RDEPEND+=" !dev-python/twisted"
171 -
172 -PATCHES=(
173 - # Give a load-sensitive test a better chance of succeeding.
174 - "${FILESDIR}/${PN}-2.1.0-echo-less.patch"
175 -
176 - # Skip a test if twisted conch is not available
177 - # (see Twisted ticket #5703)
178 - "${FILESDIR}/${PN}-12.1.0-remove-tests-conch-dependency.patch"
179 -
180 - # Respect TWISTED_DISABLE_WRITING_OF_PLUGIN_CACHE variable.
181 - "${FILESDIR}/${PN}-9.0.0-respect_TWISTED_DISABLE_WRITING_OF_PLUGIN_CACHE.patch"
182 -)
183 -
184 -python_prepare_all() {
185 - if [[ "${EUID}" -eq 0 ]]; then
186 - # Disable tests failing with root permissions.
187 - sed \
188 - -e "s/test_newPluginsOnReadOnlyPath/_&/" \
189 - -e "s/test_deployedMode/_&/" \
190 - -i twisted/test/test_plugin.py
191 - fi
192 -
193 - distutils-r1_python_prepare_all
194 -}
195 -
196 -python_compile() {
197 - if ! python_is_python3; then
198 - # Needed to make the sendmsg extension work
199 - # (see http://twistedmatrix.com/trac/ticket/5701 )
200 - local -x CFLAGS="${CFLAGS} -fno-strict-aliasing"
201 - local -x CXXFLAGS="${CXXFLAGS} -fno-strict-aliasing"
202 - fi
203 -
204 - distutils-r1_python_compile
205 -}
206 -
207 -python_test() {
208 - distutils_install_for_testing
209 -
210 - pushd "${TEST_DIR}"/lib > /dev/null || die
211 -
212 - # Skip broken tests.
213 -
214 - # http://twistedmatrix.com/trac/ticket/5375
215 - sed -e "/class ZshIntegrationTestCase/,/^$/d" -i twisted/scripts/test/test_scripts.py \
216 - || die "sed failed"
217 -
218 - # Prevent it from pulling in plugins from already installed twisted packages.
219 - rm -f twisted/plugins/__init__.py
220 -
221 - # An empty file doesn't work because the tests check for doc strings in all packages.
222 - echo "'''plugins stub'''" > twisted/plugins/__init__.py || die
223 -
224 - # https://twistedmatrix.com/trac/ticket/6920 6921
225 - # Just re-exposing them to list a full list of deficits
226 -# sed -e 's:test_basicOperation:_&:' -i twisted/scripts/test/test_tap2deb.py || die
227 -# sed -e 's:test_inspectCertificate:_&:' -i twisted/test/test_sslverify.py || die
228 -
229 - # Requires twisted-web, twisted-lore and twisted-names, creating a circ. dep and fail even if installed.
230 - # test_loreDeprecation and test_exist failures appeared in version 14.0.0.
231 - # Possibly due to over taxing of the distutils_install_for_testing function
232 - rm -f twisted/python/test/test_release.py || die
233 - sed -e 's:test_loreDeprecation:_&:' -i twisted/test/test_twisted.py || die
234 - sed -e 's:test_exist:_&:' -i twisted/python/test/test_dist3.py || die
235 -
236 - # Requires connection to the network
237 - sed -e 's:test_multiListen:_&:' -i twisted/test/test_udp.py || die
238 -
239 - # Appeared in version 14.0.0; https://twistedmatrix.com/trac/ticket/7422; known failures
240 - # Upstream somewhat unreceptive
241 - # The last of these invokes a hang or a long delay
242 - sed -e 's:test_dataReceivedThrows:_&:' \
243 - -e 's:test_resumeProducingThrows:_&:' \
244 - -e 's:test_resumeProducingAbortLater:_&:' \
245 - -e 's:test_resumeProducingAbort:_&:' \
246 - -e 's:test_fullWriteBufferAfterByteExchange:_&:' \
247 - -i twisted/internet/test/test_tcp.py || die
248 - sed -e 's:test_logPrefix:_&:' -i twisted/internet/test/connectionmixins.py || die
249 -
250 - if ! "${TEST_DIR}"/scripts/trial twisted; then
251 - die "Tests failed with ${EPYTHON}"
252 - fi
253 -
254 - popd > /dev/null || die
255 -}
256 -
257 -python_install() {
258 - distutils-r1_python_install
259 -
260 - cd "${D%/}$(python_get_sitedir)" || die
261 -
262 - # create 'Twisted' egg wrt bug #299736
263 - local egg=( Twisted_Core*.egg-info )
264 - [[ -f ${egg[0]} ]] || die "Twisted_Core*.egg-info not found"
265 - ln -s "${egg[0]}" "${egg[0]/_Core/}" || die
266 -
267 - # own the dropin.cache so we don't leave orphans
268 - touch twisted/plugins/dropin.cache || die
269 -}
270 -
271 -python_install_all() {
272 - distutils-r1_python_install_all
273 -
274 - newconfd "${FILESDIR}/twistd.conf" twistd
275 - newinitd "${FILESDIR}/twistd.init" twistd
276 -}