Gentoo Archives: gentoo-commits

From: Justin Lecher <jlec@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/beautifulsoup/files/, dev-python/beautifulsoup/
Date: Tue, 29 Sep 2015 08:34:59
Message-Id: 1443515688.fd270309011659c69402d07498a4c4d79bbb8b5d.jlec@gentoo
1 commit: fd270309011659c69402d07498a4c4d79bbb8b5d
2 Author: Justin Lecher <jlec <AT> gentoo <DOT> org>
3 AuthorDate: Tue Sep 29 07:49:56 2015 +0000
4 Commit: Justin Lecher <jlec <AT> gentoo <DOT> org>
5 CommitDate: Tue Sep 29 08:34:48 2015 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fd270309
7
8 dev-python/beautifulsoup: Drop old
9
10 Github: closes gentoo/gentoo#141
11
12 Package-Manager: portage-2.2.22
13 Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>
14
15 dev-python/beautifulsoup/Manifest | 2 -
16 .../beautifulsoup/beautifulsoup-4.1.3-r1.ebuild | 46 ---------------
17 .../beautifulsoup/beautifulsoup-4.1.3.ebuild | 54 -----------------
18 .../beautifulsoup/beautifulsoup-4.2.0.ebuild | 48 ----------------
19 .../beautifulsoup/files/bfs-4.2.0-no-lxml.patch | 67 ----------------------
20 5 files changed, 217 deletions(-)
21
22 diff --git a/dev-python/beautifulsoup/Manifest b/dev-python/beautifulsoup/Manifest
23 index b097e56..ab45627 100644
24 --- a/dev-python/beautifulsoup/Manifest
25 +++ b/dev-python/beautifulsoup/Manifest
26 @@ -1,7 +1,5 @@
27 DIST BeautifulSoup-3.1.0.1.tar.gz 71460 SHA256 820a80f473240d9d30047f36c959d530a699a732500662dd8b03e1d3ccad12a8 SHA512 812969faf454a58d849921836ed07ec9a950f34fb31e29e118cdf1a75a533370e430f417402b5a5016d23b2d3a1c44a1cf5fde5b3bfd1bc98c50036edd51c0d6 WHIRLPOOL a199585817dcabcc6327c3836a66128605ebf92a6663b5c660125061a797485a504d300791bcd43e0e94e4f08ca59c01f65f42481da07b1240350cbfc6ea6b0c
28 DIST BeautifulSoup-3.2.1.tar.gz 31224 SHA256 f5ba85e907e7dfd78e44e4000b3eaef3a650aefc57831e8a645702db2e5b50db SHA512 365b7b045a2069cf437877543577bc0aa99256a6dc4c9743670b46bfceab5494a06628012d6eccecfe99c25d5c9e0c65814964b47026f15ba1a538444cfb7789 WHIRLPOOL c2f84b29421d0153fb1fecc87d63e00a61182e03bc0683132babca5d6c94143b4875a60a19124a36e4e6e78ce80bff9e1e81b37335700efc14084da933307e26
29 -DIST beautifulsoup4-4.1.3.tar.gz 131292 SHA256 a295b93b30e1126f3fd64edc106f6939349280dde2ba47cef1e5a92dad9319bf SHA512 79ed4f65bcb5599a0d278d5462a67e80f532cdddcb753e0703b28347d84512165ee0bffd09795a501f3b55e6e4869354f04efdceae9de9093a4d85381fee660e WHIRLPOOL 53713ca72b5a409b3755e28d69de65b7994fb387d21ba9a1827f3e4dda2355f318660f69a706825ecb3852447823ffb8bae2cee6bacc093e6ad73347852f29c6
30 -DIST beautifulsoup4-4.2.0.tar.gz 138400 SHA256 9565ce6f6d28808007ab6248c37d59a49934e358276da5d3ac211ea1ccfd0782 SHA512 50c7514f2a1de49df6300d292e1f00e746b341e9c70dbfc3508663870ddf92f5c8e0ea981dc7742f888428845e90bce2cce8b158e8548039be4c2c06ee76db97 WHIRLPOOL 95db573c6c291d27187af9403694bcff27add7ad378b105df96f988074480b7a1491710681a93f1396dfa33cfa8c493637564ab7fc228e9e92659c385aa769a2
31 DIST beautifulsoup4-4.3.2.tar.gz 143356 SHA256 a2b29bd048ca2fe54a046b29770964738872a9747003a371344a93eedf7ad58e SHA512 3d55e553a1a2109378e2961a0feb23a8f038f4ff7bd335a21a26d588d39761f6735888e6ca2d001587e9a6a3b8259a1a09b92b310aa17e9b76fd85601a1ca592 WHIRLPOOL 3570395aa0fae03edc1de10b1c41e82efefa4753c306d2619032b124536a72b6db696c7f85c6a7c32b18c0506ec33d4c8a2fb73660264ad5afd92aba76f32884
32 DIST beautifulsoup4-4.4.0.tar.gz 151500 SHA256 fad91da88f69438b9ba939ab1b2cabaa31b1d914f1cccb4bb157a993ed2917f6 SHA512 812abb09099779ecb9c41ce55963ad42973eef00193e28e59dd907715fd6bc2b470b07f80bbe2838b790be252935eb81357a8cfb59808865d2fb62479476eb2f WHIRLPOOL 93b4bd82f1b7596a198d3a8ad5d21cfad51595884b2eb03c36e827e1b3d9f7a8400ed4415c9f0ffe9d014eac66c93cd52521a433ca914cac1a390a6487f153ba
33 DIST beautifulsoup4-4.4.1.tar.gz 152140 SHA256 87d4013d0625d4789a4f56b8d79a04d5ce6db1152bb65f1d39744f7709a366b4 SHA512 16c692196d306564df23018bde714052b0209301f32df27c18413c085e98b404d81fad6427c8e8179e54158e98bdf2edce71ee75d8b8d835d2566cc170eae1d5 WHIRLPOOL c59d384ff72a1e9ca3a0e6e54b4e201ab8d127a4e2eecd01b43f2f67b6a6bba3af4de6ddd8441a237b5838428098aaf3198e2d55607a188331c6e7dff5d51a8f
34
35 diff --git a/dev-python/beautifulsoup/beautifulsoup-4.1.3-r1.ebuild b/dev-python/beautifulsoup/beautifulsoup-4.1.3-r1.ebuild
36 deleted file mode 100644
37 index 90e842a..0000000
38 --- a/dev-python/beautifulsoup/beautifulsoup-4.1.3-r1.ebuild
39 +++ /dev/null
40 @@ -1,46 +0,0 @@
41 -# Copyright 1999-2015 Gentoo Foundation
42 -# Distributed under the terms of the GNU General Public License v2
43 -# $Id$
44 -
45 -EAPI=5
46 -
47 -PYTHON_COMPAT=( python{2_7,3_3} pypy )
48 -
49 -inherit distutils-r1
50 -
51 -MY_PN="${PN}4"
52 -MY_P="${MY_PN}-${PV}"
53 -DESCRIPTION="Provides pythonic idioms for iterating, searching, and modifying an HTML/XML parse tree"
54 -HOMEPAGE="http://www.crummy.com/software/BeautifulSoup/
55 - https://pypi.python.org/pypi/beautifulsoup4"
56 -SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
57 -
58 -LICENSE="MIT"
59 -SLOT="4"
60 -KEYWORDS="~alpha amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
61 -# new html5 awaits keywording of html5lib in Bug 471002
62 -IUSE="doc test"
63 -# pending Bug 471002; html5? ( dev-python/html5lib[$(python_gen_usedep 'python{2_6,2_7}' pypy pypy2_0)] )
64 -
65 -RDEPEND=""
66 -DEPEND="${RDEPEND}
67 - doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
68 - test? ( dev-python/nose[${PYTHON_USEDEP}]
69 - dev-python/lxml[${PYTHON_USEDEP}] )"
70 -
71 -S="${WORKDIR}/${MY_P}"
72 -
73 -python_compile_all() {
74 - if use doc; then
75 - emake -C doc html
76 - fi
77 -}
78 -
79 -python_test() {
80 - nosetests -w "${BUILD_DIR}"/lib || die "Tests fail with ${EPYTHON}"
81 -}
82 -
83 -python_install_all() {
84 - use doc && local HTML_DOCS=doc/build/html/.
85 - distutils-r1_python_install_all
86 -}
87
88 diff --git a/dev-python/beautifulsoup/beautifulsoup-4.1.3.ebuild b/dev-python/beautifulsoup/beautifulsoup-4.1.3.ebuild
89 deleted file mode 100644
90 index 7b6cc39..0000000
91 --- a/dev-python/beautifulsoup/beautifulsoup-4.1.3.ebuild
92 +++ /dev/null
93 @@ -1,54 +0,0 @@
94 -# Copyright 1999-2012 Gentoo Foundation
95 -# Distributed under the terms of the GNU General Public License v2
96 -# $Id$
97 -
98 -EAPI="4"
99 -
100 -PYTHON_DEPEND="*:2.6"
101 -SUPPORT_PYTHON_ABIS="1"
102 -RESTRICT_PYTHON_ABIS="2.5"
103 -PYTHON_TESTS_RESTRICTED_ABIS="*-pypy-*"
104 -DISTUTILS_SRC_TEST="nosetests"
105 -
106 -inherit distutils
107 -
108 -MY_PN="${PN}4"
109 -MY_P="${MY_PN}-${PV}"
110 -DESCRIPTION="Provides pythonic idioms for iterating, searching, and modifying an HTML/XML parse tree"
111 -HOMEPAGE="http://www.crummy.com/software/BeautifulSoup/
112 - https://pypi.python.org/pypi/beautifulsoup4"
113 -SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
114 -
115 -LICENSE="MIT"
116 -SLOT="4"
117 -KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
118 -IUSE="doc test"
119 -
120 -DEPEND="doc? ( dev-python/sphinx )
121 - test? ( dev-python/lxml )"
122 -RDEPEND=""
123 -
124 -PYTHON_MODNAME="bs4"
125 -S="${WORKDIR}/${MY_P}"
126 -
127 -src_compile() {
128 - distutils_src_compile
129 - if use doc; then
130 - emake -C doc html
131 - fi
132 -}
133 -
134 -src_test() {
135 - testing() {
136 - cd "build-${PYTHON_ABI}/lib"
137 - nosetests --verbosity="${PYTHON_TEST_VERBOSITY}"
138 - }
139 - python_execute_function testing
140 -}
141 -
142 -src_install() {
143 - distutils_src_install
144 - if use doc; then
145 - dohtml -r doc/build/html/*
146 - fi
147 -}
148
149 diff --git a/dev-python/beautifulsoup/beautifulsoup-4.2.0.ebuild b/dev-python/beautifulsoup/beautifulsoup-4.2.0.ebuild
150 deleted file mode 100644
151 index 4c55fbb..0000000
152 --- a/dev-python/beautifulsoup/beautifulsoup-4.2.0.ebuild
153 +++ /dev/null
154 @@ -1,48 +0,0 @@
155 -# Copyright 1999-2015 Gentoo Foundation
156 -# Distributed under the terms of the GNU General Public License v2
157 -# $Id$
158 -
159 -EAPI=5
160 -PYTHON_COMPAT=( python{2_7,3_3} pypy )
161 -
162 -inherit distutils-r1
163 -
164 -MY_PN=${PN}4
165 -MY_P=${MY_PN}-${PV}
166 -
167 -DESCRIPTION="Provides pythonic idioms for iterating, searching, and modifying an HTML/XML parse tree"
168 -HOMEPAGE="http://www.crummy.com/software/BeautifulSoup/
169 - https://pypi.python.org/pypi/beautifulsoup4"
170 -SRC_URI="mirror://pypi/${MY_P:0:1}/${MY_PN}/${MY_P}.tar.gz"
171 -
172 -LICENSE="MIT"
173 -SLOT="4"
174 -KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos ~sparc-solaris ~x86-solaris"
175 -# new html5 awaits keywording of html5lib in Bug 471002
176 -IUSE="doc test"
177 -# pending Bug 471002; html5? ( dev-python/html5lib[$(python_gen_usedep 'python{2_6,2_7}' pypy pypy2_0)] )
178 -
179 -RDEPEND=""
180 -DEPEND="${RDEPEND}
181 - doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
182 - test? ( dev-python/nose[${PYTHON_USEDEP}]
183 - dev-python/lxml[$(python_gen_usedep 'python{2_6,2_7}' 'python3*')] )"
184 -
185 -S=${WORKDIR}/${MY_P}
186 -
187 -PATCHES=( "${FILESDIR}"/bfs-${PV}-no-lxml.patch )
188 -
189 -python_compile_all() {
190 - if use doc; then
191 - emake -C doc html
192 - fi
193 -}
194 -
195 -python_test() {
196 - nosetests -w "${BUILD_DIR}"/lib || die "Tests fail with ${EPYTHON}"
197 -}
198 -
199 -python_install_all() {
200 - use doc && local HTML_DOCS=doc/build/html/.
201 - distutils-r1_python_install_all
202 -}
203
204 diff --git a/dev-python/beautifulsoup/files/bfs-4.2.0-no-lxml.patch b/dev-python/beautifulsoup/files/bfs-4.2.0-no-lxml.patch
205 deleted file mode 100644
206 index 75ae98b..0000000
207 --- a/dev-python/beautifulsoup/files/bfs-4.2.0-no-lxml.patch
208 +++ /dev/null
209 @@ -1,67 +0,0 @@
210 -=== modified file 'bs4/testing.py'
211 ---- bs4/testing.py 2013-05-07 12:19:02 +0000
212 -+++ bs4/testing.py 2013-05-20 13:19:16 +0000
213 -@@ -464,6 +464,18 @@
214 - self.assertEqual(
215 - soup.encode("utf-8"), markup)
216 -
217 -+ def test_formatter_processes_script_tag_for_xml_documents(self):
218 -+ doc = """
219 -+ <script type="text/javascript">
220 -+ </script>
221 -+"""
222 -+ soup = BeautifulSoup(doc, "xml")
223 -+ # lxml would have stripped this while parsing, but we can add
224 -+ # it later.
225 -+ soup.script.string = 'console.log("< < hey > > ");'
226 -+ encoded = soup.encode()
227 -+ self.assertTrue(b"&lt; &lt; hey &gt; &gt;" in encoded)
228 -+
229 - def test_popping_namespaced_tag(self):
230 - markup = '<rss xmlns:dc="foo"><dc:creator>b</dc:creator><dc:date>2012-07-02T20:33:42Z</dc:date><dc:rights>c</dc:rights><image>d</image></rss>'
231 - soup = self.soup(markup)
232 -
233 -=== modified file 'bs4/tests/test_lxml.py'
234 ---- bs4/tests/test_lxml.py 2013-05-09 19:36:30 +0000
235 -+++ bs4/tests/test_lxml.py 2013-05-20 13:19:16 +0000
236 -@@ -10,6 +10,7 @@
237 - LXML_VERSION = lxml.etree.LXML_VERSION
238 - except ImportError, e:
239 - LXML_PRESENT = False
240 -+ LXML_VERSION = (0,)
241 -
242 - from bs4 import (
243 - BeautifulSoup,
244 -@@ -47,7 +48,7 @@
245 - # test if an old version of lxml is installed.
246 -
247 - @skipIf(
248 -- LXML_VERSION < (2,3,5,0),
249 -+ not LXML_PRESENT or LXML_VERSION < (2,3,5,0),
250 - "Skipping doctype test for old version of lxml to avoid segfault.")
251 - def test_empty_doctype(self):
252 - soup = self.soup("<!DOCTYPE>")
253 -
254 -=== modified file 'bs4/tests/test_tree.py'
255 ---- bs4/tests/test_tree.py 2013-05-14 12:39:16 +0000
256 -+++ bs4/tests/test_tree.py 2013-05-20 13:19:16 +0000
257 -@@ -1344,18 +1344,6 @@
258 - encoded = BeautifulSoup(doc).encode()
259 - self.assertTrue(b"< < hey > >" in encoded)
260 -
261 -- def test_formatter_processes_script_tag_for_xml_documents(self):
262 -- doc = """
263 -- <script type="text/javascript">
264 -- </script>
265 --"""
266 -- soup = BeautifulSoup(doc, "xml")
267 -- # lxml would have stripped this while parsing, but we can add
268 -- # it later.
269 -- soup.script.string = 'console.log("< < hey > > ");'
270 -- encoded = soup.encode()
271 -- self.assertTrue(b"&lt; &lt; hey &gt; &gt;" in encoded)
272 --
273 - def test_prettify_leaves_preformatted_text_alone(self):
274 - soup = self.soup("<div> foo <pre> \tbar\n \n </pre> baz ")
275 - # Everything outside the <pre> tag is reformatted, but everything
276 -