summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMart Raudsepp <leio@gentoo.org>2020-02-23 21:29:45 +0200
committerMart Raudsepp <leio@gentoo.org>2020-02-23 21:31:47 +0200
commit55695032862b6e7209c376cf39d02ef1fb61493c (patch)
tree1727b1172256058612e7da1cc3917076ce530ee9 /sys-apps/osinfo-db-tools
parenttexlive-module:eclass correct missing if block (diff)
downloadgentoo-55695032862b6e7209c376cf39d02ef1fb61493c.tar.gz
gentoo-55695032862b6e7209c376cf39d02ef1fb61493c.tar.bz2
gentoo-55695032862b6e7209c376cf39d02ef1fb61493c.zip
sys-apps/osinfo-db-tools: properly use python-any-r1 for the new test deps
Package-Manager: Portage-2.3.84, Repoman-2.3.20 Signed-off-by: Mart Raudsepp <leio@gentoo.org>
Diffstat (limited to 'sys-apps/osinfo-db-tools')
-rw-r--r--sys-apps/osinfo-db-tools/osinfo-db-tools-1.6.0-r1.ebuild (renamed from sys-apps/osinfo-db-tools/osinfo-db-tools-1.6.0.ebuild)19
1 files changed, 12 insertions, 7 deletions
diff --git a/sys-apps/osinfo-db-tools/osinfo-db-tools-1.6.0.ebuild b/sys-apps/osinfo-db-tools/osinfo-db-tools-1.6.0-r1.ebuild
index e3002f6cee03..1d3a019cc342 100644
--- a/sys-apps/osinfo-db-tools/osinfo-db-tools-1.6.0.ebuild
+++ b/sys-apps/osinfo-db-tools/osinfo-db-tools-1.6.0-r1.ebuild
@@ -5,7 +5,7 @@ EAPI=6
PYTHON_COMPAT=( python3_{6,7,8} )
-inherit python-single-r1 gnome2
+inherit python-any-r1 gnome2
DESCRIPTION="Tools for managing the osinfo database"
HOMEPAGE="https://libosinfo.org/"
@@ -16,7 +16,6 @@ SLOT="0"
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~sparc ~x86"
IUSE="test"
-REQUIRED_USE="test? ( ${PYTHON_REQUIRED_USE} )"
RESTRICT="!test? ( test )"
# Blocker on old libosinfo as osinfo-db-validate was part of it before
@@ -35,14 +34,20 @@ DEPEND="${RDEPEND}
virtual/pkgconfig
>=sys-devel/gettext-0.19.8
dev-lang/perl
- test? ( ${PYTHON_DEPS}
- $(python_gen_cond_dep '
- dev-python/pytest[${PYTHON_MULTI_USEDEP}]
- dev-python/requests[${PYTHON_MULTI_USEDEP}]
+ test? (
+ $(python_gen_any_dep '
+ dev-python/pytest[${PYTHON_USEDEP}]
+ dev-python/requests[${PYTHON_USEDEP}]
')
)
"
+python_check_deps() {
+ use test && \
+ has_version "dev-python/pytest[${PYTHON_USEDEP}]" && \
+ has_version "dev-python/requests[${PYTHON_USEDEP}]"
+}
+
pkg_setup() {
- use test && python-single-r1_pkg_setup
+ use test && python-any-r1_pkg_setup
}