1 |
commit: ab77ec100bc2bcefe46e79e700a392197bce0cfc |
2 |
Author: Justin Lecher <jlec <AT> gentoo <DOT> org> |
3 |
AuthorDate: Fri Oct 30 12:03:39 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=ab77ec10 |
7 |
|
8 |
dev-python/xmpppy: Move to virtual/dnspython |
9 |
|
10 |
Package-Manager: portage-2.2.23 |
11 |
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org> |
12 |
|
13 |
.../{xmpppy-0.5.0_rc1-r1.ebuild => xmpppy-0.5.0_rc1-r2.ebuild} | 9 +++++---- |
14 |
dev-python/xmpppy/xmpppy-0.5.0_rc1.ebuild | 4 ++-- |
15 |
2 files changed, 7 insertions(+), 6 deletions(-) |
16 |
|
17 |
diff --git a/dev-python/xmpppy/xmpppy-0.5.0_rc1-r1.ebuild b/dev-python/xmpppy/xmpppy-0.5.0_rc1-r2.ebuild |
18 |
similarity index 83% |
19 |
rename from dev-python/xmpppy/xmpppy-0.5.0_rc1-r1.ebuild |
20 |
rename to dev-python/xmpppy/xmpppy-0.5.0_rc1-r2.ebuild |
21 |
index 22a0bfb..c9cc7fa 100644 |
22 |
--- a/dev-python/xmpppy/xmpppy-0.5.0_rc1-r1.ebuild |
23 |
+++ b/dev-python/xmpppy/xmpppy-0.5.0_rc1-r2.ebuild |
24 |
@@ -1,4 +1,4 @@ |
25 |
-# Copyright 1999-2014 Gentoo Foundation |
26 |
+# Copyright 1999-2015 Gentoo Foundation |
27 |
# Distributed under the terms of the GNU General Public License v2 |
28 |
# $Id$ |
29 |
|
30 |
@@ -19,8 +19,9 @@ SLOT="0" |
31 |
KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86" |
32 |
IUSE="doc" |
33 |
|
34 |
-RDEPEND="|| ( |
35 |
- dev-python/dnspython[${PYTHON_USEDEP}] |
36 |
+RDEPEND=" |
37 |
+ || ( |
38 |
+ virtual/dnspython[${PYTHON_USEDEP}] |
39 |
dev-python/pydns[${PYTHON_USEDEP}] |
40 |
)" |
41 |
DEPEND="${RDEPEND} |
42 |
@@ -33,6 +34,6 @@ PATCHES=( |
43 |
) |
44 |
|
45 |
python_install_all() { |
46 |
+ use doc && HTML_DOCS=( doc/. ) |
47 |
distutils-r1_python_install_all |
48 |
- use doc && dohtml -A py -r doc/. |
49 |
} |
50 |
|
51 |
diff --git a/dev-python/xmpppy/xmpppy-0.5.0_rc1.ebuild b/dev-python/xmpppy/xmpppy-0.5.0_rc1.ebuild |
52 |
index 49104c8..92fe198 100644 |
53 |
--- a/dev-python/xmpppy/xmpppy-0.5.0_rc1.ebuild |
54 |
+++ b/dev-python/xmpppy/xmpppy-0.5.0_rc1.ebuild |
55 |
@@ -1,4 +1,4 @@ |
56 |
-# Copyright 1999-2012 Gentoo Foundation |
57 |
+# Copyright 1999-2015 Gentoo Foundation |
58 |
# Distributed under the terms of the GNU General Public License v2 |
59 |
# $Id$ |
60 |
|
61 |
@@ -21,7 +21,7 @@ KEYWORDS="amd64 ~arm ~ia64 ~ppc ~ppc64 x86" |
62 |
IUSE="doc" |
63 |
|
64 |
RDEPEND="|| ( |
65 |
- dev-python/dnspython |
66 |
+ dev-python/dnspython:0 |
67 |
dev-python/pydns |
68 |
)" |
69 |
DEPEND="${RDEPEND} |