commit: 887ddf2183097cf431da81cdcc4f693d268128bb
Author: Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
AuthorDate: Tue Mar 16 18:57:50 2021 +0000
Commit: Andrew Ammerlaan <andrewammerlaan <AT> riseup <DOT> net>
CommitDate: Tue Mar 16 18:57:50 2021 +0000
URL: https://gitweb.gentoo.org/proj/sci.git/commit/?id=887ddf21
sci-biology/ncbi-blast+: drop python support on old
is python2
Package-Manager: Portage-3.0.17, Repoman-3.0.2
Signed-off-by: Andrew Ammerlaan <andrewammerlaan <AT> riseup.net>
sci-biology/ncbi-blast+/ncbi-blast+-2.2.30.ebuild | 12 ++++--------
sci-biology/ncbi-blast+/ncbi-blast+-2.2.31.ebuild | 12 ++++--------
sci-biology/ncbi-blast+/ncbi-blast+-2.6.0.ebuild | 12 ++++--------
sci-biology/ncbi-blast+/ncbi-blast+-2.8.1.ebuild | 2 +-
4 files changed, 13 insertions(+), 25 deletions(-)
diff --git a/sci-biology/ncbi-blast+/ncbi-blast+-2.2.30.ebuild
b/sci-biology/ncbi-blast+/ncbi-blast+-2.2.30.ebuild
index 05c844b1c..08103e703 100644
--- a/sci-biology/ncbi-blast+/ncbi-blast+-2.2.30.ebuild
+++ b/sci-biology/ncbi-blast+/ncbi-blast+-2.2.30.ebuild
@@ -3,9 +3,7 @@
EAPI=7
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils flag-o-matic multilib python-single-r1 toolchain-funcs
+inherit eutils flag-o-matic multilib toolchain-funcs
MY_P="ncbi-blast-${PV}+-src"
# workdir/ncbi-blast-2.2.30+-src
@@ -25,13 +23,11 @@ IUSE="
debug static-libs static threads pch
test wxwidgets odbc
berkdb boost bzip2 cppunit curl expat fltk freetype gif
- glut gnutls hdf5 icu jpeg lzo mesa mysql muparser opengl pcre png python
+ glut gnutls hdf5 icu jpeg lzo mesa mysql muparser opengl pcre png
sablotron sqlite tiff xerces xalan xml xpm xslt X"
KEYWORDS="~amd64 ~x86"
RESTRICT="!test? ( test )"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
# sys-libs/db should be compiled with USE=cxx
DEPEND="
<sys-devel/gcc-10:=
@@ -48,7 +44,6 @@ DEPEND="
glut? ( media-libs/freeglut )
freetype? ( media-libs/freetype )
gnutls? ( net-libs/gnutls )
- python? ( ${PYTHON_DEPS} )
cppunit? ( dev-util/cppunit )
icu? ( dev-libs/icu )
expat? ( dev-libs/expat )
@@ -242,7 +237,8 @@ src_configure() {
$(use_with freetype freetype "${EPREFIX}/usr")
# $(use_with berkdb bdb "${EPREFIX}/usr") # not in ncbi-blast+
$(usex odbc --with-odbc="${EPREFIX}/usr" "")
- $(use_with python python "${EPREFIX}/usr")
+ # is python2
+ --without-python
$(use_with boost boost "${EPREFIX}/usr")
$(use_with sqlite sqlite3 "${EPREFIX}/usr")
$(use_with icu icu "${EPREFIX}/usr")
diff --git a/sci-biology/ncbi-blast+/ncbi-blast+-2.2.31.ebuild
b/sci-biology/ncbi-blast+/ncbi-blast+-2.2.31.ebuild
index 0118086c8..fbd1a9d4c 100644
--- a/sci-biology/ncbi-blast+/ncbi-blast+-2.2.31.ebuild
+++ b/sci-biology/ncbi-blast+/ncbi-blast+-2.2.31.ebuild
@@ -3,9 +3,7 @@
EAPI=7
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils flag-o-matic multilib python-single-r1 toolchain-funcs
+inherit eutils flag-o-matic multilib toolchain-funcs
MY_P="ncbi-blast-${PV}+-src"
# workdir/ncbi-blast-2.2.30+-src
@@ -25,13 +23,11 @@ IUSE="
debug static-libs static threads pch
test wxwidgets odbc
berkdb boost bzip2 cppunit curl expat fltk freetype gif
- glut gnutls hdf5 icu jpeg lzo mesa mysql muparser opengl pcre png python
+ glut gnutls hdf5 icu jpeg lzo mesa mysql muparser opengl pcre png
sablotron sqlite tiff xerces xalan xml xpm xslt X"
KEYWORDS="~amd64 ~x86"
RESTRICT="!test? ( test )"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
# sys-libs/db should be compiled with USE=cxx
DEPEND="
<sys-devel/gcc-10:=
@@ -48,7 +44,6 @@ DEPEND="
glut? ( media-libs/freeglut )
freetype? ( media-libs/freetype )
gnutls? ( net-libs/gnutls )
- python? ( ${PYTHON_DEPS} )
cppunit? ( dev-util/cppunit )
icu? ( dev-libs/icu )
expat? ( dev-libs/expat )
@@ -245,7 +240,8 @@ src_configure() {
$(use_with freetype freetype "${EPREFIX}/usr")
# $(use_with berkdb bdb "${EPREFIX}/usr") # not in ncbi-blast+
$(usex odbc --with-odbc="${EPREFIX}/usr" "")
- $(use_with python python "${EPREFIX}/usr")
+ # is python2
+ --without-python
$(use_with boost boost "${EPREFIX}/usr")
$(use_with sqlite sqlite3 "${EPREFIX}/usr")
$(use_with icu icu "${EPREFIX}/usr")
diff --git a/sci-biology/ncbi-blast+/ncbi-blast+-2.6.0.ebuild
b/sci-biology/ncbi-blast+/ncbi-blast+-2.6.0.ebuild
index ccedf666d..ec3426cfb 100644
--- a/sci-biology/ncbi-blast+/ncbi-blast+-2.6.0.ebuild
+++ b/sci-biology/ncbi-blast+/ncbi-blast+-2.6.0.ebuild
@@ -3,9 +3,7 @@
EAPI=7
-PYTHON_COMPAT=( python2_7 )
-
-inherit eutils flag-o-matic multilib python-single-r1 toolchain-funcs
+inherit eutils flag-o-matic multilib toolchain-funcs
MY_P="ncbi-blast-${PV}+-src"
# workdir/ncbi-blast-2.2.30+-src
@@ -26,13 +24,11 @@ IUSE="
debug static-libs static threads pch
test wxwidgets odbc
berkdb boost bzip2 cppunit curl expat fltk freetype gif
- glut gnutls hdf5 icu jpeg lzo mesa mysql muparser opengl pcre png python
+ glut gnutls hdf5 icu jpeg lzo mesa mysql muparser opengl pcre png
sablotron sqlite tiff xerces xalan xml xpm xslt X"
KEYWORDS="~amd64 ~x86"
RESTRICT="!test? ( test )"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
# sys-libs/db should be compiled with USE=cxx
DEPEND="
<sys-devel/gcc-10:=
@@ -49,7 +45,6 @@ DEPEND="
glut? ( media-libs/freeglut )
freetype? ( media-libs/freetype )
gnutls? ( net-libs/gnutls )
- python? ( ${PYTHON_DEPS} )
cppunit? ( dev-util/cppunit )
icu? ( dev-libs/icu )
expat? ( dev-libs/expat )
@@ -248,7 +243,8 @@ src_configure() {
$(use_with freetype freetype "${EPREFIX}/usr")
# $(use_with berkdb bdb "${EPREFIX}/usr") # not in ncbi-blast+
$(usex odbc --with-odbc="${EPREFIX}/usr" "")
- $(use_with python python "${EPREFIX}/usr")
+ # is python2
+ --without-python
$(use_with boost boost "${EPREFIX}/usr")
$(use_with sqlite sqlite3 "${EPREFIX}/usr")
$(use_with icu icu "${EPREFIX}/usr")
diff --git a/sci-biology/ncbi-blast+/ncbi-blast+-2.8.1.ebuild
b/sci-biology/ncbi-blast+/ncbi-blast+-2.8.1.ebuild
index 72f8fd0b1..40f338bc3 100644
--- a/sci-biology/ncbi-blast+/ncbi-blast+-2.8.1.ebuild
+++ b/sci-biology/ncbi-blast+/ncbi-blast+-2.8.1.ebuild
@@ -3,7 +3,7 @@
EAPI=7
-PYTHON_COMPAT=( python2_7 )
+PYTHON_COMPAT=( python3_{7,8,9} )
inherit eutils flag-o-matic multilib python-single-r1 toolchain-funcs
