gentoo resync : 25.11.2020

3 files changed, 49 insertions, 2 deletions

diff --git a/dev-libs/cudnn/Manifest b/dev-libs/cudnn/Manifest
index 214a5cb31c18..2d6362f37140 100644
--- a/dev-libs/cudnn/Manifest
+++ b/dev-libs/cudnn/Manifest
@@ -5,7 +5,11 @@ DIST cudnn-10.1-linux-x64-v7.6.0.64.tgz 500810447 BLAKE2B cfe884dd3b2a5ca4641844
 DIST cudnn-10.1-linux-x64-v7.6.1.34.tgz 521806738 BLAKE2B 9804ed394cf58f0c415d454ce83503db3faff74181e3746eabbae648cf85718ccfdcc1b64877e30e367a285294665975169fe1f992c27ac12b65d340784079a8 SHA512 81dc9a3d07885996b3b7141ea9785768dd6e266d138a671b934139b38ac1dcab0ffdb97617b308a9f492b5b163cb4dd65972e24de98499a2ecbed2bd261c1244
 DIST cudnn-10.1-linux-x64-v7.6.2.24.tgz 522872521 BLAKE2B 6424ade8443521138b36bb528105bc482202ff475dd3eb3aaa7f992e8ad8b67628ac1b464d10056f16bb5766fb8464abe8ae406f8766831d248b90796d146c1e SHA512 3451c113b4dcb8aaa33b2740e0e0b60d121ef02525c4e8ece3d7afd76b3472f704a90eb69d1a06f2bc94a981c2bfa3bea2f3bd057dcbdc6eecdea1056563057d
 DIST cudnn-10.1-linux-x64-v7.6.5.32.tgz 523418497 BLAKE2B 28febb24382d411faa870cd42e999431d1ee1d083c09903ee4a8f5bee676981c60f6daf6cd256978db69345397db743a7a6f6187376520f5c4f968f6177e0201 SHA512 1073bc42c2c36fce6b710882a04a4035d66d95c410200b9d50953e993d7b801cc3a837e42843ad2447e62ea5dfc8ba22c8a803464716c56ffb811aa278645771
+DIST cudnn-10.1-linux-x64-v8.0.4.30.tgz 678710754 BLAKE2B 5ad59925a500968eef8306c7e207c12ea2f55deecd2d044d7f1f158b76264aeb954f3029d1eaa5ef2aa6939c56e39177af28fc00cc04e2fdf26f9091ef46f3ca SHA512 419f2875a0b362107ede5d238250496c1011cb8e1fdaada1ebdca8737e9df4eaddd1d3a25feeb0ef9baa0100c9f84507e527ed922b676f7883e0594b017ed9d9
 DIST cudnn-10.2-linux-x64-v7.6.5.32.tgz 548210361 BLAKE2B 51fdd14f0bbc5a029bddca94ab7ae56ee77c16fdc525c78b986bb3dc1e0525943e5ab17eb81e356ef92c985ee467bd87a6670c343a96136d932ace86bb649437 SHA512 943c1afc0b7711dec87931770eaa567e25361a31ed5e1edabcc3f81df72880428611308e8032a28dc197e8c5edfebe3f67cc9d22a21eb569d8b254d8eb84eac6
+DIST cudnn-10.2-linux-x64-v8.0.4.30.tgz 700128057 BLAKE2B 9883cb5993850b9dc0fe703925be4980b7768a6b1be940058f727e69e5d606f25b54ec3368fd22dddcc39092ac488ded4a9078c4ebb743e12c59688413c056cd SHA512 ab41425bc5fad91e9a4270059d8125efc93407956b64c2ecc926506d4c826f33fb7561b143b159e92b286937e940f05fb2f4059747ee80c28b1e7a4d8b53c000
+DIST cudnn-11.0-linux-x64-v8.0.4.30.tgz 1048904376 BLAKE2B cb9ee44998ca17f670430e2e0641d3f804ff468e1b9fedc88ae6827b340917a89a8dafce88318f30f70333b06dea87c6f7b76851b3fbad6902b020b79e1cb085 SHA512 3364625e24bf5e57ceb4e38cf4eca81341245d9ba354816247537c943c70f9981719cf94873b19aa23b45c64d16a0374c0b9f60328e76f8e5b38f6c88610bff4
+DIST cudnn-11.1-linux-x64-v8.0.4.30.tgz 1510998061 BLAKE2B 1829886516d75ef6015cdbfe26ab8508d9e99d9a3c39b2fedc236663e509f4bfe9adaa54814906a2bb5b885379d4e2349e46d3580f815acdb16e9f73d51574d9 SHA512 57615fef93f0897ede6d65da255a61f2e84d25ef46cd85c5f65558ba4bd8fee6f1ff06a4b0ecf20d0ff92bfd019a3068c719cdcd0de0eb2d16b18caee4aae610
 DIST cudnn-9.1-linux-x64-v7.tgz 343081241 BLAKE2B 22c2fbef38a05e7929ccc28410dfdbff906b2c3e97e0419cf83988c2fc2340005e4a944d43b1a215b0c3458b2cad03480b7e537ae93861924c28ec1010a530fb SHA512 7eadb64a3d5e49aec2761e6f7dc0295c1d356910b114eed450c47081fc81b6e3b7748f3a4153f6a9d957691e3689cd52823bfa12816b1950dfc8794d6f332749
 DIST cudnn-9.2-linux-x64-v7.1.tgz 421083972 BLAKE2B 1a1dd6708132d6ad6f8f541694b1406de4a26b7bb78b6198bc8ec5ddde2172d0cc0dc540c7c446a2f941ad11cfafa562235d17129ab8e6aa641433c35c8d31d6 SHA512 2f67c905976eb041512eb012a7cc98e1f408ec867f6a1d9d440afbcddc622c03c40de10386e44e4ab138c1a4ad040d39b0e9243f68e22975ca27ec297be25c5d
 EBUILD cudnn-7.0.5-r1.ebuild 565 BLAKE2B 883ccb932c1f725857ed0dbf411455074aee04e2d451e2d9854ac34b4bf96b406fabf4f6c14b886dd290e05c780c8c1bf070f5c12f5b7c2089826e157df8afe8 SHA512 9033ffec0923335865f04c6e4ada3bc4266bf59a458dba2230f583ba900ff13499c26f01ef6d3f41941916b0a4ec5d2321077f3a7382fc116bbe8770cc4c898e
@@ -18,4 +22,5 @@ EBUILD cudnn-7.6.1.34.ebuild 718 BLAKE2B df63d29cdcd0ea7587b8be793920366d69d52c1
 EBUILD cudnn-7.6.2.24.ebuild 718 BLAKE2B df63d29cdcd0ea7587b8be793920366d69d52c100ef2ee81722b6a1f1d37a32d91050b1024c4ab23a869ef16f8249b204ab2d647f5b7778b6fa6ef2e77a616a2 SHA512 b31b0b9cffb5dd37cc53dee9f75a5b07f05aa47fa3fe5538a209d97bfeb2b759e0cd6a4bc9be05a93bb771f13e628fbd15de972a6787176c8aa524053cd2f084
 EBUILD cudnn-7.6.5.32-r2.ebuild 858 BLAKE2B ce144c670e508c53d1f3d1621616dbf49c1493445058cd027f1920942a5f254c0133fb39e7aef9514284e2fe3a87b0a36770167176c25dc133be945525f3619c SHA512 18c3b7686ab6242a6a6fb5883d0a5484a37fb040be46ffc7087da28a4b1d7913b3eaa6ef9ce2d52194592b4b6a6b79aee302f1c9c9f79c582ea99f853219a9dc
 EBUILD cudnn-7.6.5.32.ebuild 718 BLAKE2B e8fec9a34ff7103a60c8ec7f226d29054c711c13cc127a41abde7620344246edb06139147a769a3b3b0a7fd007765177ed781726a297bd9d013cc2e44e86bdff SHA512 d435be66ef4be1c40885016c5e13d5fd11dbadc4d109f06da5eef3608bd3d57e7b66b54d3f6ea12c6a94a4d91aaf8b8b6fd3872aab7205d4473ea61281cc8182
-MISC metadata.xml 384 BLAKE2B 6c8db23046a505ae05111e6cbba3493cba9ce481b633291c5b43af091c760fab3873b864661e04b2e2850b7fba875358cab7782578166b33e474ee6c52b5ce70 SHA512 059d9339b98bf62a46c1f909e2ef7004f85ca62c04b4a21158d433f062327ae9d55405218e0f0df9b3a3242677f0bda3e9892193c6166897c4b53acc547ce537
+EBUILD cudnn-8.0.4.30.ebuild 1090 BLAKE2B 1d85500b4fc1095fac64b155eecd9bcea4ab794319b1efb884d64023508bc5105c7a294323d8c7e26dfbc837ea8e9a903a15e4c80414782cce142ebdcf888717 SHA512 d945ebf9509e03f99026220176624f7ae0289878e03aaeb16387761d8d496086b9ff5b40538132eabb09989dc32ea548ea8285b4fc546a17d9b552676ed45d0c
+MISC metadata.xml 492 BLAKE2B 0d757f175d18c84a7c9cbe077d382285a905e4670028f2ff2bb4fb793be819de38916fbbb27129ce4d78b2db72a4cd32a4d9911874d43df5083b651f8135523e SHA512 8bf084e468673e90b19a0e53985e81bf770de4276e5455a4155f06b0519c75720509c55cb9c1fc5f23798b0f835c6b4f4eb025ef402cb48334a06b025954b2bf
diff --git a/dev-libs/cudnn/cudnn-8.0.4.30.ebuild b/dev-libs/cudnn/cudnn-8.0.4.30.ebuild
new file mode 100644
index 000000000000..43f665fadede
--- /dev/null
+++ b/dev-libs/cudnn/cudnn-8.0.4.30.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2020 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="NVIDIA Accelerated Deep Learning on GPU library"
+HOMEPAGE="https://developer.nvidia.com/cuDNN"
+
+SRC_URI="cuda11-1? ( cudnn-11.1-linux-x64-v${PV}.tgz )
+	cuda11-0? ( cudnn-11.0-linux-x64-v${PV}.tgz )
+	cuda10-2? ( cudnn-10.2-linux-x64-v${PV}.tgz )
+	cuda10-1? ( cudnn-10.1-linux-x64-v${PV}.tgz )"
+
+SLOT="0/8"
+KEYWORDS="~amd64 ~amd64-linux"
+RESTRICT="fetch"
+LICENSE="NVIDIA-cuDNN"
+QA_PREBUILT="*"
+
+IUSE="cuda10-1 cuda10-2 cuda11-0 +cuda11-1"
+REQUIRED_USE="^^ ( cuda10-2 cuda10-1 cuda11-0 cuda11-1 )"
+
+S="${WORKDIR}"
+
+DEPEND="cuda11-1? ( =dev-util/nvidia-cuda-toolkit-11.1* )
+	cuda11-0? ( =dev-util/nvidia-cuda-toolkit-11.0* )
+	cuda10-2? ( =dev-util/nvidia-cuda-toolkit-10.2* )
+	cuda10-1? ( =dev-util/nvidia-cuda-toolkit-10.1* )"
+RDEPEND="${DEPEND}"
+
+src_install() {
+	insinto /opt/cuda
+	doins cuda/NVIDIA_SLA_cuDNN_Support.txt
+
+	insinto /opt/cuda/targets/x86_64-linux/include
+	doins -r cuda/include/*
+
+	insinto /opt/cuda/targets/x86_64-linux/lib
+	doins -r cuda/lib*/*
+}
diff --git a/dev-libs/cudnn/metadata.xml b/dev-libs/cudnn/metadata.xml
index f40517d5d330..31978d943c26 100644
--- a/dev-libs/cudnn/metadata.xml
+++ b/dev-libs/cudnn/metadata.xml
@@ -6,7 +6,9 @@
     <name>Gentoo Science Project</name>
   </maintainer>
   <use>
-    <flag name="cuda10-2">On nVidia CUDA 10.2.</flag>
     <flag name="cuda10-1">On nVidia CUDA 10.1.</flag>
+    <flag name="cuda10-2">On nVidia CUDA 10.2.</flag>
+    <flag name="cuda11-0">On nVidia CUDA 11.0.</flag>
+    <flag name="cuda11-1">On nVidia CUDA 11.1.</flag>
   </use>
 </pkgmetadata>