1 |
commit: e6a8aab73873581dc56d61c5c3fe07d460c2da4c |
2 |
Author: Justin Lecher <jlec <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Oct 30 11:59:28 2015 +0000 |
4 |
Commit: Justin Lecher <jlec <AT> gentoo <DOT> org> |
5 |
CommitDate: Fri Oct 30 12:03:49 2015 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e6a8aab7 |
7 |
|
8 |
dev-python/twill: Move to virtual/dnspython |
9 |
|
10 |
QA: |
11 |
add missing die |
12 |
|
13 |
Package-Manager: portage-2.2.23 |
14 |
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org> |
15 |
|
16 |
dev-python/twill/metadata.xml | 1 - |
17 |
dev-python/twill/twill-0.9-r1.ebuild | 21 ++++++++++++++------- |
18 |
2 files changed, 14 insertions(+), 8 deletions(-) |
19 |
|
20 |
diff --git a/dev-python/twill/metadata.xml b/dev-python/twill/metadata.xml |
21 |
index 9d2a928..a67d041 100644 |
22 |
--- a/dev-python/twill/metadata.xml |
23 |
+++ b/dev-python/twill/metadata.xml |
24 |
@@ -6,4 +6,3 @@ |
25 |
twill is a simple language that allows users to browse the Web from a command-line interface. With twill, you can navigate through Web sites that use forms, cookies, and most standard Web features. twill supports automated Web testing and has a simple Python interface. Check out the examples! twill is open source and written in Python. |
26 |
</longdescription> |
27 |
</pkgmetadata> |
28 |
- |
29 |
|
30 |
diff --git a/dev-python/twill/twill-0.9-r1.ebuild b/dev-python/twill/twill-0.9-r1.ebuild |
31 |
index 1d397df..d69c8f7 100644 |
32 |
--- a/dev-python/twill/twill-0.9-r1.ebuild |
33 |
+++ b/dev-python/twill/twill-0.9-r1.ebuild |
34 |
@@ -3,6 +3,7 @@ |
35 |
# $Id$ |
36 |
|
37 |
EAPI="5" |
38 |
+ |
39 |
PYTHON_COMPAT=( python2_7 pypy ) |
40 |
|
41 |
inherit distutils-r1 |
42 |
@@ -19,18 +20,24 @@ SLOT="0" |
43 |
KEYWORDS="amd64 ~arm ppc ~ppc64 x86" |
44 |
IUSE="doc examples" |
45 |
|
46 |
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}] |
47 |
- doc? ( $(python_gen_cond_dep 'dev-python/epydoc[${PYTHON_USEDEP}]' python2_7) |
48 |
- $(python_gen_cond_dep 'dev-python/dnspython[${PYTHON_USEDEP}]' python2_7) )" |
49 |
+DEPEND=" |
50 |
+ dev-python/setuptools[${PYTHON_USEDEP}] |
51 |
+ doc? ( |
52 |
+ $(python_gen_cond_dep 'dev-python/epydoc[${PYTHON_USEDEP}]' python2_7) |
53 |
+ || ( |
54 |
+ dev-python/dnspython:0[${PYTHON_USEDEP}] |
55 |
+ virtual/dnspython:0[${PYTHON_USEDEP}] |
56 |
+ ) |
57 |
+ )" |
58 |
|
59 |
S="${WORKDIR}/${MY_P}" |
60 |
|
61 |
python_compile_all() { |
62 |
if use doc; then |
63 |
- pushd doc > /dev/null |
64 |
- chmod +x make-epydoc.sh |
65 |
- ./make-epydoc.sh |
66 |
- popd> /dev/null |
67 |
+ pushd doc > /dev/null || die |
68 |
+ chmod +x make-epydoc.sh || die |
69 |
+ ./make-epydoc.sh || die |
70 |
+ popd> /dev/null || die |
71 |
fi |
72 |
} |