summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--dev-python/xmpppy/xmpppy-0.5.0_rc1-r2.ebuild (renamed from dev-python/xmpppy/xmpppy-0.5.0_rc1-r1.ebuild)9
-rw-r--r--dev-python/xmpppy/xmpppy-0.5.0_rc1.ebuild4
2 files changed, 7 insertions, 6 deletions
diff --git a/dev-python/xmpppy/xmpppy-0.5.0_rc1-r1.ebuild b/dev-python/xmpppy/xmpppy-0.5.0_rc1-r2.ebuild
index 22a0bfba010f..c9cc7fab7fdd 100644
--- a/dev-python/xmpppy/xmpppy-0.5.0_rc1-r1.ebuild
+++ b/dev-python/xmpppy/xmpppy-0.5.0_rc1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2014 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -19,8 +19,9 @@ SLOT="0"
KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~ppc64 ~x86"
IUSE="doc"
-RDEPEND="|| (
- dev-python/dnspython[${PYTHON_USEDEP}]
+RDEPEND="
+ || (
+ virtual/dnspython[${PYTHON_USEDEP}]
dev-python/pydns[${PYTHON_USEDEP}]
)"
DEPEND="${RDEPEND}
@@ -33,6 +34,6 @@ PATCHES=(
)
python_install_all() {
+ use doc && HTML_DOCS=( doc/. )
distutils-r1_python_install_all
- use doc && dohtml -A py -r doc/.
}
diff --git a/dev-python/xmpppy/xmpppy-0.5.0_rc1.ebuild b/dev-python/xmpppy/xmpppy-0.5.0_rc1.ebuild
index 49104c845a0e..92fe198f5c4a 100644
--- a/dev-python/xmpppy/xmpppy-0.5.0_rc1.ebuild
+++ b/dev-python/xmpppy/xmpppy-0.5.0_rc1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Id$
@@ -21,7 +21,7 @@ KEYWORDS="amd64 ~arm ~ia64 ~ppc ~ppc64 x86"
IUSE="doc"
RDEPEND="|| (
- dev-python/dnspython
+ dev-python/dnspython:0
dev-python/pydns
)"
DEPEND="${RDEPEND}