gentoo resync : 24.07.2021

7 files changed, 18 insertions, 20 deletions

diff --git a/sci-biology/Manifest.gz b/sci-biology/Manifest.gz
index 69c341f3d55a..ee92f909ed10 100644
--- a/sci-biology/Manifest.gz
+++ b/sci-biology/Manifest.gz
diff --git a/sci-biology/bcftools/Manifest b/sci-biology/bcftools/Manifest
index 71f2760dc9a6..cbaad97eda76 100644
--- a/sci-biology/bcftools/Manifest
+++ b/sci-biology/bcftools/Manifest
@@ -1,3 +1,3 @@
 DIST bcftools-1.10.2.tar.bz2 3702679 BLAKE2B 51acce94d463868562199206504dc8afb50c671c11139c5a96f52cedf135bb7a46115c69411b9943b970a2395e3c866275c85e345a4a40a90194d1094698314e SHA512 f07e405efa16b9b1b18521342df3eaf840ed1b3028b736a6b4d139012ea85769ddfb3cd3a2c94958415d984d07805dfcd3d4bbec0db401b3f071b861a56d1300
-EBUILD bcftools-1.10.2.ebuild 870 BLAKE2B 0f5069b904c7d4dd34f826902be66cf664592aabb1d97e05ee9c3d8b7ff5d1d6c1dae391082d7905140cc4a091edfaf0cf8e1296c77d19ba5d713b78749d73b4 SHA512 b737af1e2f6a37c534957a7687545647e13a16ec5c203a417a524b7f9f082b25247e1cd818f953b7c528580b6a3cc6ce072aada48af0a2050ab66d3c489284b7
+EBUILD bcftools-1.10.2.ebuild 864 BLAKE2B b98c493d6e50d982917ecbf32c424a45231c3f512a49a0c9cd675cbb3d5f21a57d62cc53a20556663b6fd1d58a68df01a9ed56185dd5f400b8ee5b5c7b5497fd SHA512 c8c3173376a35824ce10413e7cba172d6a90dae91352a292df5603f1a7e17cd5987fc91b463b030221b577bce5424ae7a219625cb684cb3fa2f6777581bb19bb
 MISC metadata.xml 343 BLAKE2B e1664c6d67ebde81b9f99b69d442e0b16891ecd392fddd55ed2aaa885dcb2f4ca39cd627cd3f6367f39b13e35eb1141119e53756d6efc4ac62c819ab1d611633 SHA512 cfa167a5733f40d7e36e9e229229acd883ba7bfd812afb9060c742c505354b1c754070e2e897a48d7611a123b9606b6f43a0816c089e71bf64f3d0dbd8b7184d
diff --git a/sci-biology/bcftools/bcftools-1.10.2.ebuild b/sci-biology/bcftools/bcftools-1.10.2.ebuild
index 46a30f0863a8..a484f69133e5 100644
--- a/sci-biology/bcftools/bcftools-1.10.2.ebuild
+++ b/sci-biology/bcftools/bcftools-1.10.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{7..9} )
+PYTHON_COMPAT=( python3_{8..9} )
 
 inherit python-single-r1
 
@@ -19,7 +19,7 @@ REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 RDEPEND="
 	dev-lang/perl
 	$(python_gen_cond_dep '
-		dev-python/matplotlib[${PYTHON_MULTI_USEDEP}]
+		dev-python/matplotlib[${PYTHON_USEDEP}]
 	')
 	=sci-libs/htslib-${PV}*:=
 	sys-libs/zlib:=
diff --git a/sci-biology/foldingathome/Manifest b/sci-biology/foldingathome/Manifest
index 404ba0cdaf8c..e31d49a66e57 100644
--- a/sci-biology/foldingathome/Manifest
+++ b/sci-biology/foldingathome/Manifest
@@ -1,4 +1,4 @@
 AUX 7.3/folding-conf.d 339 BLAKE2B 93a0b3672777ad737ce27694aaca547634c375e180ad3c28c3adb9cae2cb1c054ff9458ee1fe04b70fe9841ae67d41198bcecfc4826d05d5de8df2759bd80910 SHA512 6fd10dc938262c05831e68176e93a24869bb6991508bcc48ece487b701788026561d073025bd347cd77ede13ca26f6b284861f30b07becf72ea77e4db22867b3
 DIST fahclient_7.6.13-64bit-release.tar.bz2 3951134 BLAKE2B 2748b7c1987d166bdda08caf5ff2f331523ff519e24768cd7e111c6d3a93f54c10c88d8adbf733230b6c51547360135dbcb272e5d43fd06d01918481601382a1 SHA512 f39f2990d78d075e1061ceaff9453b703a000770a3422965b7b8a91d1814f8804837628d8a34be5afd914228ef787f699f2488523baad295a8d9c1e3bb4f35cf
-EBUILD foldingathome-7.6.13.ebuild 4422 BLAKE2B 50f39d12b3c1bf23e94119a7d3a1434f7f44e1765ab77550e4561875be2e1b5b8ca1e00393ba1b218ebb12f54b4cc27721ee46586986b8771b8216ab6fe20e33 SHA512 1be3543d064a478e22abf386bdc634f5e63710aaada32fd035b4f5c1ef02bc01521a084430e9cc4fed17a677b51a62d811f5c74b1dca1b581b489f585d5d58ee
+EBUILD foldingathome-7.6.13-r1.ebuild 4368 BLAKE2B 987b6022e43c2a39338ec8269e3ac001f9c0667237384814183d100fa2191dd91aaf57cfa86407d3bac0e4cee7bd12e022a967d5045e6888ba57622873500d2d SHA512 5225fcec1fb2e5d29b6628a0b06ec1f9f588f74feee6282ff7ee910fb87fba29512880707219ef77e63d0c7584858f50d0a1262ee88eea624c8dedce7df5d873
 MISC metadata.xml 257 BLAKE2B c0d9bf845137c20d86333bbe5f6f7d27e5ae2edbdd6997f870a6678825b5494b8160a4dc5fba6221f252e1146c57d3237f3d7feb098a9beed9c272f57f30d708 SHA512 5be44a06c71b100dfe66effc1d12a9801f6daf2e252f74b6499528644db9b3dd00d51827a984817b78755e8d544f9c674c27c6a370c4c4414ce26a09b478b69b
diff --git a/sci-biology/foldingathome/foldingathome-7.6.13.ebuild b/sci-biology/foldingathome/foldingathome-7.6.13-r1.ebuild
index ca477a6d6b77..c45300719bff 100644
--- a/sci-biology/foldingathome/foldingathome-7.6.13.ebuild
+++ b/sci-biology/foldingathome/foldingathome-7.6.13-r1.ebuild
@@ -1,24 +1,28 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit user systemd
+inherit systemd
 
 DESCRIPTION="Folding@Home is a distributed computing project for protein folding"
 HOMEPAGE="https://foldingathome.org/"
 SRC_URI="https://download.foldingathome.org/releases/public/release/fahclient/centos-6.7-64bit/v$(ver_cut 1-2)/fahclient_${PV}-64bit-release.tar.bz2"
-
-RESTRICT="mirror bindist strip"
+S="${WORKDIR}/fahclient_${PV}-64bit-release"
 
 LICENSE="FAH-EULA-2014 FAH-special-permission"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE=""
+RESTRICT="mirror bindist strip"
+
 # Expressly listing all deps, as this is a binpkg and it is doubtful whether
 # i.e. uclibc or clang can provide what is necessary at runtime
 DEPEND="dev-util/patchelf"
-RDEPEND="app-arch/bzip2
+RDEPEND="
+	acct-group/foldingathome
+	acct-group/video
+	acct-user/foldingathome
+	app-arch/bzip2
 	|| (
 		dev-libs/openssl-compat:1.0.0
 		=dev-libs/openssl-1.0*:*
@@ -26,11 +30,8 @@ RDEPEND="app-arch/bzip2
 	sys-devel/gcc
 	sys-libs/glibc
 	sys-libs/zlib
-	acct-group/video
 "
 
-S="${WORKDIR}/fahclient_${PV}-64bit-release"
-
 QA_PREBUILT="opt/foldingathome/*"
 
 pkg_setup() {
@@ -44,9 +45,6 @@ pkg_setup() {
 	elog ""
 	elog "(ref: http://foldingforum.org/viewtopic.php?f=16&t=22524&p=241992#p241992 )"
 	elog ""
-
-	enewgroup foldingathome
-	enewuser foldingathome -1 -1 "${EPREFIX}"/opt/foldingathome video
 }
 
 src_install() {
diff --git a/sci-biology/samtools/Manifest b/sci-biology/samtools/Manifest
index 6154bc4f7273..66f09ef40483 100644
--- a/sci-biology/samtools/Manifest
+++ b/sci-biology/samtools/Manifest
@@ -2,5 +2,5 @@ AUX samtools-0.1.20-buildsystem.patch 6737 BLAKE2B 71445f57735903bccc2720a32f42b
 DIST samtools-0.1.20.tar.gz 566387 BLAKE2B a62d74c408877754af50f5e5fea0e2289ec1e0c9f25013ed0d039bfe8ef61108600d917f8c9d356e98aca632795b4eb0f01ea1b54526a652577fb74a38a433c2 SHA512 15bd8cf401d14c1ab4faa591b6054f5ea9731c4e966f37f71d33d9081a270cfeb91e8a3d80c631e0725b49da81387f824c206e8c21553ad554d0cfc5c238a6e5
 DIST samtools-1.10.tar.bz2 4721173 BLAKE2B 103c71ec5740eac151a4fc40d67286ee00123c7befd5f654cf5c89812bda44f82b38ab662a4a3216ac84434cabab49500b903612137f97f89a7ea38063e8fc08 SHA512 828ec2638592b440e06b81eafc57634416ab54dac6caaecb06f22a90e9bf99da1fd8bb54509cb98591899c4e097ac9038ee5d57ea7bfe1a18967cde4018d840a
 EBUILD samtools-0.1.20-r4.ebuild 2049 BLAKE2B d377712eaca931258b37645e6a6b3cc379fdb550ef83a0c272a3eb564d7753185fea53416973e4fdf2c25b79475a81ae72b646ce22c570c934e4eabce8a9ded6 SHA512 c0d387f715ebf1f746ea4e4a7eab85a86ef0bff646c9a69639b17ef02e93c39982941d7eb811a6d67b0e635c9c4e05924d2b89a6809c3bd0592db91894dab4aa
-EBUILD samtools-1.10.ebuild 991 BLAKE2B 206a77657bc9a82d6a7536d030b726a0450bbba406e4e7ec9cc670ee530b87d871111952c850d4008c436f81d3daeba802eb4a3442b59ff9ab0f5864bc4fcf21 SHA512 efb1f235e3e3996599df79317e9c7c2ca5434b666a93f91c495550ac4846905e99d96dd1a6876d22a489b684bf24a90c6f6afb4cec5677c5c45f28f0c4f35b35
+EBUILD samtools-1.10-r1.ebuild 993 BLAKE2B 69080337f15d653be56680f3183c2eab3c1813805e3ffc3be1d6dc0e04264a063ae758b694ccb1ff097e952cad736a387de02905ca4f7d4af779233d9e1fced2 SHA512 15dab01b933e56fc83b71f68b2c52c69b115df19f72599e4b4d9d959f9035a468e3ad825cb2e12a80ba558b953879d1b6f8e9dc50922d099c375312dd7580040
 MISC metadata.xml 408 BLAKE2B fcff66a327d0396cd0a1b0cb5c00aeb1bc728759d6d39933651f63e22d966af9c33d14f149d2ee008ca48266da1f24ff5919942d143d066898dc635673153df9 SHA512 71a9d6a299db7717ccd851a4519354c1fd7a373dd79af6fa216ebc9b6b0ccbbccc4394ca00c3f842afee492702f079268c5c83815eaaafa446bf0f37750c62ff
diff --git a/sci-biology/samtools/samtools-1.10.ebuild b/sci-biology/samtools/samtools-1.10-r1.ebuild
index 0ef5e6c19e8e..940895616906 100644
--- a/sci-biology/samtools/samtools-1.10.ebuild
+++ b/sci-biology/samtools/samtools-1.10-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,7 +16,7 @@ KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x64-macos"
 RDEPEND="
 	dev-lang/perl
 	=sci-libs/htslib-${PV}*
-	sys-libs/ncurses:0=[unicode]
+	sys-libs/ncurses:=[unicode(+)]
 	sys-libs/zlib:="
 DEPEND="${RDEPEND}"
 BDEPEND="virtual/pkgconfig"