1 |
commit: 2789272306f626ebce22604d0e741724f6f522e7 |
2 |
Author: Justin Lecher <jlec <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Sep 25 10:06:47 2015 +0000 |
4 |
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Sep 25 10:07:00 2015 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=27892723 |
7 |
|
8 |
dev-python/pyquery: Drop optional dep to optfeature |
9 |
|
10 |
Package-Manager: portage-2.2.21 |
11 |
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org> |
12 |
|
13 |
dev-python/pyquery/Manifest | 1 - |
14 |
dev-python/pyquery/metadata.xml | 3 -- |
15 |
dev-python/pyquery/pyquery-1.2.4.ebuild | 44 ------------------------------ |
16 |
dev-python/pyquery/pyquery-1.2.8.ebuild | 17 ++++++++---- |
17 |
dev-python/pyquery/pyquery-1.2.9-r1.ebuild | 15 ++++++---- |
18 |
dev-python/pyquery/pyquery-1.2.9.ebuild | 15 ++++++---- |
19 |
6 files changed, 31 insertions(+), 64 deletions(-) |
20 |
|
21 |
diff --git a/dev-python/pyquery/Manifest b/dev-python/pyquery/Manifest |
22 |
index 739b3fd..91ab6dc 100644 |
23 |
--- a/dev-python/pyquery/Manifest |
24 |
+++ b/dev-python/pyquery/Manifest |
25 |
@@ -1,3 +1,2 @@ |
26 |
-DIST pyquery-1.2.4.tar.gz 23999 SHA256 1c39f786c42430279eadf787f1ef06873f15c9acba2698c23dfd925ac7b169d7 SHA512 77ec2efab157f693361e1dcbeabd7cac0709d3a8a25b6c47eb333be49c1485c7fa50b4fd9238bfff69657368130c2886cf6e0705415bdf1b48dc434365539c29 WHIRLPOOL 3fece4f710d69a0b57ab858f759196b269984a38af568003f7280215763c67b1e229feaf80f27b359a5da923248a11335026af4de85806ea6fc969c61c197685 |
27 |
DIST pyquery-1.2.8.zip 42552 SHA256 59af39301bad397e085e5080987f94ef30672f1cf8e73d19d3307b3b63c3cb4b SHA512 9d344a5c4b0dd565e31c803ceecb217c71f9a70badbc65f9fcfb4a2cccb725a1bf938ed0b1697dcfdf0ec967321dccc1916a884ffdb0af9828a65005f63c47d7 WHIRLPOOL 5c98c3e7584d429a7c9bca564aac04e5dc6f579265aa9b8b768e167cdfcc57758b0d728b3102a56af75fa6ea838a6c1927e733a5171d3266574ba2b34ee85209 |
28 |
DIST pyquery-1.2.9.zip 45289 SHA256 46c51eb878b787e814ee8f9737b0a62111034aeb4d1c06450ac5a8ea5a70e602 SHA512 f5152b471c896b39032add6a7f0e6ce63f426b4903bc7cf9eef12723c73453b40c310dd1497a7c4189fc6faaf804690fd91fb6d2f97fb6c4d6314682de4b8d05 WHIRLPOOL a57bb04402a3a8af98e7073d2b4e415a3e455bb67b4dc946831832f24339fe29fcd560123651abb3ae38c4ee9da3973638d27e064122702c0d1dd63d971fb67b |
29 |
|
30 |
diff --git a/dev-python/pyquery/metadata.xml b/dev-python/pyquery/metadata.xml |
31 |
index 5609388..a606518 100644 |
32 |
--- a/dev-python/pyquery/metadata.xml |
33 |
+++ b/dev-python/pyquery/metadata.xml |
34 |
@@ -6,7 +6,4 @@ |
35 |
<remote-id type="pypi">pyquery</remote-id> |
36 |
<remote-id type="github">gawel/pyquery</remote-id> |
37 |
</upstream> |
38 |
- <use> |
39 |
- <flag name="beautifulsoup3">Support BeautifulSoup 3</flag> |
40 |
- </use> |
41 |
</pkgmetadata> |
42 |
|
43 |
diff --git a/dev-python/pyquery/pyquery-1.2.4.ebuild b/dev-python/pyquery/pyquery-1.2.4.ebuild |
44 |
deleted file mode 100644 |
45 |
index 21a1e0d..0000000 |
46 |
--- a/dev-python/pyquery/pyquery-1.2.4.ebuild |
47 |
+++ /dev/null |
48 |
@@ -1,44 +0,0 @@ |
49 |
-# Copyright 1999-2014 Gentoo Foundation |
50 |
-# Distributed under the terms of the GNU General Public License v2 |
51 |
-# $Id$ |
52 |
- |
53 |
-EAPI=5 |
54 |
- |
55 |
-PYTHON_COMPAT=( python{2_7,3_3} ) |
56 |
- |
57 |
-inherit distutils-r1 |
58 |
- |
59 |
-DESCRIPTION="A jQuery-like library for python" |
60 |
-HOMEPAGE="https://pypi.python.org/pypi/pyquery" |
61 |
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz" |
62 |
- |
63 |
-LICENSE="BSD" |
64 |
-SLOT="0" |
65 |
-KEYWORDS="alpha amd64 arm ~hppa ia64 ppc ~ppc64 s390 sh sparc x86 ~x86-fbsd" |
66 |
-IUSE="beautifulsoup3 test" |
67 |
- |
68 |
-RDEPEND=">=dev-python/lxml-2.1[beautifulsoup3?,${PYTHON_USEDEP}] |
69 |
- dev-python/cssselect[${PYTHON_USEDEP}] |
70 |
- >=dev-python/webob-1.2_rc1[${PYTHON_USEDEP}]" |
71 |
-DEPEND="${RDEPEND} |
72 |
- dev-python/setuptools[${PYTHON_USEDEP}] |
73 |
- test? ( dev-python/nose[${PYTHON_USEDEP}] )" |
74 |
-REQUIRED_USE="test? ( beautifulsoup3 )" |
75 |
- |
76 |
-DOCS=( CHANGES.rst README.rst ) |
77 |
- |
78 |
-python_prepare_all() { |
79 |
- # Disable tests that access the net |
80 |
- for file in docs/{ajax.txt,manipulating.txt,scrap.txt,tips.txt} |
81 |
- do |
82 |
- mv ${file} ${file/.txt/} || die |
83 |
- done |
84 |
- sed -e 's:>>> d = pq(url:>>> # d = pq(url:' -i README.rst || die |
85 |
- sed -e 's:class TestWebScrapping:class _TestWebScrapping:' -i ${PN}/test.py || die |
86 |
- |
87 |
- distutils-r1_python_prepare_all |
88 |
-} |
89 |
- |
90 |
-python_test() { |
91 |
- nosetests || die "Tests fail with ${EPYTHON}" |
92 |
-} |
93 |
|
94 |
diff --git a/dev-python/pyquery/pyquery-1.2.8.ebuild b/dev-python/pyquery/pyquery-1.2.8.ebuild |
95 |
index fa371b1..4a02d40 100644 |
96 |
--- a/dev-python/pyquery/pyquery-1.2.8.ebuild |
97 |
+++ b/dev-python/pyquery/pyquery-1.2.8.ebuild |
98 |
@@ -1,4 +1,4 @@ |
99 |
-# Copyright 1999-2014 Gentoo Foundation |
100 |
+# Copyright 1999-2015 Gentoo Foundation |
101 |
# Distributed under the terms of the GNU General Public License v2 |
102 |
# $Id$ |
103 |
|
104 |
@@ -6,7 +6,7 @@ EAPI=5 |
105 |
|
106 |
PYTHON_COMPAT=( python{2_7,3_3} ) |
107 |
|
108 |
-inherit distutils-r1 |
109 |
+inherit distutils-r1 eutils |
110 |
|
111 |
DESCRIPTION="A jQuery-like library for python" |
112 |
HOMEPAGE="https://github.com/gawel/pyquery" |
113 |
@@ -15,9 +15,10 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip" |
114 |
LICENSE="BSD" |
115 |
SLOT="0" |
116 |
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd" |
117 |
-IUSE="beautifulsoup3 test" |
118 |
+IUSE="test" |
119 |
|
120 |
-RDEPEND=">=dev-python/lxml-2.1[beautifulsoup3?,${PYTHON_USEDEP}] |
121 |
+RDEPEND=" |
122 |
+ >=dev-python/lxml-2.1[${PYTHON_USEDEP}] |
123 |
dev-python/cssselect[${PYTHON_USEDEP}] |
124 |
>=dev-python/webob-1.2[${PYTHON_USEDEP}] |
125 |
dev-python/webtest[${PYTHON_USEDEP}]" |
126 |
@@ -25,10 +26,10 @@ DEPEND=" |
127 |
dev-python/setuptools[${PYTHON_USEDEP}] |
128 |
app-arch/unzip |
129 |
test? ( ${RDEPEND} |
130 |
+ dev-python/beautifulsoup:python-2[$(python_gen_usedep 'python2*')] |
131 |
+ dev-python/beautifulsoup:python-3[$(python_gen_usedep 'python3*')] |
132 |
dev-python/nose[${PYTHON_USEDEP}] )" |
133 |
|
134 |
-REQUIRED_USE="test? ( beautifulsoup3 )" |
135 |
- |
136 |
python_prepare_all() { |
137 |
# rm known failing tests and tests dependent on restkit |
138 |
# https://github.com/gawel/pyquery/pull/63/files |
139 |
@@ -43,3 +44,7 @@ python_test() { |
140 |
# The suite, it appears, requires this hard setting of PYTHONPATH! |
141 |
PYTHONPATH=. nosetests || die "Tests fail with ${EPYTHON}" |
142 |
} |
143 |
+ |
144 |
+pkg_postinst() { |
145 |
+ optfeature "Support for BeautifulSoup3 as a parser backend" dev-python/beautifulsoup |
146 |
+} |
147 |
|
148 |
diff --git a/dev-python/pyquery/pyquery-1.2.9-r1.ebuild b/dev-python/pyquery/pyquery-1.2.9-r1.ebuild |
149 |
index 1344a4c..580a695 100644 |
150 |
--- a/dev-python/pyquery/pyquery-1.2.9-r1.ebuild |
151 |
+++ b/dev-python/pyquery/pyquery-1.2.9-r1.ebuild |
152 |
@@ -6,7 +6,7 @@ EAPI=5 |
153 |
|
154 |
PYTHON_COMPAT=( python{2_7,3_3,3_4} ) |
155 |
|
156 |
-inherit distutils-r1 |
157 |
+inherit distutils-r1 eutils |
158 |
|
159 |
DESCRIPTION="A jQuery-like library for python" |
160 |
HOMEPAGE="https://github.com/gawel/pyquery" |
161 |
@@ -15,23 +15,28 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip" |
162 |
LICENSE="BSD" |
163 |
SLOT="0" |
164 |
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86" |
165 |
-IUSE="beautifulsoup3 test" |
166 |
+IUSE="test" |
167 |
|
168 |
-RDEPEND=">=dev-python/lxml-2.1[beautifulsoup3?,${PYTHON_USEDEP}] |
169 |
+RDEPEND=" |
170 |
+ >=dev-python/lxml-2.1[${PYTHON_USEDEP}] |
171 |
>dev-python/cssselect-0.7.9[${PYTHON_USEDEP}] |
172 |
>=dev-python/webob-1.1.9[${PYTHON_USEDEP}]" |
173 |
DEPEND=" |
174 |
dev-python/setuptools[${PYTHON_USEDEP}] |
175 |
app-arch/unzip |
176 |
test? ( ${RDEPEND} |
177 |
+ dev-python/beautifulsoup:python-2[$(python_gen_usedep 'python2*')] |
178 |
+ dev-python/beautifulsoup:python-3[$(python_gen_usedep 'python3*')] |
179 |
dev-python/requests[${PYTHON_USEDEP}] |
180 |
dev-python/nose[${PYTHON_USEDEP}] |
181 |
dev-python/webtest[${PYTHON_USEDEP}] |
182 |
$(python_gen_cond_dep 'dev-python/restkit[${PYTHON_USEDEP}]' 'python2_7') )" |
183 |
|
184 |
-REQUIRED_USE="test? ( beautifulsoup3 )" |
185 |
- |
186 |
python_test() { |
187 |
# The suite, it appears, requires this hard setting of PYTHONPATH! |
188 |
PYTHONPATH=. nosetests || die "Tests fail with ${EPYTHON}" |
189 |
} |
190 |
+ |
191 |
+pkg_postinst() { |
192 |
+ optfeature "Support for BeautifulSoup3 as a parser backend" dev-python/beautifulsoup |
193 |
+} |
194 |
|
195 |
diff --git a/dev-python/pyquery/pyquery-1.2.9.ebuild b/dev-python/pyquery/pyquery-1.2.9.ebuild |
196 |
index c556f77..c738f3a 100644 |
197 |
--- a/dev-python/pyquery/pyquery-1.2.9.ebuild |
198 |
+++ b/dev-python/pyquery/pyquery-1.2.9.ebuild |
199 |
@@ -6,7 +6,7 @@ EAPI=5 |
200 |
|
201 |
PYTHON_COMPAT=( python{2_7,3_3,3_4} ) |
202 |
|
203 |
-inherit distutils-r1 |
204 |
+inherit distutils-r1 eutils |
205 |
|
206 |
DESCRIPTION="A jQuery-like library for python" |
207 |
HOMEPAGE="https://github.com/gawel/pyquery" |
208 |
@@ -15,22 +15,27 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.zip" |
209 |
LICENSE="BSD" |
210 |
SLOT="0" |
211 |
KEYWORDS="alpha amd64 arm ~hppa ppc ppc64 sparc x86" |
212 |
-IUSE="beautifulsoup3 test" |
213 |
+IUSE="test" |
214 |
|
215 |
-RDEPEND=">=dev-python/lxml-2.1[beautifulsoup3?,${PYTHON_USEDEP}] |
216 |
+RDEPEND=" |
217 |
+ >=dev-python/lxml-2.1[${PYTHON_USEDEP}] |
218 |
>dev-python/cssselect-0.7.9[${PYTHON_USEDEP}] |
219 |
>=dev-python/webob-1.1.9[${PYTHON_USEDEP}]" |
220 |
DEPEND=" |
221 |
dev-python/setuptools[${PYTHON_USEDEP}] |
222 |
app-arch/unzip |
223 |
test? ( ${RDEPEND} |
224 |
+ dev-python/beautifulsoup:python-2[$(python_gen_usedep 'python2*')] |
225 |
+ dev-python/beautifulsoup:python-3[$(python_gen_usedep 'python3*')] |
226 |
dev-python/requests[${PYTHON_USEDEP}] |
227 |
dev-python/nose[${PYTHON_USEDEP}] |
228 |
dev-python/webtest[${PYTHON_USEDEP}] )" |
229 |
|
230 |
-REQUIRED_USE="test? ( beautifulsoup3 )" |
231 |
- |
232 |
python_test() { |
233 |
# The suite, it appears, requires this hard setting of PYTHONPATH! |
234 |
PYTHONPATH=. nosetests || die "Tests fail with ${EPYTHON}" |
235 |
} |
236 |
+ |
237 |
+pkg_postinst() { |
238 |
+ optfeature "Support for BeautifulSoup3 as a parser backend" dev-python/beautifulsoup |
239 |
+} |