| 1 |
commit: d6e49da338f6a6ce88c7bab2a4bbb643d603d95b |
| 2 |
Author: Martin Mokrejs <mmokrejs <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Fri Feb 7 09:42:34 2020 +0000 |
| 4 |
Commit: David Seifert <soap <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Fri Feb 7 09:42:34 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d6e49da3 |
| 7 |
|
| 8 |
sci-biology/bcftools: fix PYTHON_COMPAT, add missing matplotlib dep |
| 9 |
|
| 10 |
From NEWS one can infer bcftools was at least from about 1.7 version |
| 11 |
python3 compatible. Moreover, at the moment the shenbang lines specifically |
| 12 |
call python3.6. So, adjust the PYTHON_COMPAT accordingly. matplotlib is |
| 13 |
used by the python scripts, unconditionally. |
| 14 |
|
| 15 |
Package-Manager: Portage-2.3.84, Repoman-2.3.20 |
| 16 |
Closes: https://github.com/gentoo/gentoo/pull/14421 |
| 17 |
Signed-off-by: Martin Mokrejs <mmokrejs <AT> fold.natur.cuni.cz> |
| 18 |
Signed-off-by: David Seifert <soap <AT> gentoo.org> |
| 19 |
|
| 20 |
.../bcftools/{bcftools-1.9.ebuild => bcftools-1.9-r1.ebuild} | 8 ++++---- |
| 21 |
sci-biology/bcftools/files/bcftools-1.9-buildsystem.patch | 10 ++++++++++ |
| 22 |
2 files changed, 14 insertions(+), 4 deletions(-) |
| 23 |
|
| 24 |
diff --git a/sci-biology/bcftools/bcftools-1.9.ebuild b/sci-biology/bcftools/bcftools-1.9-r1.ebuild |
| 25 |
similarity index 84% |
| 26 |
rename from sci-biology/bcftools/bcftools-1.9.ebuild |
| 27 |
rename to sci-biology/bcftools/bcftools-1.9-r1.ebuild |
| 28 |
index 53e47bc01a8..8141e6d2292 100644 |
| 29 |
--- a/sci-biology/bcftools/bcftools-1.9.ebuild |
| 30 |
+++ b/sci-biology/bcftools/bcftools-1.9-r1.ebuild |
| 31 |
@@ -1,9 +1,9 @@ |
| 32 |
-# Copyright 1999-2018 Gentoo Authors |
| 33 |
+# Copyright 1999-2020 Gentoo Authors |
| 34 |
# Distributed under the terms of the GNU General Public License v2 |
| 35 |
|
| 36 |
EAPI=7 |
| 37 |
|
| 38 |
-PYTHON_COMPAT=( python2_7 ) |
| 39 |
+PYTHON_COMPAT=( python3_6 ) |
| 40 |
|
| 41 |
inherit python-single-r1 |
| 42 |
|
| 43 |
@@ -14,18 +14,18 @@ SRC_URI="https://github.com/samtools/${PN}/releases/download/${PV}/${P}.tar.bz2" |
| 44 |
LICENSE="MIT" |
| 45 |
SLOT="0" |
| 46 |
KEYWORDS="~amd64 ~x86" |
| 47 |
-IUSE="" |
| 48 |
REQUIRED_USE="${PYTHON_REQUIRED_USE}" |
| 49 |
|
| 50 |
RDEPEND=" |
| 51 |
dev-lang/perl |
| 52 |
+ dev-python/matplotlib[${PYTHON_USEDEP}] |
| 53 |
=sci-libs/htslib-${PV}*:= |
| 54 |
sys-libs/zlib:= |
| 55 |
${PYTHON_DEPS}" |
| 56 |
DEPEND="${RDEPEND}" |
| 57 |
|
| 58 |
PATCHES=( |
| 59 |
- "${FILESDIR}"/${PN}-1.5-buildsystem.patch |
| 60 |
+ "${FILESDIR}"/${PN}-1.9-buildsystem.patch |
| 61 |
"${FILESDIR}"/${PN}-1.9-fix-shebangs.patch |
| 62 |
) |
| 63 |
|
| 64 |
|
| 65 |
diff --git a/sci-biology/bcftools/files/bcftools-1.9-buildsystem.patch b/sci-biology/bcftools/files/bcftools-1.9-buildsystem.patch |
| 66 |
new file mode 100644 |
| 67 |
index 00000000000..a0df4b917bc |
| 68 |
--- /dev/null |
| 69 |
+++ b/sci-biology/bcftools/files/bcftools-1.9-buildsystem.patch |
| 70 |
@@ -0,0 +1,10 @@ |
| 71 |
+--- a/Makefile |
| 72 |
++++ b/Makefile |
| 73 |
+@@ -282,7 +282,6 @@ |
| 74 |
+ $(INSTALL_PROGRAM) $(PROGRAMS) $(DESTDIR)$(bindir) |
| 75 |
+ $(INSTALL_SCRIPT) $(MISC_SCRIPTS) $(DESTDIR)$(misc_bindir) |
| 76 |
+ $(INSTALL_MAN) doc/bcftools.1 $(DESTDIR)$(man1dir) |
| 77 |
+- $(INSTALL_PROGRAM) plugins/*.so $(DESTDIR)$(plugindir) |
| 78 |
+ |
| 79 |
+ clean: testclean clean-plugins |
| 80 |
+ -rm -f gmon.out *.o *~ $(PROGRAMS) version.h plugins/*.so plugins/*.P |
Archives