| 1 |
commit: 2236a5f7ab3440ef27da0f5adc86a93ea557b63a |
| 2 |
Author: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Wed Sep 9 10:29:59 2020 +0000 |
| 4 |
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Wed Sep 9 10:34:32 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2236a5f7 |
| 7 |
|
| 8 |
sci-biology/seqan: Eradicate doc (python2) |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/735442 |
| 11 |
Signed-off-by: Michał Górny <mgorny <AT> gentoo.org> |
| 12 |
|
| 13 |
sci-biology/seqan/seqan-2.4.0.ebuild | 25 ++++++++----------------- |
| 14 |
sci-biology/seqan/seqan-9999.ebuild | 25 ++++++++----------------- |
| 15 |
2 files changed, 16 insertions(+), 34 deletions(-) |
| 16 |
|
| 17 |
diff --git a/sci-biology/seqan/seqan-2.4.0.ebuild b/sci-biology/seqan/seqan-2.4.0.ebuild |
| 18 |
index 8b337e77e6b..5653a1ec94e 100644 |
| 19 |
--- a/sci-biology/seqan/seqan-2.4.0.ebuild |
| 20 |
+++ b/sci-biology/seqan/seqan-2.4.0.ebuild |
| 21 |
@@ -1,12 +1,11 @@ |
| 22 |
-# Copyright 1999-2018 Gentoo Foundation |
| 23 |
+# Copyright 1999-2020 Gentoo Authors |
| 24 |
# Distributed under the terms of the GNU General Public License v2 |
| 25 |
|
| 26 |
EAPI=6 |
| 27 |
|
| 28 |
: ${CMAKE_MAKEFILE_GENERATOR:=ninja} |
| 29 |
-PYTHON_COMPAT=( python2_7 ) |
| 30 |
|
| 31 |
-inherit cmake-utils multibuild python-any-r1 toolchain-funcs |
| 32 |
+inherit cmake-utils multibuild toolchain-funcs |
| 33 |
|
| 34 |
DESCRIPTION="C++ Sequence Analysis Library" |
| 35 |
HOMEPAGE="http://www.seqan.de/" |
| 36 |
@@ -24,7 +23,7 @@ fi |
| 37 |
|
| 38 |
LICENSE="BSD GPL-3" |
| 39 |
SLOT="0" |
| 40 |
-IUSE="cpu_flags_x86_sse4_1 doc tools" |
| 41 |
+IUSE="cpu_flags_x86_sse4_1 tools" |
| 42 |
REQUIRED_USE="cpu_flags_x86_sse4_1" |
| 43 |
|
| 44 |
RDEPEND=" |
| 45 |
@@ -34,21 +33,12 @@ RDEPEND=" |
| 46 |
!!sci-biology/seqan:2.1 |
| 47 |
!!sci-biology/seqan:2.2" |
| 48 |
DEPEND=" |
| 49 |
- ${RDEPEND} |
| 50 |
- doc? ( |
| 51 |
- $(python_gen_any_dep 'dev-python/sphinx[${PYTHON_USEDEP}]') |
| 52 |
- ${PYTHON_DEPS} |
| 53 |
- )" |
| 54 |
+ ${RDEPEND}" |
| 55 |
|
| 56 |
PATCHES=( "${FILESDIR}"/${PN}-2.4.0-fix-pthread.patch ) |
| 57 |
|
| 58 |
-python_check_deps() { |
| 59 |
- use doc && has_version "dev-python/sphinx[${PYTHON_USEDEP}]" |
| 60 |
-} |
| 61 |
- |
| 62 |
pkg_setup() { |
| 63 |
if [[ ${MERGE_TYPE} != binary ]]; then |
| 64 |
- use doc && python-any-r1_pkg_setup |
| 65 |
use tools && tc-check-openmp |
| 66 |
|
| 67 |
MULTIBUILD_VARIANTS=( |
| 68 |
@@ -60,18 +50,19 @@ pkg_setup() { |
| 69 |
|
| 70 |
src_configure() { |
| 71 |
my_configure() { |
| 72 |
- local mycmakeargs=( -DCMAKE_INSTALL_DOCDIR="share/doc/${PF}" ) |
| 73 |
+ local mycmakeargs=( |
| 74 |
+ -DCMAKE_INSTALL_DOCDIR="share/doc/${PF}" |
| 75 |
+ -DSEQAN_NO_DOX=ON |
| 76 |
+ ) |
| 77 |
case "${MULTIBUILD_ID}" in |
| 78 |
tools) |
| 79 |
mycmakeargs+=( |
| 80 |
-DSEQAN_BUILD_SYSTEM=SEQAN_RELEASE_APPS |
| 81 |
- -DSEQAN_NO_DOX=ON |
| 82 |
) |
| 83 |
;; |
| 84 |
library) |
| 85 |
mycmakeargs+=( |
| 86 |
-DSEQAN_BUILD_SYSTEM=SEQAN_RELEASE_LIBRARY |
| 87 |
- -DSEQAN_NO_DOX=$(usex !doc) |
| 88 |
) |
| 89 |
;; |
| 90 |
*) |
| 91 |
|
| 92 |
diff --git a/sci-biology/seqan/seqan-9999.ebuild b/sci-biology/seqan/seqan-9999.ebuild |
| 93 |
index 0005819ff4d..b344b39cbc4 100644 |
| 94 |
--- a/sci-biology/seqan/seqan-9999.ebuild |
| 95 |
+++ b/sci-biology/seqan/seqan-9999.ebuild |
| 96 |
@@ -1,12 +1,11 @@ |
| 97 |
-# Copyright 1999-2018 Gentoo Foundation |
| 98 |
+# Copyright 1999-2020 Gentoo Authors |
| 99 |
# Distributed under the terms of the GNU General Public License v2 |
| 100 |
|
| 101 |
EAPI=6 |
| 102 |
|
| 103 |
: ${CMAKE_MAKEFILE_GENERATOR:=ninja} |
| 104 |
-PYTHON_COMPAT=( python2_7 ) |
| 105 |
|
| 106 |
-inherit cmake-utils multibuild python-any-r1 toolchain-funcs |
| 107 |
+inherit cmake-utils multibuild toolchain-funcs |
| 108 |
|
| 109 |
DESCRIPTION="C++ Sequence Analysis Library" |
| 110 |
HOMEPAGE="http://www.seqan.de/" |
| 111 |
@@ -24,7 +23,7 @@ fi |
| 112 |
|
| 113 |
LICENSE="BSD GPL-3" |
| 114 |
SLOT="0" |
| 115 |
-IUSE="cpu_flags_x86_sse4_1 doc tools" |
| 116 |
+IUSE="cpu_flags_x86_sse4_1 tools" |
| 117 |
REQUIRED_USE="cpu_flags_x86_sse4_1" |
| 118 |
|
| 119 |
RDEPEND=" |
| 120 |
@@ -34,19 +33,10 @@ RDEPEND=" |
| 121 |
!!sci-biology/seqan:2.1 |
| 122 |
!!sci-biology/seqan:2.2" |
| 123 |
DEPEND=" |
| 124 |
- ${RDEPEND} |
| 125 |
- doc? ( |
| 126 |
- $(python_gen_any_dep 'dev-python/sphinx[${PYTHON_USEDEP}]') |
| 127 |
- ${PYTHON_DEPS} |
| 128 |
- )" |
| 129 |
- |
| 130 |
-python_check_deps() { |
| 131 |
- use doc && has_version "dev-python/sphinx[${PYTHON_USEDEP}]" |
| 132 |
-} |
| 133 |
+ ${RDEPEND}" |
| 134 |
|
| 135 |
pkg_setup() { |
| 136 |
if [[ ${MERGE_TYPE} != binary ]]; then |
| 137 |
- use doc && python-any-r1_pkg_setup |
| 138 |
use tools && tc-check-openmp |
| 139 |
|
| 140 |
MULTIBUILD_VARIANTS=( |
| 141 |
@@ -58,18 +48,19 @@ pkg_setup() { |
| 142 |
|
| 143 |
src_configure() { |
| 144 |
my_configure() { |
| 145 |
- local mycmakeargs=( -DCMAKE_INSTALL_DOCDIR="share/doc/${PF}" ) |
| 146 |
+ local mycmakeargs=( |
| 147 |
+ -DCMAKE_INSTALL_DOCDIR="share/doc/${PF}" |
| 148 |
+ -DSEQAN_NO_DOX=ON |
| 149 |
+ ) |
| 150 |
case "${MULTIBUILD_ID}" in |
| 151 |
tools) |
| 152 |
mycmakeargs+=( |
| 153 |
-DSEQAN_BUILD_SYSTEM=SEQAN_RELEASE_APPS |
| 154 |
- -DSEQAN_NO_DOX=ON |
| 155 |
) |
| 156 |
;; |
| 157 |
library) |
| 158 |
mycmakeargs+=( |
| 159 |
-DSEQAN_BUILD_SYSTEM=SEQAN_RELEASE_LIBRARY |
| 160 |
- -DSEQAN_NO_DOX=$(usex !doc) |
| 161 |
) |
| 162 |
;; |
| 163 |
*) |
Archives