gentoo resync : 25.08.2020

5 files changed, 37 insertions, 517 deletions

diff --git a/sci-biology/samtools/Manifest b/sci-biology/samtools/Manifest
index 45ef440561f3..0c9eb58c3dc7 100644
--- a/sci-biology/samtools/Manifest
+++ b/sci-biology/samtools/Manifest
@@ -1,9 +1,6 @@
 AUX samtools-0.1.20-buildsystem.patch 6737 BLAKE2B 71445f57735903bccc2720a32f42b27093f670e383d2d194b5692b1ba536e3df44204711cf4574b3933e5ce00605b661b1a36d79ca7f193ce36816271a3f8214 SHA512 ecb05971fbea4570ec161a165cb581b38ed727bb7e5b769862984bf035414cd564ab809882dc3272f8b192feeb86e29247d7327afa73ff668b01c03c58bb177d
-AUX samtools-1.5-buildsystem.patch 18442 BLAKE2B df389fd2eb6cfa4fafc987eb8e2e1e5d050a9373305f752516c77f415619f5c5b7ff8e2f8c8fd04769c269f9d385f0130443311d9468a591a4531a9e3127725f SHA512 2405c9c5bd2892756dd70147d0bc57f11f869ac2b6bb12d4350e3f7145727a4c8a602489bca5dbcbe8131d52572d4573e8507a2b989ac0ac86aa8dfef92e58d4
 DIST samtools-0.1.20.tar.gz 566387 BLAKE2B a62d74c408877754af50f5e5fea0e2289ec1e0c9f25013ed0d039bfe8ef61108600d917f8c9d356e98aca632795b4eb0f01ea1b54526a652577fb74a38a433c2 SHA512 15bd8cf401d14c1ab4faa591b6054f5ea9731c4e966f37f71d33d9081a270cfeb91e8a3d80c631e0725b49da81387f824c206e8c21553ad554d0cfc5c238a6e5
-DIST samtools-1.5.tar.bz2 4190142 BLAKE2B 1d3478f9adf76925a3721e145795ce4a4caf580244f5ba5bc1ddd14d1b13c723c6fddc24cdadf0a23ca5dcd7007a9985f54e7532cb15d5d9433b1164f5a22023 SHA512 ff3e39ba867ecbd88f3363b038508c1557e349ea4223483f8f4ecb17ff8864fb53cd193bc2059a147e30f07395bbf53c8518d0f70219e454375c8bffe56e3059
-DIST samtools-1.9.tar.bz2 4440405 BLAKE2B 409265fed9ff3fcd09096c968224499750da69324eeded754e367430c0f53f9246ccc9a31e166f13ea7bc767fefab499bcfda4d008d5ac82971984c67b533aff SHA512 6c8207754615ae8dad84b278f93e7d57eb40b818efb80f6aff6aba22fde5772247724e86596e765791e3175ffbb683393dd3ddfe7681c73eef4eb4f2342bf68f
-EBUILD samtools-0.1.20-r3.ebuild 2363 BLAKE2B 6050d698f26b9962192cdbc6c3729bb812041fc92f4ba4490dc6f50e71c08853d6e2e4c6592c324c3efc3ac0da058e8b254475d6fc788f314798cdcaf85a4fc0 SHA512 f79e0f723d86e7c2060163a3b79e6624ea58d21e7c8ddeb87be40a7972cd97e60df82dacaae23b8a89cec2a0517ffdae8804ac71044685b40d5c5769f8964557
-EBUILD samtools-1.5.ebuild 1107 BLAKE2B 2088a3fcc483de227bd92c80cd9ae2bf0257af773298bebcd077d7b2385eb43a6bfde82c7fadb0e2af3400b825e5b1b3c3c4f633cc7631beb4d0dcbb39cdd2cf SHA512 2f1701695fe3aa270bd75bedc3f847b3057ea1a6d9dca386a8f420df22ab78f51b12c8e1ca80d7d2fb1221d246047a78e914022c8e4c8bae5b0b053f3b130cfd
-EBUILD samtools-1.9-r1.ebuild 926 BLAKE2B a71ab1165f9fad65f0ff932880a661fb43435ebc1c72839ed8f57d3a1ee8b11d5441d53404ed650d634334a8f197d4275f82831d7332bdbbe6f110506f0d0230 SHA512 f75851ece84f8863c7352fad6133fe66299cfe94561a62f7dd4a2bf9a82d2a2400be483874d109b67b643807a25d6907d47c8310732d4b13577e27af685857bd
+DIST samtools-1.10.tar.bz2 4721173 BLAKE2B 103c71ec5740eac151a4fc40d67286ee00123c7befd5f654cf5c89812bda44f82b38ab662a4a3216ac84434cabab49500b903612137f97f89a7ea38063e8fc08 SHA512 828ec2638592b440e06b81eafc57634416ab54dac6caaecb06f22a90e9bf99da1fd8bb54509cb98591899c4e097ac9038ee5d57ea7bfe1a18967cde4018d840a
+EBUILD samtools-0.1.20-r4.ebuild 2040 BLAKE2B d90fc78a99b4134ba1a277ceb904c65592f1d29222822f5c97e31a46cbc4138af6adc763c7b05cf26bc0de06ac23ca0b8d8891841ecfd6c1b3fafd270e24216d SHA512 855e19ca8d0dcb9d472398895c666324d00355a7b04c075744e7ac58be1d183f7739f9a254c5bbdaf4171ab6324159860be40171693d0f2f5074884b9eba5e87
+EBUILD samtools-1.10.ebuild 991 BLAKE2B 206a77657bc9a82d6a7536d030b726a0450bbba406e4e7ec9cc670ee530b87d871111952c850d4008c436f81d3daeba802eb4a3442b59ff9ab0f5864bc4fcf21 SHA512 efb1f235e3e3996599df79317e9c7c2ca5434b666a93f91c495550ac4846905e99d96dd1a6876d22a489b684bf24a90c6f6afb4cec5677c5c45f28f0c4f35b35
 MISC metadata.xml 408 BLAKE2B 28b519bf32b116c92c1a695553637a44815ff1aaf18468a5d2d5ef448d8dd53728aadf7606c6ab53ae6bb21e88fa4a48c7b443e3d0a13a5658592dc0e768ed3c SHA512 8c8d240fd37400e43637e12f008f8f2b03fcca062883dd63ccc6956bbfc46d05709f032d146a95452db35b546ff828239b108b3a331f5295ec97872d6c9478fb
diff --git a/sci-biology/samtools/files/samtools-1.5-buildsystem.patch b/sci-biology/samtools/files/samtools-1.5-buildsystem.patch
deleted file mode 100644
index c466e66a9d17..000000000000
--- a/sci-biology/samtools/files/samtools-1.5-buildsystem.patch
+++ /dev/null
@@ -1,413 +0,0 @@
---- a/config.mk.in
-+++ b/config.mk.in
-@@ -28,27 +28,26 @@
- # in the Makefile to reflect your configuration choices.  If you don't run
- # configure, the main Makefile contains suitable conservative defaults.
- 
--prefix       = @prefix@
--exec_prefix  = @exec_prefix@
--bindir       = @bindir@
--datarootdir  = @datarootdir@
--mandir       = @mandir@
-+prefix      = @prefix@
-+exec_prefix = @exec_prefix@
-+bindir      = @bindir@
-+libdir      = @libdir@
-+datarootdir = @datarootdir@
-+mandir      = @mandir@
-+man1dir     = $(mandir)/man1
- 
- CC       = @CC@
-+AR       = @AR@
- CPPFLAGS = @CPPFLAGS@
- CFLAGS   = @CFLAGS@
- LDFLAGS  = @LDFLAGS@
- LIBS     = @LIBS@
- 
--@Hsource@HTSDIR = @HTSDIR@
--@Hsource@include $(HTSDIR)/htslib.mk
--@Hsource@include $(HTSDIR)/htslib_static.mk
--@Hsource@HTSLIB = $(HTSDIR)/libhts.a
--@Hsource@HTSLIB_LIB = $(HTSLIB) $(HTSLIB_static_LIBS)
--@Hsource@HTSLIB_LDFLAGS = $(HTSLIB_static_LDFLAGS)
--@Hsource@BGZIP = $(HTSDIR)/bgzip
--HTSLIB_CPPFLAGS = @HTSLIB_CPPFLAGS@
--@Hinstall@HTSLIB_LDFLAGS = @HTSLIB_LDFLAGS@
--@Hinstall@HTSLIB_LIB = -lhts
-+HTSLIB_CFLAGS = @HTSLIB_CFLAGS@
-+HTSLIB_LIBS = @HTSLIB_LIBS@
- 
--CURSES_LIB = @CURSES_LIB@
-+NCURSES_CFLAGS = @NCURSES_CFLAGS@
-+NCURSES_LIBS = @NCURSES_LIBS@
-+
-+ZLIB_CFLAGS = @ZLIB_CFLAGS@
-+ZLIB_LIBS = @ZLIB_LIBS@
---- a/configure.ac
-+++ b/configure.ac
-@@ -29,9 +29,6 @@
- AC_CONFIG_SRCDIR([bamtk.c])
- AC_CONFIG_HEADERS([config.h])
- 
--m4_include([m4/ax_with_curses.m4])
--m4_include([m4/ax_with_htslib.m4])
--
- dnl Copyright notice to be copied into the generated configure script
- AC_COPYRIGHT([Portions copyright (C) 2015 Genome Research Ltd.
- 
-@@ -39,73 +36,27 @@
- redistribute it.  There is NO WARRANTY, to the extent permitted by law.])
- 
- AC_PROG_CC
-+AM_PROG_AR
- 
- AC_SYS_LARGEFILE
- 
--AX_WITH_HTSLIB
--if test "$ax_cv_htslib" != yes; then
--  AC_MSG_ERROR([HTSlib development files not found
--
--Samtools uses HTSlib to parse bioinformatics file formats etc.  Building it
--requires an unpacked HTSlib source tree (which will be built in conjunction
--with samtools) or a previously-installed HTSlib.  In either case you may
--need to configure --with-htslib=DIR to locate the appropriate HTSlib.
--
--FAILED.  You must supply an HTSlib in order to build samtools successfully.])
--fi
--
--if test "$ax_cv_htslib_which" = source; then
--  Hsource=
--  Hinstall='#'
--else
--  Hsource='#'
--  Hinstall=
--fi
--AC_SUBST([Hsource])
--AC_SUBST([Hinstall])
-+dnl htslib
-+PKG_CHECK_MODULES([HTSLIB], [htslib])
- 
-+dnl ncurses
- AC_ARG_WITH([curses],
-   [AS_HELP_STRING([--without-curses],
-                   [omit curses support, so no curses library needed])])
- 
--if test "$with_curses" != no; then
--  AX_WITH_CURSES
--  if test "$ax_cv_curses" != yes; then
--    AC_MSG_ERROR([curses development files not found
--
--The 'samtools tview' command uses the curses text user interface library.
--Building samtools with tview requires curses/ncurses/etc development files
--to be installed on the build machine; you may need to ensure a package such
--as libncurses5-dev (on Debian or Ubuntu Linux) or ncurses-devel (on RPM-based
--Linux distributions) is installed.
--
--FAILED.  Either configure --without-curses or resolve this error to build
--samtools successfully.])
--  fi
--else
--  CURSES_LIB=
--  CURSES_CPPFLAGS=
--  AC_SUBST([CURSES_LIB])
--  AC_SUBST([CURSES_CPPFLAGS])
--fi
--
--save_LIBS=$LIBS
--zlib_devel=ok
--dnl Set a trivial non-empty INCLUDES to avoid excess default includes tests
--AC_CHECK_HEADER([zlib.h], [], [zlib_devel=missing], [;])
--AC_CHECK_LIB(z, inflate,  [], [zlib_devel=missing])
--LIBS=$save_LIBS
--
--if test $zlib_devel != ok; then
--  AC_MSG_ERROR([zlib development files not found
--
--Samtools uses compression routines from the zlib library <http://zlib.net>.
--Building samtools requires zlib development files to be installed on the build
--machine; you may need to ensure a package such as zlib1g-dev (on Debian or
--Ubuntu Linux) or zlib-devel (on RPM-based Linux distributions) is installed.
-+AS_IF([test "x$with_curses" != "xno"], [
-+  PKG_CHECK_MODULES([NCURSES], [ncurses])
-+
-+  AC_DEFINE([HAVE_CURSES], [1])
-+  AC_DEFINE([HAVE_NCURSES_H], [1])
-+])
- 
--FAILED.  This error must be resolved in order to build samtools successfully.])
--fi
-+dnl zlib
-+PKG_CHECK_MODULES([ZLIB], [zlib])
- 
- AC_CONFIG_FILES([config.mk])
- AC_OUTPUT
---- a/Makefile
-+++ b/Makefile
-@@ -21,14 +21,6 @@
- # FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
- # DEALINGS IN THE SOFTWARE.
- 
--CC       = gcc
--AR       = ar
--CPPFLAGS =
--#CFLAGS   = -g -Wall -O2 -pedantic -std=c99 -D_XOPEN_SOURCE=600
--CFLAGS   = -g -Wall -O2
--LDFLAGS  =
--LIBS     =
--
- LOBJS=      bam_aux.o bam.o bam_import.o sam.o \
-             sam_header.o bam_plbuf.o
- AOBJS=      bam_index.o bam_plcmd.o sam_view.o \
-@@ -40,13 +32,6 @@
-             bam_tview.o bam_tview_curses.o bam_tview_html.o bam_lpileup.o \
-             bam_quickcheck.o bam_addrprg.o
- 
--prefix      = /usr/local
--exec_prefix = $(prefix)
--bindir      = $(exec_prefix)/bin
--datarootdir = $(prefix)/share
--mandir      = $(datarootdir)/man
--man1dir     = $(mandir)/man1
--
- # Installation location for $(MISC_PROGRAMS) and $(MISC_SCRIPTS)
- misc_bindir = $(bindir)
- 
-@@ -85,15 +70,14 @@
- 
- all: $(PROGRAMS) $(MISC_PROGRAMS) $(TEST_PROGRAMS)
- 
--ALL_CPPFLAGS = -I. $(HTSLIB_CPPFLAGS) $(CPPFLAGS)
--ALL_LDFLAGS  = $(HTSLIB_LDFLAGS) $(LDFLAGS)
--ALL_LIBS     = -lz $(LIBS)
-+ALL_CPPFLAGS = -I. $(HTSLIB_CFLAGS) $(CPPFLAGS)
-+ALL_LIBS     = $(ZLIB_LIBS) $(LIBS)
- 
- # Usually config.mk and config.h are generated by running configure
- # or config.status, but if those aren't used create defaults here.
- 
- config.mk:
--	@sed -e '/^prefix/,/^LIBS/d;s/@Hsource@//;s/@Hinstall@/#/;s#@HTSDIR@#htslib-1.5#g;s/@HTSLIB_CPPFLAGS@/-I$$(HTSDIR)/g;s/@CURSES_LIB@/-lcurses/g' config.mk.in > $@
-+	@sed -e '/^prefix/,/^LIBS/d;s/@Hsource@//;s/@Hinstall@/#/;s#@HTSDIR@#htslib-1.5#g;s/@HTSLIB_CFLAGS@/-I$$(HTSDIR)/g;s/@NCURSES_LIBS@/-lcurses/g' config.mk.in > $@
- 
- config.h:
- 	echo '/* Basic config.h generated by Makefile */' > $@
-@@ -133,17 +117,22 @@
- .c.o:
- 	$(CC) $(CFLAGS) $(ALL_CPPFLAGS) -c -o $@ $<
- 
-+$(LOBJS):
-+	$(CC) $(CFLAGS) $(ALL_CPPFLAGS) -fPIC -c -o $@ $<
-+
- 
- LIBST_OBJS = sam_opts.o sam_utils.o
- 
- 
--lib:libbam.a
-+lib: libbam.so.1.0
- 
--libbam.a:$(LOBJS)
--	$(AR) -csru $@ $(LOBJS)
-+libbam.so.1.0:$(LOBJS)
-+	$(CC) $(CFLAGS) $(LDFLAGS) -shared -Wl,--soname,$@ -o $@ $(LOBJS) $(HTSLIB)
-+	ln -sf $@ libbam.so.1
-+	ln -sf $@ libbam.so
- 
--samtools: $(AOBJS) libbam.a libst.a $(HTSLIB)
--	$(CC) $(ALL_LDFLAGS) -o $@ $(AOBJS) libbam.a libst.a $(HTSLIB_LIB) $(CURSES_LIB) -lm $(ALL_LIBS) -lpthread
-+samtools: $(AOBJS) libbam.so.1.0 libst.a
-+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ $(AOBJS) libbam.so.1.0 libst.a $(HTSLIB_LIBS) $(NCURSES_LIBS) -lm $(ALL_LIBS) -lpthread
- 
- # For building samtools and its test suite only: NOT to be installed.
- libst.a: $(LIBST_OBJS)
-@@ -151,58 +140,58 @@
- 	$(AR) -rcs $@ $(LIBST_OBJS)
- 
- 
--bam_h = bam.h $(htslib_bgzf_h) $(htslib_sam_h)
--bam2bcf_h = bam2bcf.h $(htslib_hts_h) $(htslib_vcf_h)
--bam_lpileup_h = bam_lpileup.h $(htslib_sam_h)
--bam_plbuf_h = bam_plbuf.h $(htslib_sam_h)
--bam_tview_h = bam_tview.h $(htslib_hts_h) $(htslib_sam_h) $(htslib_faidx_h) $(bam2bcf_h) $(htslib_khash_h) $(bam_lpileup_h)
--sam_h = sam.h $(htslib_sam_h) $(bam_h)
--sam_opts_h = sam_opts.h $(htslib_hts_h)
--sample_h = sample.h $(htslib_kstring_h)
--
--bam.o: bam.c config.h $(bam_h) $(htslib_kstring_h) sam_header.h
--bam2bcf.o: bam2bcf.c config.h $(htslib_hts_h) $(htslib_sam_h) $(htslib_kstring_h) $(htslib_kfunc_h) $(bam2bcf_h)
--bam2bcf_indel.o: bam2bcf_indel.c config.h $(htslib_hts_h) $(htslib_sam_h) $(bam2bcf_h) $(htslib_khash_h) $(htslib_ksort_h)
--bam2depth.o: bam2depth.c config.h $(htslib_sam_h) samtools.h $(sam_opts_h)
--bam_addrprg.o: bam_addrprg.c config.h $(htslib_sam_h) $(htslib_kstring_h) samtools.h $(sam_opts_h)
-+bam_h = bam.h
-+bam2bcf_h = bam2bcf.h
-+bam_lpileup_h = bam_lpileup.h
-+bam_plbuf_h = bam_plbuf.h
-+bam_tview_h = bam_tview.h $(bam2bcf_h) $(bam_lpileup_h)
-+sam_h = sam.h $(bam_h)
-+sam_opts_h = sam_opts.h
-+sample_h = sample.h
-+
-+bam.o: bam.c config.h $(bam_h) sam_header.h
-+bam2bcf.o: bam2bcf.c config.h $(bam2bcf_h)
-+bam2bcf_indel.o: bam2bcf_indel.c config.h $(bam2bcf_h)
-+bam2depth.o: bam2depth.c config.h samtools.h $(sam_opts_h)
-+bam_addrprg.o: bam_addrprg.c config.h samtools.h $(sam_opts_h)
- bam_aux.o: bam_aux.c config.h $(bam_h)
--bam_cat.o: bam_cat.c config.h $(htslib_bgzf_h) $(htslib_sam_h) $(htslib_cram_h) $(htslib_khash_h) samtools.h
-+bam_cat.o: bam_cat.c config.h samtools.h
- bam_color.o: bam_color.c config.h $(bam_h)
--bam_import.o: bam_import.c config.h $(htslib_kstring_h) $(bam_h) $(htslib_kseq_h)
--bam_index.o: bam_index.c config.h $(htslib_hts_h) $(htslib_sam_h) $(htslib_khash_h) samtools.h
--bam_lpileup.o: bam_lpileup.c config.h $(bam_plbuf_h) $(bam_lpileup_h) $(htslib_ksort_h)
--bam_mate.o: bam_mate.c config.h $(sam_opts_h) $(htslib_kstring_h) $(htslib_sam_h) samtools.h
--bam_md.o: bam_md.c config.h $(htslib_faidx_h) $(htslib_sam_h) $(htslib_kstring_h) $(sam_opts_h) samtools.h
--bam_plbuf.o: bam_plbuf.c config.h $(htslib_hts_h) $(htslib_sam_h) $(bam_plbuf_h)
--bam_plcmd.o: bam_plcmd.c config.h $(htslib_sam_h) $(htslib_faidx_h) $(htslib_kstring_h) $(htslib_khash_str2int_h) sam_header.h samtools.h $(sam_opts_h) $(bam2bcf_h) $(sample_h)
--bam_quickcheck.o: bam_quickcheck.c config.h $(htslib_hts_h) $(htslib_sam_h)
--bam_reheader.o: bam_reheader.c config.h $(htslib_bgzf_h) $(htslib_sam_h) $(htslib_hfile_h) $(htslib_cram_h) samtools.h
--bam_rmdup.o: bam_rmdup.c config.h $(htslib_sam_h) $(sam_opts_h) samtools.h $(bam_h) $(htslib_khash_h)
--bam_rmdupse.o: bam_rmdupse.c config.h $(bam_h) $(htslib_sam_h) $(htslib_khash_h) $(htslib_klist_h) samtools.h
--bam_sort.o: bam_sort.c config.h $(htslib_ksort_h) $(htslib_khash_h) $(htslib_klist_h) $(htslib_kstring_h) $(htslib_sam_h) $(sam_opts_h) samtools.h
--bam_split.o: bam_split.c config.h $(htslib_sam_h) $(htslib_khash_h) $(htslib_kstring_h) $(htslib_cram_h) $(sam_opts_h) samtools.h
--bam_stat.o: bam_stat.c config.h $(htslib_sam_h) samtools.h
--bam_tview.o: bam_tview.c config.h $(bam_tview_h) $(htslib_faidx_h) $(htslib_sam_h) $(htslib_bgzf_h) samtools.h $(sam_opts_h)
-+bam_import.o: bam_import.c config.h $(bam_h)
-+bam_index.o: bam_index.c config.h samtools.h
-+bam_lpileup.o: bam_lpileup.c config.h $(bam_plbuf_h) $(bam_lpileup_h)
-+bam_mate.o: bam_mate.c config.h $(sam_opts_h) samtools.h
-+bam_md.o: bam_md.c config.h $(sam_opts_h) samtools.h
-+bam_plbuf.o: bam_plbuf.c config.h $(bam_plbuf_h)
-+bam_plcmd.o: bam_plcmd.c config.h sam_header.h samtools.h $(sam_opts_h) $(bam2bcf_h) $(sample_h)
-+bam_quickcheck.o: bam_quickcheck.c config.h
-+bam_reheader.o: bam_reheader.c config.h samtools.h
-+bam_rmdup.o: bam_rmdup.c config.h $(sam_opts_h) samtools.h $(bam_h)
-+bam_rmdupse.o: bam_rmdupse.c config.h $(bam_h) samtools.h
-+bam_sort.o: bam_sort.c config.h $(sam_opts_h) samtools.h
-+bam_split.o: bam_split.c config.h $(sam_opts_h) samtools.h
-+bam_stat.o: bam_stat.c config.h samtools.h
-+bam_tview.o: bam_tview.c config.h $(bam_tview_h) samtools.h $(sam_opts_h)
- bam_tview_curses.o: bam_tview_curses.c config.h $(bam_tview_h)
- bam_tview_html.o: bam_tview_html.c config.h $(bam_tview_h)
--bam_flags.o: bam_flags.c config.h $(htslib_sam_h)
--bamshuf.o: bamshuf.c config.h $(htslib_sam_h) $(htslib_hts_h) $(htslib_ksort_h) samtools.h $(sam_opts_h)
--bamtk.o: bamtk.c config.h $(htslib_hts_h) samtools.h version.h
--bedcov.o: bedcov.c config.h $(htslib_kstring_h) $(htslib_sam_h) $(sam_opts_h) $(htslib_kseq_h)
--bedidx.o: bedidx.c config.h $(htslib_ksort_h) $(htslib_kseq_h) $(htslib_khash_h)
--cut_target.o: cut_target.c config.h $(htslib_hts_h) $(htslib_sam_h) $(htslib_faidx_h) samtools.h $(sam_opts_h)
--dict.o: dict.c config.h $(htslib_kseq_h) $(htslib_hts_h)
--faidx.o: faidx.c config.h $(htslib_faidx_h) samtools.h
--padding.o: padding.c config.h $(htslib_kstring_h) $(htslib_sam_h) $(htslib_faidx_h) sam_header.h $(sam_opts_h) samtools.h
--phase.o: phase.c config.h $(htslib_hts_h) $(htslib_sam_h) $(htslib_kstring_h) $(sam_opts_h) samtools.h $(htslib_kseq_h) $(htslib_khash_h) $(htslib_ksort_h)
--sam.o: sam.c config.h $(htslib_faidx_h) $(sam_h)
--sam_header.o: sam_header.c config.h sam_header.h $(htslib_khash_h)
-+bam_flags.o: bam_flags.c config.h
-+bamshuf.o: bamshuf.c config.h samtools.h $(sam_opts_h)
-+bamtk.o: bamtk.c config.h samtools.h version.h
-+bedcov.o: bedcov.c config.h $(sam_opts_h)
-+bedidx.o: bedidx.c config.h
-+cut_target.o: cut_target.c config.h samtools.h $(sam_opts_h)
-+dict.o: dict.c config.h
-+faidx.o: faidx.c config.h samtools.h
-+padding.o: padding.c config.h sam_header.h $(sam_opts_h) samtools.h
-+phase.o: phase.c config.h $(sam_opts_h) samtools.h
-+sam.o: sam.c config.h $(sam_h)
-+sam_header.o: sam_header.c config.h sam_header.h
- sam_opts.o: sam_opts.c config.h $(sam_opts_h)
- sam_utils.o: sam_utils.c config.h samtools.h
--sam_view.o: sam_view.c config.h $(htslib_sam_h) $(htslib_faidx_h) $(htslib_kstring_h) $(htslib_khash_h) samtools.h $(sam_opts_h)
--sample.o: sample.c config.h $(sample_h) $(htslib_khash_h)
--stats_isize.o: stats_isize.c config.h stats_isize.h $(htslib_khash_h)
--stats.o: stats.c config.h $(htslib_faidx_h) $(htslib_sam_h) $(htslib_hts_h) sam_header.h $(htslib_khash_str2int_h) samtools.h $(htslib_khash_h) $(htslib_kstring_h) stats_isize.h $(sam_opts_h)
-+sam_view.o: sam_view.c config.h samtools.h $(sam_opts_h)
-+sample.o: sample.c config.h $(sample_h)
-+stats_isize.o: stats_isize.c config.h stats_isize.h
-+stats.o: stats.c config.h sam_header.h samtools.h stats_isize.h $(sam_opts_h)
- 
- 
- # test programs
-@@ -224,30 +213,30 @@
- 
- 
- test/merge/test_bam_translate: test/merge/test_bam_translate.o test/test.o libst.a $(HTSLIB)
--	$(CC) $(ALL_LDFLAGS) -o $@ test/merge/test_bam_translate.o test/test.o libst.a $(HTSLIB_LIB) $(ALL_LIBS) -lpthread
-+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ test/merge/test_bam_translate.o test/test.o libst.a $(HTSLIB_LIBS) $(ALL_LIBS) -lpthread
- 
- test/merge/test_rtrans_build: test/merge/test_rtrans_build.o libst.a $(HTSLIB)
--	$(CC) $(ALL_LDFLAGS) -o $@ test/merge/test_rtrans_build.o libst.a $(HTSLIB_LIB) $(ALL_LIBS) -lpthread
-+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ test/merge/test_rtrans_build.o libst.a $(HTSLIB_LIBS) $(ALL_LIBS) -lpthread
- 
- test/merge/test_trans_tbl_init: test/merge/test_trans_tbl_init.o libst.a $(HTSLIB)
--	$(CC) $(ALL_LDFLAGS) -o $@ test/merge/test_trans_tbl_init.o libst.a $(HTSLIB_LIB) $(ALL_LIBS) -lpthread
-+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ test/merge/test_trans_tbl_init.o libst.a $(HTSLIB_LIBS) $(ALL_LIBS) -lpthread
- 
- test/split/test_count_rg: test/split/test_count_rg.o test/test.o libst.a $(HTSLIB)
--	$(CC) $(ALL_LDFLAGS) -o $@ test/split/test_count_rg.o test/test.o libst.a $(HTSLIB_LIB) $(ALL_LIBS) -lpthread
-+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ test/split/test_count_rg.o test/test.o libst.a $(HTSLIB_LIBS) $(ALL_LIBS) -lpthread
- 
- test/split/test_expand_format_string: test/split/test_expand_format_string.o test/test.o libst.a $(HTSLIB)
--	$(CC) $(ALL_LDFLAGS) -o $@ test/split/test_expand_format_string.o test/test.o libst.a $(HTSLIB_LIB) $(ALL_LIBS) -lpthread
-+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ test/split/test_expand_format_string.o test/test.o libst.a $(HTSLIB_LIBS) $(ALL_LIBS) -lpthread
- 
- test/split/test_filter_header_rg: test/split/test_filter_header_rg.o test/test.o libst.a $(HTSLIB)
--	$(CC) $(ALL_LDFLAGS) -o $@ test/split/test_filter_header_rg.o test/test.o libst.a $(HTSLIB_LIB) $(ALL_LIBS) -lpthread
-+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ test/split/test_filter_header_rg.o test/test.o libst.a $(HTSLIB_LIBS) $(ALL_LIBS) -lpthread
- 
- test/split/test_parse_args: test/split/test_parse_args.o test/test.o libst.a $(HTSLIB)
--	$(CC) $(ALL_LDFLAGS) -o $@ test/split/test_parse_args.o test/test.o libst.a $(HTSLIB_LIB) $(ALL_LIBS) -lpthread
-+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ test/split/test_parse_args.o test/test.o libst.a $(HTSLIB_LIBS) $(ALL_LIBS) -lpthread
- 
- test/vcf-miniview: test/vcf-miniview.o $(HTSLIB)
--	$(CC) $(ALL_LDFLAGS) -o $@ test/vcf-miniview.o $(HTSLIB_LIB) $(ALL_LIBS) -lpthread
-+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ test/vcf-miniview.o $(HTSLIB_LIBS) $(ALL_LIBS) -lpthread
- 
--test_test_h = test/test.h $(htslib_sam_h)
-+test_test_h = test/test.h
- 
- test/merge/test_bam_translate.o: test/merge/test_bam_translate.c config.h bam_sort.o $(test_test_h)
- test/merge/test_rtrans_build.o: test/merge/test_rtrans_build.c config.h bam_sort.o
-@@ -256,34 +245,34 @@
- test/split/test_expand_format_string.o: test/split/test_expand_format_string.c config.h bam_split.o $(test_test_h)
- test/split/test_filter_header_rg.o: test/split/test_filter_header_rg.c config.h bam_split.o $(test_test_h)
- test/split/test_parse_args.o: test/split/test_parse_args.c config.h bam_split.o $(test_test_h)
--test/test.o: test/test.c config.h $(htslib_sam_h) $(test_test_h)
--test/vcf-miniview.o: test/vcf-miniview.c config.h $(htslib_vcf_h)
-+test/test.o: test/test.c config.h $(test_test_h)
-+test/vcf-miniview.o: test/vcf-miniview.c config.h
- 
- 
- # misc programs
- 
- misc/ace2sam: misc/ace2sam.o
--	$(CC) $(LDFLAGS) -o $@ misc/ace2sam.o $(ALL_LIBS)
-+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ misc/ace2sam.o $(ALL_LIBS)
- 
- misc/maq2sam-short: misc/maq2sam-short.o
--	$(CC) $(LDFLAGS) -o $@ misc/maq2sam-short.o $(ALL_LIBS)
-+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ misc/maq2sam-short.o $(ALL_LIBS)
- 
- misc/maq2sam-long: misc/maq2sam-long.o
--	$(CC) $(LDFLAGS) -o $@ misc/maq2sam-long.o $(ALL_LIBS)
-+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ misc/maq2sam-long.o $(ALL_LIBS)
- 
- misc/md5fa: misc/md5fa.o $(HTSLIB)
--	$(CC) $(ALL_LDFLAGS) -o $@ misc/md5fa.o $(HTSLIB_LIB) $(ALL_LIBS)
-+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ misc/md5fa.o $(HTSLIB_LIBS) $(ALL_LIBS)
- 
- misc/md5sum-lite: misc/md5sum-lite.o $(HTSLIB)
--	$(CC) $(ALL_LDFLAGS) -o $@ misc/md5sum-lite.o $(HTSLIB_LIB) $(ALL_LIBS)
-+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ misc/md5sum-lite.o $(HTSLIB_LIBS) $(ALL_LIBS)
- 
- misc/wgsim: misc/wgsim.o
--	$(CC) $(LDFLAGS) -o $@ misc/wgsim.o -lm $(ALL_LIBS)
-+	$(CC) $(CFLAGS) $(LDFLAGS) -o $@ misc/wgsim.o -lm $(ALL_LIBS)
- 
--misc/ace2sam.o: misc/ace2sam.c config.h $(htslib_kstring_h) $(htslib_kseq_h)
--misc/md5fa.o: misc/md5fa.c config.h $(htslib_kseq_h) $(htslib_hts_h)
--misc/md5sum-lite.o: misc/md5sum-lite.c config.h $(htslib_hts_h)
--misc/wgsim.o: misc/wgsim.c config.h $(htslib_kseq_h)
-+misc/ace2sam.o: misc/ace2sam.c config.h
-+misc/md5fa.o: misc/md5fa.c config.h
-+misc/md5sum-lite.o: misc/md5sum-lite.c config.h
-+misc/wgsim.o: misc/wgsim.c config.h
- 
- misc/maq2sam-short.o: misc/maq2sam.c config.h
- 	$(CC) $(CFLAGS) $(ALL_CPPFLAGS) -c -o $@ misc/maq2sam.c
diff --git a/sci-biology/samtools/samtools-0.1.20-r3.ebuild b/sci-biology/samtools/samtools-0.1.20-r4.ebuild
index 5cfcfd7f6a79..d598a3292728 100644
--- a/sci-biology/samtools/samtools-0.1.20-r3.ebuild
+++ b/sci-biology/samtools/samtools-0.1.20-r4.ebuild
@@ -1,11 +1,9 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2020 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=7
 
-PYTHON_COMPAT=( python2_7 )
-
-inherit python-single-r1 toolchain-funcs
+inherit toolchain-funcs
 
 DESCRIPTION="Utilities for analysing and manipulating the SAM/BAM alignment formats"
 HOMEPAGE="http://samtools.sourceforge.net/"
@@ -14,23 +12,17 @@ SRC_URI="https://github.com/samtools/samtools/archive/${PV}.tar.gz -> ${P}.tar.g
 LICENSE="MIT"
 SLOT="0.1-legacy"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE="examples"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
-RDEPEND="${PYTHON_DEPS}
+RDEPEND="
 	sys-libs/ncurses:0=
 	dev-lang/perl"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
 
-PATCHES=(
-	"${FILESDIR}/${P}-buildsystem.patch"
-)
+PATCHES=( "${FILESDIR}"/${P}-buildsystem.patch )
 
 src_prepare() {
 	default
-	# required, otherwise python_fix_shebang errors out
-	sed -i 's~/software/bin/python~/usr/bin/env python~' misc/varfilter.py || die
 	tc-export CC AR
 }
 
@@ -44,16 +36,16 @@ src_install() {
 	# install executables and hide them away from sight
 	dobin samtools bcftools/{bcftools,vcfutils.pl} misc/{*.py,*.pl,wgsim,ace2sam} \
 		misc/{md5sum-lite,maq2sam-short,bamcheck,maq2sam-long,md5fa,plot-bamcheck}
-	mv "${ED%/}"/usr/{bin,${PN}-${SLOT}} || die
-	mkdir "${ED%/}"/usr/bin || die
-	mv "${ED%/}"/usr/{${PN}-${SLOT},bin/} || die
+	mv "${ED}"/usr/{bin,${PN}-${SLOT}} || die
+	mkdir "${ED}"/usr/bin || die
+	mv "${ED}"/usr/{${PN}-${SLOT},bin/} || die
 
-	# ... do the same with the python script, but also fix the shebang
-	mv "${ED%/}"/usr/bin/${PN}-${SLOT}/varfilter{,-${SLOT}}.py || die
-	python_fix_shebang "${ED%/}"/usr/bin/${PN}-${SLOT}/varfilter-${SLOT}.py
+	# remove py2 script, has been removed upstream anyways
+	# https://github.com/samtools/samtools/issues/1125
+	rm "${ED}"/usr/bin/${PN}-${SLOT}/varfilter.py || die
 
 	# fix perl shebangs
-	pushd "${ED%/}"/usr/bin/${PN}-${SLOT} >/dev/null || die
+	pushd "${ED}"/usr/bin/${PN}-${SLOT} >/dev/null || die
 		local i
 		for i in plot-bamcheck *.pl; do
 			sed -e '1s:.*:#!/usr/bin/env perl:' -i "${i}" || die
@@ -70,14 +62,12 @@ src_install() {
 	doman ${PN}-${SLOT}.1
 	einstalldocs
 
-	if use examples; then
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
+	dodoc -r examples
+	docompress -x /usr/share/doc/${PF}/examples
 }
 
 pkg_postinst() {
 	elog "This version of samtools should *not* be your first choice for working"
 	elog "with NGS data. It is installed solely for programs requiring it."
-	elog "It is recommended that you use >=sci-biology/samtools-1.2."
+	elog "It is recommended that you use >=sci-biology/samtools-1.10."
 }
diff --git a/sci-biology/samtools/samtools-1.9-r1.ebuild b/sci-biology/samtools/samtools-1.10.ebuild
index 0d0f993895fc..0ef5e6c19e8e 100644
--- a/sci-biology/samtools/samtools-1.9-r1.ebuild
+++ b/sci-biology/samtools/samtools-1.10.ebuild
@@ -12,12 +12,11 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 LICENSE="MIT"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE="examples"
 
 RDEPEND="
 	dev-lang/perl
 	=sci-libs/htslib-${PV}*
-	sys-libs/ncurses:0=
+	sys-libs/ncurses:0=[unicode]
 	sys-libs/zlib:="
 DEPEND="${RDEPEND}"
 BDEPEND="virtual/pkgconfig"
@@ -31,19 +30,27 @@ src_prepare() {
 	eautoreconf
 }
 
+src_configure() {
+	econf \
+		--with-ncurses \
+		--with-htslib=system \
+		CURSES_LIB="$($(tc-getPKG_CONFIG) --libs ncursesw)"
+}
+
+src_compile() {
+	emake AR="$(tc-getAR)"
+}
+
 src_test() {
-	local -x LD_LIBRARY_PATH="${S}"
+	# the tview test diffs expect 80-columns output
+	unset COLUMNS
+
 	default
 }
 
 src_install() {
 	default
 
-	# varfilter.py has been retired upstream for being py2 only
-	rm "${ED}"/usr/bin/varfilter.py || die
-
-	if use examples; then
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
+	dodoc -r examples
+	docompress -x /usr/share/doc/${PF}/examples
 }
diff --git a/sci-biology/samtools/samtools-1.5.ebuild b/sci-biology/samtools/samtools-1.5.ebuild
deleted file mode 100644
index c2bc7ce89cf6..000000000000
--- a/sci-biology/samtools/samtools-1.5.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-PYTHON_COMPAT=( python2_7 )
-
-inherit autotools python-r1 toolchain-funcs
-
-DESCRIPTION="Utilities for analysing and manipulating the SAM/BAM alignment formats"
-HOMEPAGE="http://www.htslib.org/"
-SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
-IUSE="examples"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	dev-lang/perl
-	=sci-libs/htslib-${PV}*
-	sys-libs/ncurses:0=
-	sys-libs/zlib
-	${PYTHON_DEPS}"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-
-PATCHES=( "${FILESDIR}/${PN}-1.5-buildsystem.patch" )
-
-src_prepare() {
-	default
-
-	python_setup
-	python_fix_shebang misc/varfilter.py
-
-	# remove bundled htslib
-	rm -r htslib-* || die
-
-	eautoreconf
-}
-
-src_test() {
-	local -x LD_LIBRARY_PATH="${S}"
-	default
-}
-
-src_install() {
-	default
-
-	# install libbam and headers
-	dolib.so libbam.so*
-
-	insinto /usr/include/bam
-	doins *.h
-
-	if use examples; then
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-}