From: Conrad Kostecki <conrad@kostecki.com>
Date: Sun, 21 Jul 2019 08:48:53 +0000 (+0200)
Subject: net-im/spectrum2: use correct python eclass
X-Git-Url: http://git.tremily.us/gitweb.cgi?a=commitdiff_plain;h=b1ff6a5fe31857bad5a74c6e412461d820d9eaa7;p=gentoo.git

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 <conrad@kostecki.com>
Closes: https://github.com/gentoo/gentoo/pull/12485
Signed-off-by: Andreas Sturmlechner <asturm@gentoo.org>
---

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 d528d2460792..be621d22a701 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() {