[gentoo-commits] repo/gentoo:master commit in: dev-python/xmpppy/

[Justin Lecher]

commit:     ab77ec100bc2bcefe46e79e700a392197bce0cfc
Author:     Justin Lecher <jlec <AT> gentoo <DOT> org>
AuthorDate: Fri Oct 30 12:03:39 2015 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Fri Oct 30 12:03:49 2015 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ab77ec10

dev-python/xmpppy: Move to virtual/dnspython

Package-Manager: portage-2.2.23
Signed-off-by: Justin Lecher <jlec <AT> gentoo.org>

 .../{xmpppy-0.5.0_rc1-r1.ebuild => xmpppy-0.5.0_rc1-r2.ebuild}   | 9 +++++----
 dev-python/xmpppy/xmpppy-0.5.0_rc1.ebuild                        | 4 ++--
 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
similarity index 83%
rename from dev-python/xmpppy/xmpppy-0.5.0_rc1-r1.ebuild
rename to dev-python/xmpppy/xmpppy-0.5.0_rc1-r2.ebuild
index 22a0bfb..c9cc7fa 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 49104c8..92fe198 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}