From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 8030713888F for ; Fri, 30 Oct 2015 12:04:33 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6C7CA21C025; Fri, 30 Oct 2015 12:04:07 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 90ADC21C004 for ; Fri, 30 Oct 2015 12:04:06 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id DAC37340C7C for ; Fri, 30 Oct 2015 12:04:05 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id A4D461B0E for ; Fri, 30 Oct 2015 12:04:00 +0000 (UTC) From: "Justin Lecher" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Justin Lecher" Message-ID: <1446206629.ab77ec100bc2bcefe46e79e700a392197bce0cfc.jlec@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: dev-python/xmpppy/ X-VCS-Repository: repo/gentoo X-VCS-Files: dev-python/xmpppy/xmpppy-0.5.0_rc1-r1.ebuild dev-python/xmpppy/xmpppy-0.5.0_rc1-r2.ebuild dev-python/xmpppy/xmpppy-0.5.0_rc1.ebuild X-VCS-Directories: dev-python/xmpppy/ X-VCS-Committer: jlec X-VCS-Committer-Name: Justin Lecher X-VCS-Revision: ab77ec100bc2bcefe46e79e700a392197bce0cfc X-VCS-Branch: master Date: Fri, 30 Oct 2015 12:04:00 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: fa864f6f-a48f-454e-bd61-07ac0d4bb5bd X-Archives-Hash: 149ffcd1aeb3cbe3759401ed329dde92 commit: ab77ec100bc2bcefe46e79e700a392197bce0cfc Author: Justin Lecher gentoo org> AuthorDate: Fri Oct 30 12:03:39 2015 +0000 Commit: Justin Lecher gentoo 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 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}