[gentoo-commits] repo/gentoo:master commit in: sci-biology/seqan/

["Michał Górny" <mgorny@gentoo.org>]

commit:     2236a5f7ab3440ef27da0f5adc86a93ea557b63a
Author:     Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Wed Sep  9 10:29:59 2020 +0000
Commit:     Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Wed Sep  9 10:34:32 2020 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2236a5f7

sci-biology/seqan: Eradicate doc (python2)

Closes: https://bugs.gentoo.org/735442
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org>

 sci-biology/seqan/seqan-2.4.0.ebuild | 25 ++++++++-----------------
 sci-biology/seqan/seqan-9999.ebuild  | 25 ++++++++-----------------
 2 files changed, 16 insertions(+), 34 deletions(-)

diff --git a/sci-biology/seqan/seqan-2.4.0.ebuild b/sci-biology/seqan/seqan-2.4.0.ebuild
index 8b337e77e6b..5653a1ec94e 100644
--- a/sci-biology/seqan/seqan-2.4.0.ebuild
+++ b/sci-biology/seqan/seqan-2.4.0.ebuild
@@ -1,12 +1,11 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 : ${CMAKE_MAKEFILE_GENERATOR:=ninja}
-PYTHON_COMPAT=( python2_7 )
 
-inherit cmake-utils multibuild python-any-r1 toolchain-funcs
+inherit cmake-utils multibuild toolchain-funcs
 
 DESCRIPTION="C++ Sequence Analysis Library"
 HOMEPAGE="http://www.seqan.de/"
@@ -24,7 +23,7 @@ fi
 
 LICENSE="BSD GPL-3"
 SLOT="0"
-IUSE="cpu_flags_x86_sse4_1 doc tools"
+IUSE="cpu_flags_x86_sse4_1 tools"
 REQUIRED_USE="cpu_flags_x86_sse4_1"
 
 RDEPEND="
@@ -34,21 +33,12 @@ RDEPEND="
 	!!sci-biology/seqan:2.1
 	!!sci-biology/seqan:2.2"
 DEPEND="
-	${RDEPEND}
-	doc? (
-		$(python_gen_any_dep 'dev-python/sphinx[${PYTHON_USEDEP}]')
-		${PYTHON_DEPS}
-	)"
+	${RDEPEND}"
 
 PATCHES=( "${FILESDIR}"/${PN}-2.4.0-fix-pthread.patch )
 
-python_check_deps() {
-	use doc && has_version "dev-python/sphinx[${PYTHON_USEDEP}]"
-}
-
 pkg_setup() {
 	if [[ ${MERGE_TYPE} != binary ]]; then
-		use doc && python-any-r1_pkg_setup
 		use tools && tc-check-openmp
 
 		MULTIBUILD_VARIANTS=(
@@ -60,18 +50,19 @@ pkg_setup() {
 
 src_configure() {
 	my_configure() {
-		local mycmakeargs=( -DCMAKE_INSTALL_DOCDIR="share/doc/${PF}" )
+		local mycmakeargs=(
+			-DCMAKE_INSTALL_DOCDIR="share/doc/${PF}"
+			-DSEQAN_NO_DOX=ON
+		)
 		case "${MULTIBUILD_ID}" in
 			tools)
 				mycmakeargs+=(
 					-DSEQAN_BUILD_SYSTEM=SEQAN_RELEASE_APPS
-					-DSEQAN_NO_DOX=ON
 				)
 				;;
 			library)
 				mycmakeargs+=(
 					-DSEQAN_BUILD_SYSTEM=SEQAN_RELEASE_LIBRARY
-					-DSEQAN_NO_DOX=$(usex !doc)
 				)
 				;;
 			*)

diff --git a/sci-biology/seqan/seqan-9999.ebuild b/sci-biology/seqan/seqan-9999.ebuild
index 0005819ff4d..b344b39cbc4 100644
--- a/sci-biology/seqan/seqan-9999.ebuild
+++ b/sci-biology/seqan/seqan-9999.ebuild
@@ -1,12 +1,11 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
 
 : ${CMAKE_MAKEFILE_GENERATOR:=ninja}
-PYTHON_COMPAT=( python2_7 )
 
-inherit cmake-utils multibuild python-any-r1 toolchain-funcs
+inherit cmake-utils multibuild toolchain-funcs
 
 DESCRIPTION="C++ Sequence Analysis Library"
 HOMEPAGE="http://www.seqan.de/"
@@ -24,7 +23,7 @@ fi
 
 LICENSE="BSD GPL-3"
 SLOT="0"
-IUSE="cpu_flags_x86_sse4_1 doc tools"
+IUSE="cpu_flags_x86_sse4_1 tools"
 REQUIRED_USE="cpu_flags_x86_sse4_1"
 
 RDEPEND="
@@ -34,19 +33,10 @@ RDEPEND="
 	!!sci-biology/seqan:2.1
 	!!sci-biology/seqan:2.2"
 DEPEND="
-	${RDEPEND}
-	doc? (
-		$(python_gen_any_dep 'dev-python/sphinx[${PYTHON_USEDEP}]')
-		${PYTHON_DEPS}
-	)"
-
-python_check_deps() {
-	use doc && has_version "dev-python/sphinx[${PYTHON_USEDEP}]"
-}
+	${RDEPEND}"
 
 pkg_setup() {
 	if [[ ${MERGE_TYPE} != binary ]]; then
-		use doc && python-any-r1_pkg_setup
 		use tools && tc-check-openmp
 
 		MULTIBUILD_VARIANTS=(
@@ -58,18 +48,19 @@ pkg_setup() {
 
 src_configure() {
 	my_configure() {
-		local mycmakeargs=( -DCMAKE_INSTALL_DOCDIR="share/doc/${PF}" )
+		local mycmakeargs=(
+			-DCMAKE_INSTALL_DOCDIR="share/doc/${PF}"
+			-DSEQAN_NO_DOX=ON
+		)
 		case "${MULTIBUILD_ID}" in
 			tools)
 				mycmakeargs+=(
 					-DSEQAN_BUILD_SYSTEM=SEQAN_RELEASE_APPS
-					-DSEQAN_NO_DOX=ON
 				)
 				;;
 			library)
 				mycmakeargs+=(
 					-DSEQAN_BUILD_SYSTEM=SEQAN_RELEASE_LIBRARY
-					-DSEQAN_NO_DOX=$(usex !doc)
 				)
 				;;
 			*)