sci-biology/seqan: [QA] Add missing python metadata variables

Package-Manager: Portage-2.3.5, Repoman-2.3.2

diff --git a/sci-biology/seqan/seqan-1.4.2-r1.ebuild b/sci-biology/seqan/seqan-1.4.2-r1.ebuild
index 4848f159d14556e1b1b3a300cb06871a37afba30..5fd8f1ae8a147fedf22f9d0b06af887e7bc676a9 100644 (file)
--- a/sci-biology/seqan/seqan-1.4.2-r1.ebuild
+++ b/sci-biology/seqan/seqan-1.4.2-r1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 PYTHON_COMPAT=( python2_7 )
 
-inherit cmake-utils python-single-r1
+inherit cmake-utils python-any-r1
 
 DESCRIPTION="C++ Sequence Analysis Library"
 HOMEPAGE="http://www.seqan.de/"
@@ -15,13 +15,17 @@ SLOT="$(get_version_component_range 1-2)"
 LICENSE="BSD GPL-3"
 KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 IUSE="cpu_flags_x86_sse4_1 test"
-DEPEND="sys-libs/zlib
-       app-arch/bzip2
-       test? ( dev-python/nose[${PYTHON_USEDEP}] )"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE} cpu_flags_x86_sse4_1"
+REQUIRED_USE="cpu_flags_x86_sse4_1"
 
-#S="${WORKDIR}"/${PN}-${PN}-v${PV}
+RDEPEND="
+       app-arch/bzip2
+       sys-libs/zlib"
+DEPEND="
+       ${RDEPEND}
+       test? (
+               $(python_gen_any_dep 'dev-python/nose[${PYTHON_USEDEP}]')
+               ${PYTHON_DEPS}
+       )"
 
 PATCHES=(
        "${FILESDIR}/${P}-shared.patch"
@@ -29,6 +33,10 @@ PATCHES=(
        "${FILESDIR}/${P}-buildsystem.patch"
 )
 
+pkg_setup() {
+       use test && python-any-r1_pkg_setup
+}
+
 src_prepare() {
        # pkg-config file, taken from seqan 2.1
        cp "${FILESDIR}"/${PN}.pc.in ${PN}-${SLOT}.pc || die

diff --git a/sci-biology/seqan/seqan-2.2.0-r1.ebuild b/sci-biology/seqan/seqan-2.2.0-r1.ebuild
index f59ae0a1bae1b61c4401ec0839c2ee46e3840655..2452ff0baea6c17d559d1fe33b68f614489cb063 100644 (file)
--- a/sci-biology/seqan/seqan-2.2.0-r1.ebuild
+++ b/sci-biology/seqan/seqan-2.2.0-r1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 PYTHON_COMPAT=( python2_7 )
 
-inherit cmake-utils python-single-r1
+inherit cmake-utils python-any-r1
 
 DESCRIPTION="C++ Sequence Analysis Library"
 HOMEPAGE="http://www.seqan.de/"
@@ -15,21 +15,33 @@ SLOT="0"
 LICENSE="BSD GPL-3"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="cpu_flags_x86_sse4_1 doc test"
+REQUIRED_USE="cpu_flags_x86_sse4_1"
+
 RDEPEND="
        app-arch/bzip2
        sys-libs/zlib
        !!sci-biology/seqan:2.0
        !!sci-biology/seqan:2.1
        !!sci-biology/seqan:2.2"
-DEPEND="${RDEPEND}
-       ${PYTHON_DEPS}
-       doc? ( dev-python/sphinx[${PYTHON_USEDEP}] )
-       test? ( dev-python/nose[${PYTHON_USEDEP}] )"
-
-REQUIRED_USE="doc? ( ${PYTHON_REQUIRED_USE} ) test? ( ${PYTHON_REQUIRED_USE} ) cpu_flags_x86_sse4_1"
+DEPEND="
+       ${RDEPEND}
+       doc? (
+               $(python_gen_any_dep 'dev-python/sphinx[${PYTHON_USEDEP}]')
+               ${PYTHON_DEPS}
+       )
+       test? (
+               $(python_gen_any_dep 'dev-python/nose[${PYTHON_USEDEP}]')
+               ${PYTHON_DEPS}
+       )"
 
 S="${WORKDIR}"/${PN}-${PN}-v${PV}
 
+pkg_setup() {
+       if use test || use doc; then
+               python-any-r1_pkg_setup
+       fi
+}
+
 src_prepare() {
        seqan_major_ver=$(get_version_component_range 1)
        seqan_majorminor_ver=$(get_version_component_range 1-2)