From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id CCA96138335 for ; Sun, 21 Jul 2019 21:48:09 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id C7488E0848; Sun, 21 Jul 2019 21:48:08 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id AECDEE0848 for ; Sun, 21 Jul 2019 21:48:08 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 8E3AC34840E for ; Sun, 21 Jul 2019 21:48:07 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id EAA412A5 for ; Sun, 21 Jul 2019 21:48:05 +0000 (UTC) From: "Andreas Sturmlechner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas Sturmlechner" Message-ID: <1563745572.b1ff6a5fe31857bad5a74c6e412461d820d9eaa7.asturm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: net-im/spectrum2/ X-VCS-Repository: repo/gentoo X-VCS-Files: net-im/spectrum2/spectrum2-2.0.10.1-r1.ebuild net-im/spectrum2/spectrum2-2.0.10.1-r2.ebuild X-VCS-Directories: net-im/spectrum2/ X-VCS-Committer: asturm X-VCS-Committer-Name: Andreas Sturmlechner X-VCS-Revision: b1ff6a5fe31857bad5a74c6e412461d820d9eaa7 X-VCS-Branch: master Date: Sun, 21 Jul 2019 21:48:05 +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-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 7f04d2a6-fced-49b3-b6d9-e30e28bb063c X-Archives-Hash: eaef65771a225128e6ab7b584e60dc5d commit: b1ff6a5fe31857bad5a74c6e412461d820d9eaa7 Author: Conrad Kostecki kostecki com> AuthorDate: Sun Jul 21 08:48:53 2019 +0000 Commit: Andreas Sturmlechner gentoo org> CommitDate: Sun Jul 21 21:46:12 2019 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b1ff6a5f net-im/spectrum2: use correct python eclass Switching from python-single-r1 eclass to python-any-r1 eclass, since python is only used for tests and not during runtime. Package-Manager: Portage-2.3.69, Repoman-2.3.16 Signed-off-by: Conrad Kostecki kostecki.com> Closes: https://github.com/gentoo/gentoo/pull/12485 Signed-off-by: Andreas Sturmlechner gentoo.org> ...trum2-2.0.10.1-r1.ebuild => spectrum2-2.0.10.1-r2.ebuild} | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/net-im/spectrum2/spectrum2-2.0.10.1-r1.ebuild b/net-im/spectrum2/spectrum2-2.0.10.1-r2.ebuild similarity index 90% rename from net-im/spectrum2/spectrum2-2.0.10.1-r1.ebuild rename to net-im/spectrum2/spectrum2-2.0.10.1-r2.ebuild index d528d246079..be621d22a70 100644 --- a/net-im/spectrum2/spectrum2-2.0.10.1-r1.ebuild +++ b/net-im/spectrum2/spectrum2-2.0.10.1-r2.ebuild @@ -5,7 +5,7 @@ EAPI=7 PYTHON_COMPAT=( python2_7 ) -inherit cmake-utils python-single-r1 systemd user +inherit cmake-utils python-any-r1 systemd user DESCRIPTION="An open source instant messaging transport" HOMEPAGE="https://www.spectrum.im" @@ -49,11 +49,11 @@ RDEPEND=" whatsapp? ( net-im/transwhat )" DEPEND=" - ${PYTHON_DEPS} ${RDEPEND} doc? ( app-doc/doxygen ) test? ( - dev-python/sleekxmpp[${PYTHON_USEDEP}] + ${PYTHON_DEPS} + $(python_gen_any_dep 'dev-python/sleekxmpp[${PYTHON_USEDEP}]') dev-util/cppunit net-irc/ngircd ) @@ -62,11 +62,15 @@ DEPEND=" # Tests are currently restricted, as they do completly fail RESTRICT="test" +python_check_deps() { + has_version "dev-python/sleekxmpp[${PYTHON_USEDEP}]" +} + pkg_setup() { enewgroup spectrum enewuser spectrum -1 -1 /var/lib/spectrum2 spectrum - use test && python-single-r1_pkg_setup + use test && python-any-r1_pkg_setup } src_prepare() {