From 9aa80713372911cec499b3adb2cd746790920916 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@redcorelinux.org>
Date: Tue, 29 Jun 2021 10:15:54 +0100
Subject: gentoo resync : 29.06.2021

---
 dev-util/Manifest.gz                               | Bin 63853 -> 63851 bytes
 dev-util/buildbot-pkg/Manifest                     |   2 +-
 dev-util/buildbot-pkg/buildbot-pkg-3.2.0.ebuild    |   5 +
 dev-util/byacc/Manifest                            |   2 +-
 dev-util/byacc/byacc-20210520.ebuild               |   2 +-
 dev-util/catalyst/Manifest                         |   2 +-
 dev-util/catalyst/catalyst-3.0.19.ebuild           |   2 +-
 dev-util/cloc/Manifest                             |   8 +-
 dev-util/cloc/cloc-1.84.ebuild                     |  31 ---
 dev-util/cloc/cloc-1.86.ebuild                     |  31 ---
 dev-util/cloc/cloc-1.88.ebuild                     |   2 +-
 dev-util/cloc/cloc-1.90.ebuild                     |  31 +++
 dev-util/git-delta/Manifest                        |   7 +
 dev-util/git-delta/git-delta-0.8.1.ebuild          | 154 +++++++++++++
 dev-util/hermes/Manifest                           |   2 +-
 dev-util/hermes/hermes-2.8_p20180315.ebuild        |   2 +-
 dev-util/nvidia-cuda-toolkit/Manifest              |   2 +
 .../nvidia-cuda-toolkit-11.3.1.ebuild              | 253 +++++++++++++++++++++
 dev-util/opencl-headers/Manifest                   |   2 +
 .../opencl-headers-2020.06.16.ebuild               |  26 +++
 dev-util/pycharm-community/Manifest                |  10 +-
 .../pycharm-community-2020.1.1.ebuild              |  54 -----
 .../pycharm-community-2020.1.3.ebuild              |  54 -----
 .../pycharm-community-2020.1.ebuild                |  54 -----
 .../pycharm-community-2020.3.ebuild                |  60 -----
 .../pycharm-community-2021.1.2.ebuild              |  58 +++++
 dev-util/pycharm-professional/Manifest             |  10 +-
 .../pycharm-professional-2020.1.1.ebuild           |  55 -----
 .../pycharm-professional-2020.1.3.ebuild           |  55 -----
 .../pycharm-professional-2020.1.ebuild             |  55 -----
 .../pycharm-professional-2020.3.ebuild             |  61 -----
 .../pycharm-professional-2021.1.2.ebuild           |  59 +++++
 dev-util/rocminfo/Manifest                         |   2 +
 dev-util/rocminfo/rocminfo-4.2.0.ebuild            |  23 ++
 dev-util/vulkan-tools/Manifest                     |   4 +-
 dev-util/vulkan-tools/vulkan-tools-1.2.179.ebuild  |  10 +-
 dev-util/vulkan-tools/vulkan-tools-9999.ebuild     |   8 +-
 37 files changed, 648 insertions(+), 550 deletions(-)
 delete mode 100644 dev-util/cloc/cloc-1.84.ebuild
 delete mode 100644 dev-util/cloc/cloc-1.86.ebuild
 create mode 100644 dev-util/cloc/cloc-1.90.ebuild
 create mode 100644 dev-util/git-delta/git-delta-0.8.1.ebuild
 create mode 100644 dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-11.3.1.ebuild
 create mode 100644 dev-util/opencl-headers/opencl-headers-2020.06.16.ebuild
 delete mode 100644 dev-util/pycharm-community/pycharm-community-2020.1.1.ebuild
 delete mode 100644 dev-util/pycharm-community/pycharm-community-2020.1.3.ebuild
 delete mode 100644 dev-util/pycharm-community/pycharm-community-2020.1.ebuild
 delete mode 100644 dev-util/pycharm-community/pycharm-community-2020.3.ebuild
 create mode 100644 dev-util/pycharm-community/pycharm-community-2021.1.2.ebuild
 delete mode 100644 dev-util/pycharm-professional/pycharm-professional-2020.1.1.ebuild
 delete mode 100644 dev-util/pycharm-professional/pycharm-professional-2020.1.3.ebuild
 delete mode 100644 dev-util/pycharm-professional/pycharm-professional-2020.1.ebuild
 delete mode 100644 dev-util/pycharm-professional/pycharm-professional-2020.3.ebuild
 create mode 100644 dev-util/pycharm-professional/pycharm-professional-2021.1.2.ebuild
 create mode 100644 dev-util/rocminfo/rocminfo-4.2.0.ebuild

(limited to 'dev-util')

diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 1a7d908f8d41..cb8a2506acd0 100644
Binary files a/dev-util/Manifest.gz and b/dev-util/Manifest.gz differ
diff --git a/dev-util/buildbot-pkg/Manifest b/dev-util/buildbot-pkg/Manifest
index f57f9431d910..47dab1c7ac5a 100644
--- a/dev-util/buildbot-pkg/Manifest
+++ b/dev-util/buildbot-pkg/Manifest
@@ -13,5 +13,5 @@ EBUILD buildbot-pkg-2.8.4.ebuild 695 BLAKE2B e1512c55e95cec782aa3a33ca22c39b20d9
 EBUILD buildbot-pkg-3.0.2.ebuild 697 BLAKE2B 813fc9a172557ca5ceeee78f561689aff1f44d866e01c290014bec04e2bf23ccbc87739404fb7af39bbf0b5d340bf9204393ee42082131da3144e88df52daad0 SHA512 74f1970004573262179781246c180c283285e0f435dbc328ca589f83ce02ff0335de31eb106f109c0cc76a35f063d6bad8522051d84826c69d7376d6b1b53866
 EBUILD buildbot-pkg-3.1.0.ebuild 704 BLAKE2B ee91295ed2e9684c4345e7b062f76640781720f8e524e8242389d9a0f6383d3c4e50a9c1141f60c53b5f6df85a644903bc881efa70f8e722d607203378cf4b23 SHA512 732bfed55bd0ddc04871b3f05efc03d90b38204ca526408b3fdde6941480499e009dfc14d345624018976f179111dc087f4704a3e28c87b49297ef9714e32c49
 EBUILD buildbot-pkg-3.1.1.ebuild 728 BLAKE2B 54ee9f1fd832d61b1a08fae145bdbd2bf52a34064d30667b0070afdec0ad1e6387eff9efb4ef465db30792d17abd26b3974c2f757dd923b10e5db26ef90aa945 SHA512 f3bd6a350d47a5652c177d368b5355e27d2df8337f3522ad90cfc1a1d78b89c771f830d9c1af1030543fa860863b69e3e9118096929e85b271f71c090b8c72b5
-EBUILD buildbot-pkg-3.2.0.ebuild 728 BLAKE2B 54ee9f1fd832d61b1a08fae145bdbd2bf52a34064d30667b0070afdec0ad1e6387eff9efb4ef465db30792d17abd26b3974c2f757dd923b10e5db26ef90aa945 SHA512 f3bd6a350d47a5652c177d368b5355e27d2df8337f3522ad90cfc1a1d78b89c771f830d9c1af1030543fa860863b69e3e9118096929e85b271f71c090b8c72b5
+EBUILD buildbot-pkg-3.2.0.ebuild 809 BLAKE2B 95e956cdfb1bcd60a322501d332062e336d8033ba6f687d672d8d26dbf81c5381485796f0cd838fdf7c7ade0b0bb4e89cf4c15d2ba29f51ce031d49bd60e89b9 SHA512 3c63b6c7f30d85661cc283cde726d244442ff09d6008d2b987c9d5a9b936ad50cbb9a7c7176aaba154bdb5f2dcd240a02fccf4ceb248e6be7b7885aaa30cbce4
 MISC metadata.xml 1198 BLAKE2B 3b336db0b25b79b1baa060ec52c8451732cb3d7a099c3cf148bc5db4c68276dd72e684b2aa82c50e4eb7aa0fc6b0d88a7e0e2d8a4ab15e423904b19f0102a664 SHA512 c85c49f440cb6fbbc0ddf0d522949d9132e71abac4ace66c93893fb29ccd70b240482f8a33176849889521e082913ed71225e8a4fe663d2602c8d5da3db3b95f
diff --git a/dev-util/buildbot-pkg/buildbot-pkg-3.2.0.ebuild b/dev-util/buildbot-pkg/buildbot-pkg-3.2.0.ebuild
index 03b7f005df6e..ce173c787577 100644
--- a/dev-util/buildbot-pkg/buildbot-pkg-3.2.0.ebuild
+++ b/dev-util/buildbot-pkg/buildbot-pkg-3.2.0.ebuild
@@ -25,3 +25,8 @@ KEYWORDS="~amd64 ~arm64 ~amd64-linux ~x86-linux"
 # all tests are related to making releases and final checks for distribution
 
 S=${WORKDIR}/${MY_P}
+
+src_install() {
+	export BUILDBOT_VERSION="${MY_PV}"
+	distutils-r1_src_install
+}
diff --git a/dev-util/byacc/Manifest b/dev-util/byacc/Manifest
index 750002951d35..f35b4f955aeb 100644
--- a/dev-util/byacc/Manifest
+++ b/dev-util/byacc/Manifest
@@ -2,6 +2,6 @@ DIST byacc-20210109.tgz 873282 BLAKE2B 3f856bfba00b692ecc5fd297582ff594873914552
 DIST byacc-20210520.tgz 878173 BLAKE2B feecf3708eb6269c046043bff7f3ca40f4d4240e1849283e970dcf1c2f665e8c43f46ca4913a332987b7c9883fea68947953c28bf3f8fc983ffe6b7a4d804c17 SHA512 0b119efbe8748f9b5959926c36ac006174d99deb7a9c84ce97b7b80a01d197dd4d1004788dfed87bc492410a354b06f01b848b8da20ce0f64466c527c091bf48
 DIST byacc-20210619.tgz 880118 BLAKE2B 29a8f586c191c46fcec8d2a4203332621a9f03875aea81d7ba21a4e4676843320213e765709f22a385cf4328060496c154d036d4d757dd925ae81857f0977fc1 SHA512 878c7b5ab17bcfb0acb29ab06066630ee42cae7e768c7386308ec1f58e61744b5b6baaf7e9416cef32f9be406af65eb8f791ccf6e192caaf3f34954e6bcc1642
 EBUILD byacc-20210109.ebuild 597 BLAKE2B d2369392975f705756da06a683bf456d3bc80737db5c54b4dc21ef1d52fae6fa8dd3128f1c8c25538c94f7beb22b8143186590c829a0dd81536c9c7edc5e1892 SHA512 8892e8d83199332d811e4ddb2e5abf92cbbcd4fe57815628650007f1e188ff851346badd284e8e5b334ffc6b2f506450e3db806c428cbb400829482a917afafa
-EBUILD byacc-20210520.ebuild 598 BLAKE2B 7b583a2ffa4b17d792892134145877668c2f993489bcd2f78bd215886b92a26176ceebca92897591d4ab9f0e0ec802af7ff9a1a509fee5f2d751807588314098 SHA512 9f6183702e89f4ff4196e77b9bf1fa42ee83375fbab42e1b0be8fda23163469433da4077e3ac9fb89ffd980ccafab6c086004f6f691199deb81df0f7e19b3924
+EBUILD byacc-20210520.ebuild 597 BLAKE2B d2369392975f705756da06a683bf456d3bc80737db5c54b4dc21ef1d52fae6fa8dd3128f1c8c25538c94f7beb22b8143186590c829a0dd81536c9c7edc5e1892 SHA512 8892e8d83199332d811e4ddb2e5abf92cbbcd4fe57815628650007f1e188ff851346badd284e8e5b334ffc6b2f506450e3db806c428cbb400829482a917afafa
 EBUILD byacc-20210619.ebuild 604 BLAKE2B 6f4b3612b5638cd6962ecb8eca298c0f92740750f45db9d53e45f9988d0d5c3e52b4031a02557adf4e7b1fe40e643e0f33206fc8397d9acb3076950ad11554ae SHA512 1062db25ea711b5ec17f4320a0e6826847bce4cc22c5416b298d66b82fc5dcc002bdf0ae125614bcfb77c153d13fcd7dcf72f67db32692fcd2af25c16186cfde
 MISC metadata.xml 355 BLAKE2B 10160435379a759071cde21a0195dbeaac5783119695a9d9b092090158c429d01280d2442d351e5dd8a6368ff11566f153e02abc07d81c19ace1838f1943a09a SHA512 b0b39011f45894df952d34cd75ee087fd42a77aeb5a0e60e4201fb404781d77c4a5a82d2492712ad0ac2a2daad029a19c1284f7fc8f624c2ed47fd0b55d680dd
diff --git a/dev-util/byacc/byacc-20210520.ebuild b/dev-util/byacc/byacc-20210520.ebuild
index 1cb441fafb3b..b7181571aa4b 100644
--- a/dev-util/byacc/byacc-20210520.ebuild
+++ b/dev-util/byacc/byacc-20210520.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://invisible-mirror.net/archives/byacc/${P}.tgz"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
 
 DOCS=( ACKNOWLEDGEMENTS AUTHORS CHANGES NEW_FEATURES NOTES README )
 
diff --git a/dev-util/catalyst/Manifest b/dev-util/catalyst/Manifest
index ab2483500702..8ea663b3284d 100644
--- a/dev-util/catalyst/Manifest
+++ b/dev-util/catalyst/Manifest
@@ -3,6 +3,6 @@ DIST catalyst-3.0.18.tar.bz2 621208 BLAKE2B 63f76634b96006ef4a751b0ce166ab36dcba
 DIST catalyst-3.0.19.tar.bz2 621000 BLAKE2B 162367363615fc83ce8847bd21f5f1b1e6e6e7ae90c65f6e58af6182a00f14d1bd26c7b994d984517447744b84bd7fbf9e865724a36316dff2cc294dab80685e SHA512 e375960f4b44d616112ec200278c20a9ee3597de04adc87e692b164dcaa3eb7cd4951b41a094c062a500d4920b375ad9750918b4985120ac71e97d118073020e
 EBUILD catalyst-3.0.17.ebuild 1998 BLAKE2B 19e8fc43f1322c3a24de6f07afd62693cda7680e5af7dbf443a893cce089a94c38b3dbe76530f801a67d5b33a5580edeb4681210f5d71e3a6ecbb7b273a1c70a SHA512 9414c001dcf2770efb5801909583dc0d044b6e376465509bb7ef7a3e633f2c9edff6e2c31aa4a8d3027530c9ac6ddf590153cbbc4504a1fbd90b23c0619f4109
 EBUILD catalyst-3.0.18.ebuild 1998 BLAKE2B 19e8fc43f1322c3a24de6f07afd62693cda7680e5af7dbf443a893cce089a94c38b3dbe76530f801a67d5b33a5580edeb4681210f5d71e3a6ecbb7b273a1c70a SHA512 9414c001dcf2770efb5801909583dc0d044b6e376465509bb7ef7a3e633f2c9edff6e2c31aa4a8d3027530c9ac6ddf590153cbbc4504a1fbd90b23c0619f4109
-EBUILD catalyst-3.0.19.ebuild 1974 BLAKE2B 5a3871974f7efa7bc630903136926270afda0982f3b1303c3381b0e4591ddcbc56593cd8b68d0a5a31a756be5a43dada664ce9e285feb1429439b7d8315b4936 SHA512 74c58b9cfa7634d8f201d53e2ee851a1f73ba0895179c63c93432fa2e00888209fefb03674e06ec273131d0b11a2e000e63a35a8dc3fcb44806fcf1e2da2ec48
+EBUILD catalyst-3.0.19.ebuild 1980 BLAKE2B 684d3ff85a3eb0b116f57c90a3d50612b60defe2666fde94b2aa23dd5e886daa497a11261ba1ee6c251a61c73a15eda5989dfe9f14d364597975e408e682f8b7 SHA512 6012d8c24a63ca062f7b4a8e48ce517be4df82d9a07629cbe0c52f2793201c9a022dac4b753421cb4402b17e8d76094c0f6f42dca41b94b276c11eec360482af
 EBUILD catalyst-9999.ebuild 2177 BLAKE2B 33a8c3f97e7cb4e7b8a56487eaf6a5d83cc2ba14e703a9bf43f3ca37e6dc035ad7d08406ad9112b5ebbe20361348bfd3e2e95d2857b22c6870b920ff8ab3baab SHA512 1dc17150656538bb6d6cfd1c058565ffe9f6d1ecd4da99542454e5c7f3f781f9dbdd59df36fe1ad587f46d0ab1b1da9b01559d11b2a4b600face3fd684df2404
 MISC metadata.xml 512 BLAKE2B 27e0e3638c330c780f163608e5e62b71ed636a2e26291f97465c4506ae1b99345d081046bcab70b1bf56e36c5b9a6b8220b94da8433f2b313235c784ad6b9b5f SHA512 7d6683e83df2d311f3210af91880486ede8f7ddea57044e765f29694eb3e1b8df6f3d22c9a729c480ae9d49ebe3778cfe7a6509365f59eaae34f8438afe97afd
diff --git a/dev-util/catalyst/catalyst-3.0.19.ebuild b/dev-util/catalyst/catalyst-3.0.19.ebuild
index f465da63becd..a95863df1def 100644
--- a/dev-util/catalyst/catalyst-3.0.19.ebuild
+++ b/dev-util/catalyst/catalyst-3.0.19.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} == *9999* ]]; then
 	EGIT_BRANCH="master"
 else
 	SRC_URI="https://gitweb.gentoo.org/proj/catalyst.git/snapshot/${P}.tar.bz2"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
 fi
 
 PYTHON_COMPAT=( python3_{8,9} )
diff --git a/dev-util/cloc/Manifest b/dev-util/cloc/Manifest
index f2d20fa2225d..406e7f5e2e0f 100644
--- a/dev-util/cloc/Manifest
+++ b/dev-util/cloc/Manifest
@@ -1,7 +1,5 @@
-DIST cloc-1.84.tar.gz 514868 BLAKE2B 53fa0f0d2c8033619f9f7202802e5fd51013c459bbeed8482a35050be69981e60f3c96879cc2853d509322933050fda52fe17be7ec393783f06a0df5e9cec785 SHA512 85f8af041b0ca858c21e28d3fb7cd9201264afa9e12bd3a14b15a8af3e6e68378dbb02a39dc12140bcbb104424cf38bfa602d2a0683e8c89fa50cbdcf7556b3a
-DIST cloc-1.86.tar.gz 536828 BLAKE2B f584da0e25ae755a1450117774ec8fdb87eb693ac77473929a52e617713391eb4bffc2f6b74bbcd5b01f6e2c0d747221e3f7c4e74dfd6131d3cde10a3a102daa SHA512 fe6101404f5884d11bf73de43bd25e533b04a70707b95e4e9482b51413aed46ddb55beaa27e3d25cd7604394a739f7cac6c1f8695cd9cab3f23adf6e27171719
 DIST cloc-1.88.tar.gz 548402 BLAKE2B 0da417d907703e42c9c69e46f39792652e6eca49994a8008b0074899bfb999262d529432ab1e8a1c7cc80dc1fefc9514596f099a4238c4768618057ba3b180e8 SHA512 0acd152b387d3088d8bd35d121677d00accb03f882d83bfb34924915d40700b0c23bca1bde924d1999b5fa910503d33af230567fcc8f452f7d00a69caaaf8c4f
-EBUILD cloc-1.84.ebuild 681 BLAKE2B 7f0b61c23a9af5fe8bd6d6359e926989191ef28f5a2fe3b045ac325c8c88d3a48d1c3d884e6aa9a35c38ac586a2eb571a9d36d72b8d6215947f1dbc63d5d26a4 SHA512 f5bcfec8a2c440f6105adfb1c9e99acf2b2b5bdfb3f8e1205b4f3c4a92cef7072f472e8337500846bdcd6d88b1c2fb239d61de1c38d6f4e91653127421e5dd6c
-EBUILD cloc-1.86.ebuild 688 BLAKE2B 4d4301e39c40b0a6113f2ada061eb65864c69b0e11d514e4d60bfb992da9d850ed9e0f470ba4c9523aac6c2bb16c4db34a14c54b0716bcaa0254a513fe6b140d SHA512 ed2bc861df08dd911e5ec06bdf7fa76dd76b7fea2b0906d6bdf5982ef259ccb6b6e59e1f402af48eb111663ec2d6117cb9a4eac191e65b177c14198cc6cdf754
-EBUILD cloc-1.88.ebuild 690 BLAKE2B a970f04b7567717cb94daf8cf59698318a0ccb7f5b8822aaddd497ac136464d37799c23faa6174601012a92578249a1d1c596abf48d6bb92d094e41fbe38e064 SHA512 22fe338db869c8e1d21dfa8f9e9f41ecf2a8036a33723849d1ca2ab2c77e53ae272ffdf70702e2c8086428066ccd9731aa066e3f43493d3360036e87dd146107
+DIST cloc-1.90.tar.gz 596758 BLAKE2B 273a0ade1cb5d95fda3404b46869fa970276aae0f4f733efafad7949170e63713059e1a09dffae23a3469517bcce1ab6029b4a91b1900ddc7aa4dd5ec0ab2127 SHA512 d2950d56ac4d8a6fe53059759375d8245aa8a8474462daec385a8b4e2f36961270c08390c361d4a0566e529357b0d302cef31c8fc69dc680655f4c3ea3a1d813
+EBUILD cloc-1.88.ebuild 688 BLAKE2B 4d4301e39c40b0a6113f2ada061eb65864c69b0e11d514e4d60bfb992da9d850ed9e0f470ba4c9523aac6c2bb16c4db34a14c54b0716bcaa0254a513fe6b140d SHA512 ed2bc861df08dd911e5ec06bdf7fa76dd76b7fea2b0906d6bdf5982ef259ccb6b6e59e1f402af48eb111663ec2d6117cb9a4eac191e65b177c14198cc6cdf754
+EBUILD cloc-1.90.ebuild 701 BLAKE2B 0a483165191c17b72ddfde648a986a803cef73cc3ee29078d91ff5e72c7afc1117065c64838baf245695720985ebfff564defebc08168e5a30b0a0de7c23d20f SHA512 1ae59a94d36f0f661fba2b0ee16f2b00dc0bf0e1598875db517ad8d7cef84c2fb8f8091da9587ad989a956bb02d363d3b8f3a58e6a25dbe5a96b1d5d4567492b
 MISC metadata.xml 729 BLAKE2B 5bf2df19190e3878bee61b9e0ce653f8a1dc590ec166e25619a0a391a548a58db2a17d7c0ae5549cb119e151d9d9d5503b0731638712c30f06bb93cf1a43a777 SHA512 7138216cf6d431a42f58db2a5c7fd19f828b9784aa17457d91ec4cb942427fc2dc2e4ad6e13aae933c621b369321611e54492a78c72b7b6b7a198c8e745bd741
diff --git a/dev-util/cloc/cloc-1.84.ebuild b/dev-util/cloc/cloc-1.84.ebuild
deleted file mode 100644
index aaa2db89040b..000000000000
--- a/dev-util/cloc/cloc-1.84.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Count Lines of Code"
-HOMEPAGE="https://github.com/AlDanial/cloc"
-SRC_URI="https://github.com/AlDanial/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc ~ppc64 x86"
-
-DEPEND="dev-lang/perl"
-RDEPEND="${DEPEND}
-	dev-perl/Algorithm-Diff
-	dev-perl/Parallel-ForkManager
-	dev-perl/Regexp-Common
-	virtual/perl-Digest-MD5
-	virtual/perl-File-Spec
-	virtual/perl-File-Temp
-	virtual/perl-Getopt-Long"
-
-src_compile() {
-	pod2man "Unix/${PN}.1.pod" > "${PN}.1" || die
-}
-
-src_install() {
-	doman "${PN}.1"
-	dobin "Unix/${PN}"
-}
diff --git a/dev-util/cloc/cloc-1.86.ebuild b/dev-util/cloc/cloc-1.86.ebuild
deleted file mode 100644
index 997b5bde73dd..000000000000
--- a/dev-util/cloc/cloc-1.86.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Count Lines of Code"
-HOMEPAGE="https://github.com/AlDanial/cloc"
-SRC_URI="https://github.com/AlDanial/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
-
-DEPEND="dev-lang/perl"
-RDEPEND="${DEPEND}
-	dev-perl/Algorithm-Diff
-	dev-perl/Parallel-ForkManager
-	dev-perl/Regexp-Common
-	virtual/perl-Digest-MD5
-	virtual/perl-File-Spec
-	virtual/perl-File-Temp
-	virtual/perl-Getopt-Long"
-
-src_compile() {
-	pod2man "Unix/${PN}.1.pod" > "${PN}.1" || die
-}
-
-src_install() {
-	doman "${PN}.1"
-	dobin "Unix/${PN}"
-}
diff --git a/dev-util/cloc/cloc-1.88.ebuild b/dev-util/cloc/cloc-1.88.ebuild
index 816f8e40db45..997b5bde73dd 100644
--- a/dev-util/cloc/cloc-1.88.ebuild
+++ b/dev-util/cloc/cloc-1.88.ebuild
@@ -9,7 +9,7 @@ SRC_URI="https://github.com/AlDanial/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86"
 
 DEPEND="dev-lang/perl"
 RDEPEND="${DEPEND}
diff --git a/dev-util/cloc/cloc-1.90.ebuild b/dev-util/cloc/cloc-1.90.ebuild
new file mode 100644
index 000000000000..2e2243cd284e
--- /dev/null
+++ b/dev-util/cloc/cloc-1.90.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Count Lines of Code"
+HOMEPAGE="https://github.com/AlDanial/cloc"
+SRC_URI="https://github.com/AlDanial/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+
+DEPEND="dev-lang/perl"
+RDEPEND="${DEPEND}
+	dev-perl/Algorithm-Diff
+	dev-perl/Parallel-ForkManager
+	dev-perl/Regexp-Common
+	virtual/perl-Digest-MD5
+	virtual/perl-File-Spec
+	virtual/perl-File-Temp
+	virtual/perl-Getopt-Long"
+
+src_compile() {
+	pod2man "Unix/${PN}.1.pod" > "${PN}.1" || die
+}
+
+src_install() {
+	doman "${PN}.1"
+	dobin "Unix/${PN}"
+}
diff --git a/dev-util/git-delta/Manifest b/dev-util/git-delta/Manifest
index 584e4c9e89eb..f66f2ee05bc7 100644
--- a/dev-util/git-delta/Manifest
+++ b/dev-util/git-delta/Manifest
@@ -1,6 +1,7 @@
 DIST adler-0.2.3.crate 12168 BLAKE2B c7743569d700d7ec3185e0459a18181148f8cd7579f4da1fab30eb2e3c3cabbe5a7467f7760f0cba4b2fdeb62f8d988ee1f24637685d76db7acb56f679cfc996 SHA512 565849eba122eb94d240a0cba875035537058cc168f137a8a3b99392d753815d56fa0e1a1e851062632700b0e3d12caf67f5f768b9f727956a2e5b599029e9dc
 DIST aho-corasick-0.7.15.crate 113071 BLAKE2B a22743be74f873b9545648db6a994250e3e39b92ac99601580e3b02194d205e921bff0b1952a4cca3399a3a7828555a1abfb0c1466f3930811c6b95c1a07ec5e SHA512 e67816efa7305937a7cbbb0079b91b8afa3fdab52cfb8eeddeee156f18bbeed26f941cd4cb18ab2bdc1da5a9ff1dcbe9d2090deec68c00287bd99ace18ee8b24
 DIST ansi_colours-1.0.1.crate 9937 BLAKE2B 04d86fb964138cadeab0cb708e99d198189efe6ad871b9cea43967f610922234f371befe7b25c8ef824f94daef5b6c52e47a5d86f7966b82ff100ae5a4e38281 SHA512 16d9470385c55eb28be0fd3ea0bf5d8832676282636edb71f670c629a77884f590bf4ea13f2bf1002031a5a014cf1bfb32bb7a09da27af3c1d85e4a0f524af23
+DIST ansi_colours-1.0.3.crate 10419 BLAKE2B e140d65a40228e2df42f2d8d5d5ae6809e1e30afa007d97d07ed14ed6f8f4535c0adbb497cd417c5ef6528e5a60a997d4ede66709581a653c5e3dff83bda9ea5 SHA512 98ca71c01e3c5b86022430823066b68621904398f69bb7a3d13dd2b999b343a72151568d837cb0d811826204e538a34ff88590cb72f7da5d2bb2a365a264bca2
 DIST ansi_term-0.11.0.crate 17087 BLAKE2B 9bd35c045a01ce4c6c4a5db1b4f15e9412bb97426eec19d4421dffbec633de8d13452c13c1dc1b30998690b78d7ed38311aca700087f13a81f66bd1d5d7300c4 SHA512 a637466a380748f939b3af090b8c0333f35581925bc03f4dda9b3f95d338836403cf5487ae3af9ff68f8245a837f8ab061aabe57a126a6a2c20f2e972c77d1fa
 DIST ansi_term-0.12.1.crate 24838 BLAKE2B f636772c34e2d68cda7b8d3b2b86abda074585a62bd2654812ce92384244655a9197fa66e6939e19a674c0148ca605313d83de262bb18c2339a8a4eb4438a791 SHA512 b840e28b3e7700689a69a39659b1e066560078dd4a58326b91a028915819e7af883399ee53e920db68fd974c58d35bb1ddf8d427af5937d5f696f57c4376b671
 DIST arrayvec-0.5.2.crate 27838 BLAKE2B 51e2eacae0ef148f3f52d21ae00794e540e7ce4c013fb496dd1347ad91ffbbca199381fffbb064225f829216f6c5e915edfa64833f91fabdd13c3f011d86491f SHA512 1896b5f64b4dbdcff8ad234bda4ea8129bcacf87839347304717e94ee9f369cf5f4371755e453ff7d72817edb8f7fdbc726d77cc4f28ed05148dc89c7714b004
@@ -30,14 +31,17 @@ DIST form_urlencoded-1.0.0.crate 8412 BLAKE2B d65250a1d56cee26befb8733733ab67ffb
 DIST getrandom-0.1.16.crate 25077 BLAKE2B 0cbe96c27e78100c181a064e5fe524efa9a7a267fe60f8336d2ae0125883acd5d575ff17d1d56607255d9b2c30cb9d962026fdea1a5c3c29a5e0760d27c3136a SHA512 c5450c522c07c7a38b326f9a9062bac7d089630219d577ea4b55abad4e0c31d17b7cde385fc43912dfa100b42334e7a52422c55fda8b738caae428c6f9addb53
 DIST git-delta-0.7.1.tar.gz 1064009 BLAKE2B 3932d4adb5f696b92bf9d8987d90b2521401211944f9a8c0e5587e5dbcdf9ba93406547dee42885ca248687209c56d59e0f079f9e583f9b70104c09a306516a3 SHA512 cac2fdb9460ee49e8855a99ba2d9625205f050ef6be286c5ab55950aa256243ee5f367b8c2a333759a6a0399c89edb33ec97014296403a9ca4ab9b3d9704530d
 DIST git-delta-0.8.0.tar.gz 1067767 BLAKE2B eea8d5c7dfe7d00179bdc1cd8af0bdd3f9bfe7d5787c107fb353b0d4c9e5986156296f2990dcf42c75961eb6a06d62bfaafc6ef9a21beb6e4288fb7547028993 SHA512 4d9fddc91fdaddd9509f04f214053024f4d1cfee1f03c83eeff2a759d933ca40f3dc9d1269f09394f15c5c1987bedb878f6e7515bc96a8102cd4c076fa24e924
+DIST git-delta-0.8.1.tar.gz 1068448 BLAKE2B 05503fef2316184e739d58eba0a2b96ec463dc4ce80073cb9efb4cc17d59ebe82b05c86839d474b0ee918cec87056d848781c17a6d866e37a69617c2922bbcbe SHA512 2e02538859f1a162804af2352206988e70eb97f044d2b3385f8f5ef60a2b3141f8b7d51a78f4a67f98131925696220de1e23f6655ce9ce04efa65a1c6bc98119
 DIST git2-0.13.17.crate 181726 BLAKE2B be159d2f3602a65b133d6bdb3d949a48b34029b7a491961469d7a5a6dd8d471b0460ea53e802f69a216ed6111d0329e8a8ee29024af3753a185258f1268b5ead SHA512 5d95ff8d5c62df55b9995f2319dc350dfc9c44b90bb594f6b90df4985f8ebed50211e380885826251aa4e86eef1cfac99f648fba5f91cd4b725b0d05b3800fc9
 DIST git2-0.13.18.crate 189821 BLAKE2B 7ee264af12e64131d33be2161ea4be98ef3d334dbcfd88182a0aa26b7f78449571b22e43832337a24719ff5f548ca1531710f05b7c5b6dfbf8eeff2538ada3b4 SHA512 7cb932b92d81e52cb3561fa782ec1b03ef73e1ec3595ef933a0d79afa65f781ffc2f3c83766089fc06129b097d17e23d2d764fb47562f683a8d08a686377dc9f
+DIST git2-0.13.20.crate 190365 BLAKE2B c4f3420f19cdfb420576bc8c38dc45d1c7f3b74b5a2d23c85154dec35916d3d588c86aaa50eca52b427e5d044a07ede7cd1445ef1ba53ce08c70ff39f7ac56bc SHA512 2c0a9cf3391f4ea5eaa48c8fcc08a1cf27b877cc4960332bfdbb95620f9b161f720c35f87bf98e3771749a01444bf8e2337e6d8fc1a34962d4b041473115293f
 DIST hashbrown-0.8.2.crate 75830 BLAKE2B 9b08d98fd06e0cdf1dda7a86b8e2c6b1463d28eaf108c38c7c8fce1364ff1d752b044a46d0081b2348c6eecf0bf3e935e85a2d88c67b144e86734bf85a8e13ef SHA512 a6c5e5ae29d3068d54799efbf79b40ae95c2ab64807fe61ad44a49cd90c72b44f1e72340f5d6e2af1f9bb2684675dd86fb74eda03cfbf3a49d3dcf5080867a02
 DIST heck-0.3.2.crate 54718 BLAKE2B 6514f604361932e0a8e1a86786d3ec7218d95f8b3b3bcfc9e21c5fddc58ebe28bc0781e2ad24de4dd4296da85e97c742d8473370c99a593e7e5fc7df00fc9b4c SHA512 cbc72c3473ab14fe445491b1d9586d50de9a462af344638b871f7309fa805069a1405bcb1e0859b561f48583fc71045f38d03b92332d35131c67e140ccd241ad
 DIST hermit-abi-0.1.17.crate 10065 BLAKE2B 79aeac5f72873a29b53368fb01ed4288224692cc7c55221633775641ade40693bf3fb44db22cbe4422a74d1d6330450110f21b586426b6fb8ef93f116476c644 SHA512 1ed4688f2cc1f1d5ba2f7637e2a9dc230712ce8907e1fa3d95ae374cd4b67a325138a98f2a524cb03f99625775057aa0370f480a73ab20485f0456e2f108baf2
 DIST idna-0.2.0.crate 257203 BLAKE2B d26117124891f90b5e36af291c9038e2f4d46402c41380a6a89758459fd73839137e6faa401502be12dd81292cd9e12ec82fc611c0ff7a150510d19010767558 SHA512 375d6d73537a5c9cebfc850a2b561d57e748d80059ca27fe5e35c058cc12a5938cfbb39a76cfe57fbe589f7e36f89ccd91ccdb8899458c322e277c299293bc7d
 DIST indexmap-1.5.2.crate 47558 BLAKE2B 67d5cbd16bf464bf2a003e13285f559a2f02cf427cbb9d84ce80bea6a57a983c2b7db834a0a7172bb747d003b1d81530bea0c7cc8017cba4b963cedb14f8a1a2 SHA512 6297d720181a41624ad255c2f870abd2de12a7752f7ae4c724a64822c36b37275103cd75e35f6e690e150688171dd34de45b01cebac74a3711be7a3f5728ed6a
 DIST itertools-0.10.0.crate 109656 BLAKE2B 73b65db4a9f02cd6940a81966ff433c5d9d82bda15b2250907728b2305451e2914e0211ed16e9755585d6a4ea67c3f2b1a5b1ca589afb60f20f23d1c1d31da7a SHA512 ecc194ded512a0979c4429c0395125e1d3968c61f673546b755c0a8bf2fa5a604690baf77e95dbb91dc26a3004b50a856a8aee0dae0e4c1bd83073e5e7cacefd
+DIST itertools-0.10.1.crate 116219 BLAKE2B 7d354daf7b069515ec7fe77ff2f4f07ecf870735d7ca166fd6b10ba89431cc27bf264c648efd2052206e8edd8f596485b913071453f37e5de47da44e935db79f SHA512 8626eee66aa598e16f5322a6fc55b17c622656f58635c990f5cbd8faeb4739690b0abb3efac4a9a3073752e9f2a51a0ba29401edb12e0f6bf9bddd8d1b394dbc
 DIST itoa-0.4.7.crate 12099 BLAKE2B 0e4ffbaad504565056f74c3ef560a87eff321a0da6d7a2c8fa35813c207713c22d77080c3b830fefbb21370dd29cfbc6a2807044485b38ac1e0c9c1de3ccebc5 SHA512 c61eb50aa00591af28698b45c528c36bd92088f7cd2f453cf686a1824f4656292638bebc468cf67f903473a5045f22777af623cc0515ef3bf25146b89a7c454f
 DIST jobserver-0.1.21.crate 21228 BLAKE2B ab1a6496d609e19235f022e920495e708571116e90f8c036edb5f7ba270c2ac938f7571e89f3fb714043c87623d4cbf1d404067ccac6a8b41e4a6768039cf02b SHA512 944249819e1e3dd09495ead941330e9abe439647c1e66ab7e2140c0c9e100b63f4f792fe06aa3c86f509f057df297ee2d35df0ccdfd4bd6a115b6a44076237ad
 DIST lazy_static-1.4.0.crate 10443 BLAKE2B 25b2e61bbac48f0dcbc79c81d7bf01f2403d8269ecb6be3ea6147bd00f7a588df15a91f44dfc18ada19b21faa71de4637c7d493a8628cbecd0e547d74e616a23 SHA512 e124c0521ec7c950f3c4a066821918da7a9c6e711115d98009ae7c351928fdddead852e7596fea5937a9c30e4e4ce8eee7099b20248b5d6e3b2494b6a6d88cb8
@@ -45,6 +49,7 @@ DIST lazycell-1.3.0.crate 12502 BLAKE2B dca2d3f46823a52dcf87b7d6103fc4f1f83bc524
 DIST libc-0.2.81.crate 513105 BLAKE2B 789a79faf2d5079f5c4248446fa7c07b11af647bbcc32521e7989928788bea7dc2f65204f396b4fe0c7b3a6cf5248882d7775b97c028a3af1ba35e8ecdb489f8 SHA512 8e121e0dcbd8218e02c2c6536ef6398cd002a92406d433c39bf84576e9b881c5b8a66fee826da6a6189f44b825f3a9d959075eeb0501d7f604bf9cc1a8b8d437
 DIST libgit2-sys-0.12.18+1.1.0.crate 1434936 BLAKE2B f283177caa941757388042ca4578394e160ea8e5776f6b4d842f778218286ccf65ce2febbfc780606d7624660224b11a470849b4d61302dbc11b3ba5e8d1b49f SHA512 3d9be57074e15bb0dbed151804d401d4688a77f1d46eee171e39b00815a983c103b614509ea0bcbe3c1355fc6c47738fe9da7ef6b8ee2d040fc30062db701233
 DIST libgit2-sys-0.12.19+1.1.0.crate 1434327 BLAKE2B 3e21b7848bed79222b3b7b23a3acc356649e356c9316c02f2c621b501899587f292ca5e20cbc78f21d34ea896bb04bb451ff0ee74020ed32d7d26b904be628c1 SHA512 c12c16ea06c409b6b9b837050192de8b8fded5d5be3eba1ce51789d0d3fb2dea5ca081d4a7079f3d20a2a3363e9ff9740598d267d3b6090f3b73c7df076f9eef
+DIST libgit2-sys-0.12.21+1.1.0.crate 1443245 BLAKE2B 794ff535a97d051cd12993f135e61e391e1d8406f8346dc9d1417a1ba433c0e1400f17d7e5bd90674110a3502ba7a38fffac8da008ee350a47061846ed2764f7 SHA512 fd6acaaec704fb2d159cbaf0bd1b81c7afe4d22aecd836b174001b017ed8421507739fd99da968cfb1d46db16a64fe6568f53e872aa5f9a9dd7fb2cb51b02d74
 DIST libz-sys-1.1.2.crate 1339299 BLAKE2B c055fdcdeaff5d44cc95f6cef190094317644e4881f356e46b0c0347221ffb867afcd29ecd4d995bf397f714b705ce84cf34ab87010770e00b3aed1956fa46a0 SHA512 2342c738230ac570c61b466920e2ceafc0194381643540f094f6541917639a4f5b11d46d575bb03c7623ce109d376bafc3076a9d172233313e38cb6f49ed16db
 DIST line-wrap-0.1.1.crate 10010 BLAKE2B 8f64561931efdb39ef256b90ad12573df76449afadc11f38b5431c1fff73da3ef1dcf9ad8ba0c30cd1ef1b0a8d894a7b34327e4a5eccfea08051ae5abedb483e SHA512 31976e14355317bab470e6716542d3cfd59083a1808bb199dc2eddd51d05fab122ab054783d0996c1feb53bdb316e6fa24b34cae9ed8e8cdb2702bc43fd805eb
 DIST linked-hash-map-0.5.3.crate 16130 BLAKE2B 20ca73044271533d2da6bb6ca863a192b61231760fddb82ac373a34fe63d92efe5b841fa401b9aa509cc1e05b86cf672eae3f26ab5c07c7b0c25e764e128344e SHA512 90ec22fcd830ccfdefd1f7c480c5cebd5e95c822e0c28fff9ccf00bfbdda080c17a722697fdc991ee04a4a32e974309440a91284bc13c9ee70284e4e247d33b1
@@ -96,6 +101,7 @@ DIST vcpkg-0.2.11.crate 12600 BLAKE2B 1c44c8df531a75f686c0497e70a72aa0c1b554c02e
 DIST vec_map-0.8.2.crate 14466 BLAKE2B 8f109fbff19604b82ea2aa61c952e2ce9b5597ccc8e1ef4e847648e2de08dece8c4debe92889edeccb8d393645fd0b62436b49d236ded7ad181c4a51239a9539 SHA512 4f1ef59bc2c437e79f1f84fe021bce5aa8ccd581f500f3d5776913d5f17d45b03ccee64f5bd03d47656318cfc9344a1f4311079d471fa409a8e4e94c143973f9
 DIST version_check-0.9.2.crate 11979 BLAKE2B 6568f8d4652fb470162bb2251be2260a6bf83e107a4f957ed91117938d5da48c42bedfb5e6622bcd6c37950805666b78984577bd8dae687dbb39e452078bd97c SHA512 b88a9d545ef103fe6d0eebe7ddcf328fc21fcb02c60828b347cfc35afd957669e652a94d880ef992450c167df3505838bc649e0d83896542fa13a149875acf26
 DIST vte-0.10.0.crate 24923 BLAKE2B f5a19e93ccf3eb29cd3cec5964309247cc7de951f92d6ef255e429fa05cd82ffc312c094cf9c6d17c9cbdf125f195bb6706d2b0fccf145b970abce2c2154a8c4 SHA512 39cc8addb09a1f3e50c7548a1be00f020e972f6f9aea3f7a091f3ab645948b7b1c96aec5332cb4f0c9bdb20fec0ae2ca2e82c63bba7680aaeed468a48097254f
+DIST vte-0.10.1.crate 24947 BLAKE2B c7e94b7bba2423d14e5aa85f94dba856a6c984261551f204f029c55ef923c0012b259e5b229974b54b4eb5da1e85bae3c8cdb680372b5f9dc6caf51d1075b0ba SHA512 0c8fed2cfca5ad07d2a146e1e26979d390347a409cdc2b960246fc2fadd85019b9febf2dfd618f7a144493084b55f285c58ef5204e613bd9013af26faa9f2033
 DIST vte_generate_state_changes-0.1.1.crate 2422 BLAKE2B 6e8fb4ce0ca0fd6b9a4dcccdfb02445babbc13d47de5fae9bbb81e8c67ada8a40e8dc5e57c120c36876293b111ccc71e1069ea3fdabade6f9ba5ea2d44ff4632 SHA512 ba09352e037cbd279cbf5641c9783a24f76e54f1f09e13f0ab1ca99c9646c1e3c958e8e302d7cc88431073bad2e2d5619410f2f93f96f1db25f0f0ded0236f7e
 DIST walkdir-2.3.1.crate 23413 BLAKE2B fc9601f4a28cec383297dbd87d422e56db1e989e4273900750f05d1f4a92e114a5b1a5a54368e290c5f4b47159ed51f52d85ce66f003cd2f52ffc737ead20f8b SHA512 ba807ff0d098aabdcd37e23204632beea1dbb7a6adfd16cb1009cae9e7b6957cfeab705cc454bf8f2b62a08743214ab995e43bf46fc510012c938f9e2a434951
 DIST wasi-0.9.0+wasi-snapshot-preview1.crate 31521 BLAKE2B 716bdd2ec46d0bc9911c5e5e29fc783840559931b2563d8619675fc11da9527ddbe653a0f1ce0b782ee0c5f7a3131aba2b0867d415f003aa9c2389357569e7dc SHA512 dbe641f796ee3a5daafcaafc911ecc6dff170340f477c2df7a61fb4858a85aefc2637c9e61973ecce66a987aa8e08a736273a4aad3ef47eaf61ed4268dbf9c47
@@ -108,4 +114,5 @@ DIST xml-rs-0.8.3.crate 52547 BLAKE2B cffdece0269b9c04c763481af3a3a25df53d759355
 DIST yaml-rust-0.4.5.crate 47783 BLAKE2B 3e888c5cc7afb43eaf3aaab2b6f47b86df164a66eb54d4e166b965cc84b1e06cd17bd992a0d6ee175d9a73a76e2b44a13167246383ed054afcf3cc1710b309cb SHA512 7621dc8dfd5e7d4a7a8805b2a7e8319b63b852367655f2359d4e3e8fec6c4fad52d75c46ce1161e4c674eac0780b757ce9d34e664e304d8d2beec7afa0363ea0
 EBUILD git-delta-0.7.1.ebuild 2847 BLAKE2B 1e62f229f558f87e230a77b58b40cca91f6e2419ec4f916fe1ac8d423062248208faa77650228771ff764668220dc0fa1906ca7f9801414dbaaf3cfa7b20e1c8 SHA512 0279c92aaa7590eb53eaf91bc12f0064261724e8090ffed92d0749113f1cd7e5bc432e1cbe576ed511ab76e4e6a80715d71f2b48e0c2759885d542c2ccdcd8b2
 EBUILD git-delta-0.8.0.ebuild 2863 BLAKE2B aa01f21af771b696f86dc7387453fecafa061faa33005eda2a7cdacdadd525ed9b4f9e309b2b75abc47d2feba2729aed9fbb291b52372b1e1d1d2b14bc541c01 SHA512 e9ab38e77392de16336684770336e14254523815effb03ab37c9704a8b1171271c037a99c41abd28d2a72b2de3962bdbaf3b1559a44c909f6751a5c2b3c2f670
+EBUILD git-delta-0.8.1.ebuild 2863 BLAKE2B 6b1011e7dcce81a979b4b41a0306528678a1b78230e0ac048787cca10b5fb108a767a8401e1562433b596dd04444f584d09f721ab3fc5879b0c38e638196bf20 SHA512 ec9dc3cef6c9453b304e72ec63af0cc3eee92b27dbc784a098e86303e03cc8d19c30fc7cccc8e9ef37eb1c43deebd8b5081a6cf92ed028b16563c4357a94bb4e
 MISC metadata.xml 330 BLAKE2B f09602a10d43f553a7dc36968f26f5f4a79d12aab213ea51b1b2e76eb2f5ba8b698147a9ab3db7b088ca42008045f1dd1a5447fe5d7d2ce46a61d1438c202185 SHA512 ca570caf0648315637beede9dfd9c124b7b313448f2929a86262b7fec90280bdf105b22ca112f7ddb2fe16ee4c6f242e7524041c14a692aa9155ad4ae432207b
diff --git a/dev-util/git-delta/git-delta-0.8.1.ebuild b/dev-util/git-delta/git-delta-0.8.1.ebuild
new file mode 100644
index 000000000000..972eb2155e5a
--- /dev/null
+++ b/dev-util/git-delta/git-delta-0.8.1.ebuild
@@ -0,0 +1,154 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+CRATES="
+adler-0.2.3
+aho-corasick-0.7.15
+ansi_colours-1.0.3
+ansi_term-0.11.0
+ansi_term-0.12.1
+arrayvec-0.5.2
+atty-0.2.14
+autocfg-1.0.1
+base64-0.13.0
+bincode-1.3.1
+bitflags-1.2.1
+box_drawing-0.1.2
+bytelines-2.2.2
+byteorder-1.3.4
+cc-1.0.66
+cfg-if-0.1.10
+cfg-if-1.0.0
+chrono-0.4.19
+clap-2.33.3
+console-0.14.1
+crc32fast-1.2.1
+dirs-next-2.0.0
+dirs-sys-next-0.1.1
+either-1.6.1
+encode_unicode-0.3.6
+error-chain-0.12.4
+flate2-1.0.19
+fnv-1.0.7
+form_urlencoded-1.0.0
+getrandom-0.1.16
+git2-0.13.20
+hashbrown-0.8.2
+heck-0.3.2
+hermit-abi-0.1.17
+idna-0.2.0
+indexmap-1.5.2
+itertools-0.10.1
+itoa-0.4.7
+jobserver-0.1.21
+lazycell-1.3.0
+lazy_static-1.4.0
+libc-0.2.81
+libgit2-sys-0.12.21+1.1.0
+libz-sys-1.1.2
+line-wrap-0.1.1
+linked-hash-map-0.5.3
+log-0.4.11
+matches-0.1.8
+memchr-2.3.4
+miniz_oxide-0.4.3
+num-integer-0.1.44
+num-traits-0.2.14
+onig-6.1.1
+onig_sys-69.6.0
+pathdiff-0.2.0
+percent-encoding-2.1.0
+pkg-config-0.3.19
+plist-1.0.1
+proc-macro2-1.0.24
+proc-macro-error-1.0.4
+proc-macro-error-attr-1.0.4
+quote-1.0.8
+redox_syscall-0.1.57
+redox_users-0.3.5
+regex-1.4.6
+regex-syntax-0.6.22
+ryu-1.0.5
+safemem-0.3.3
+same-file-1.0.6
+serde-1.0.118
+serde_derive-1.0.118
+serde_json-1.0.61
+shell-words-1.0.0
+strsim-0.8.0
+structopt-0.3.21
+structopt-derive-0.4.14
+syn-1.0.57
+syntect-4.5.0
+terminal_size-0.1.15
+textwrap-0.11.0
+tinyvec-1.1.0
+tinyvec_macros-0.1.0
+unicode-bidi-0.3.4
+unicode-normalization-0.1.16
+unicode-segmentation-1.7.1
+unicode-width-0.1.8
+unicode-xid-0.2.1
+url-2.2.0
+utf8parse-0.2.0
+vcpkg-0.2.11
+vec_map-0.8.2
+version_check-0.9.2
+vte-0.10.1
+vte_generate_state_changes-0.1.1
+walkdir-2.3.1
+wasi-0.9.0+wasi-snapshot-preview1
+winapi-0.3.9
+winapi-i686-pc-windows-gnu-0.4.0
+winapi-util-0.1.5
+winapi-x86_64-pc-windows-gnu-0.4.0
+xdg-2.2.0
+xml-rs-0.8.3
+yaml-rust-0.4.5
+"
+
+inherit bash-completion-r1 cargo
+
+DESCRIPTION="A syntax-highlighting pager for git"
+HOMEPAGE="https://github.com/dandavison/delta"
+SRC_URI="https://github.com/dandavison/delta/archive/${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI+=" $(cargo_crate_uris ${CRATES})"
+S="${WORKDIR}/${P/git-/}"
+
+LICENSE="Apache-2.0 BSD-2 Boost-1.0 CC0-1.0 ISC LGPL-3+ MIT Unlicense ZLIB"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64"
+
+BDEPEND="virtual/pkgconfig"
+DEPEND="
+	dev-libs/libgit2:=
+	dev-libs/oniguruma:=
+"
+RDEPEND="
+	${DEPEND}
+	!app-text/delta
+"
+
+QA_FLAGS_IGNORED="/usr/bin/delta"
+
+src_configure() {
+	# Some crates will auto-build and statically link C libraries(!)
+	# Tracker bug #709568
+	export RUSTONIG_SYSTEM_LIBONIG=1
+	export LIBGIT2_SYS_USE_PKG_CONFIG=1
+	export PKG_CONFIG_ALLOW_CROSS=1
+}
+
+src_install() {
+	cargo_src_install
+
+	# No man page (yet?)
+
+	# Completions
+	newbashcomp "${S}/etc/completion/completion.bash" delta
+
+	insinto /usr/share/zsh/site-functions
+	newins "${S}/etc/completion/completion.zsh" _delta
+}
diff --git a/dev-util/hermes/Manifest b/dev-util/hermes/Manifest
index b41a53f2b43e..f8297387539c 100644
--- a/dev-util/hermes/Manifest
+++ b/dev-util/hermes/Manifest
@@ -1,6 +1,6 @@
 AUX 99hermes 23 BLAKE2B e0c6e227ba65cc9a4d13c0b1207c4afb1b268c7c82c34eb823912c3f065988d8282bbebe42312770517940e557b0c93610dc632597193a5d9fd78dfb9d1f066d SHA512 9ac639746a3f37910c63a305daabd1c338976e3d4232b2d769e73f869727a09b3cb48e3a1f428f55751c870529403c2ea5dd4ece9676f07f16d9e40d3d9950c5
 AUX hermes-2.8-lua-shebang.patch 531 BLAKE2B ff3f44fa1793d5506302c9266c7d0fe7126a0ece9ec364d9a2bd6861ac018bdf5ef4182c9723307f208c1c96523c9d5b9af63055f927a77787df4ded504edcc3 SHA512 9713eb09c50212e8f8c5abca911e5f13891941be4d348267f33159bd0aa5517e39b760d1ade8855751849605e67580df4de69c990c17a3eec3c45a08501e47ae
 DIST hermes-2.8_p20180315.tar.gz 60771 BLAKE2B e523f1ee01e1ed3da5daa68f5b9f9d146f0764b5d5f75e9dbb71a3b4630ce06ef538745b01f0bcc30e0f2899adf1b1427022be07321c0dbe7859e0c6db82af33 SHA512 838fe1049f8f42113f5d394791499b47af4748d5fb6beccab8e3ce71398a85562340e95c0f96039fa58e6e8de3e79f3c7e87af2f7c47dc087b729cee557dac4a
-EBUILD hermes-2.8_p20180315.ebuild 1153 BLAKE2B 0b9a006568f5420888885bd087c77d8afefc0f65e211f12ed222c935d48dd3085bc8894f456e7314221f2f56e988c8c532ae3e923b12c217ba856c13f4093573 SHA512 885f1fd6529a18f62fd32a2220e234d415f901f9ce1b983899b7b9c29f73077c0f4e36fdb7a1ef6a3e01753e7d50262dba7a437a4f37658305dbd9c9fc51ff4c
+EBUILD hermes-2.8_p20180315.ebuild 1160 BLAKE2B 5bb54390192c9d67742bd69d7be9535e32ccff99a16ee29b2cee4646a582b92858f4c320a0a9491a27c079d545c4a46387ddde8537b1c4f50be4e8d0e1a3a1a3 SHA512 3c1b3890791b1b7af72e79040a7c8a69c0e18dead5add5242bed16b526eeac724b749553481e6730b04371928df26dba36c213d12f8710e46fd7d4720d3a0e64
 EBUILD hermes-9999.ebuild 1125 BLAKE2B beeceb45063a4ce7d569c1312846cfd7c23174fc2787a30ebad342389c87295a7183b5c3ae12b923b118d4c07bd3c961a9e438d39888b84dd3e75a9a0536c0c6 SHA512 3765a15b66af61531125c6fd85e21e3086eb134cc919c17ce49ac870a0d720806624fe34e47b6e254b0d643f774827024a2a26c2be596f69bfa7ecda492170a9
 MISC metadata.xml 370 BLAKE2B 758ce0d00e5bf3bff6078c8456cfc9e7fbee1d6d16c66596cae76a4e5e25ab7ca2ae31c7913f8755cf5b6f0f28b938ab662ee0d1dcb679d4f1b0d67cff18049d SHA512 83028f7048a0f199f412cd4e20ebf3a01d38facab41346bbee98c63c47b75dbeb0d4b93af8ae2dff8d56cb98044752cfd7177b107869925f56f229a9b449f9e5
diff --git a/dev-util/hermes/hermes-2.8_p20180315.ebuild b/dev-util/hermes/hermes-2.8_p20180315.ebuild
index 83f5d91914d5..edf0e4e3916b 100644
--- a/dev-util/hermes/hermes-2.8_p20180315.ebuild
+++ b/dev-util/hermes/hermes-2.8_p20180315.ebuild
@@ -15,7 +15,7 @@ else
 	COMMIT="b99622087233178368cff6cf38ec72fa01dfd8a6"
 	SRC_URI="https://github.com/TACC/Hermes/archive/${COMMIT}.tar.gz -> ${P}.tar.gz"
 	S="${WORKDIR}"/Hermes-${COMMIT}
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~sparc ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
 fi
 
 LICENSE="MIT"
diff --git a/dev-util/nvidia-cuda-toolkit/Manifest b/dev-util/nvidia-cuda-toolkit/Manifest
index 8b99b484d88d..e35fffcf588f 100644
--- a/dev-util/nvidia-cuda-toolkit/Manifest
+++ b/dev-util/nvidia-cuda-toolkit/Manifest
@@ -5,11 +5,13 @@ DIST cuda_11.1.1_455.32.00_linux.run 3532172082 BLAKE2B f4af6bd87c419c002b4913ea
 DIST cuda_11.2.0_460.27.04_linux.run 3046790184 BLAKE2B 5330bc2e12ff131eb993610c95b22e6358b11d6a7a952625a4e88ed856769256c02e165ac7bf6cc43236052c8427cee17bf1e7346995dc2eba84d93c5d444eb3 SHA512 0aa7390490b93be7f359327a8fe364a44b538e742c7ccd560e9bbb40ed8613539c37fcb4aa71a2fbfa0bfdb0416ab43bbdcc09cd0c81db3f1a07b37318d6b2b3
 DIST cuda_11.2.2_460.32.03_linux.run 3057439068 BLAKE2B c3f3cd9eaaa4f91eb8080e7cafe1280f9bbc9cfc71ce1a6115af1dd348b83d30eed945609bf87e00d4873bede1fa9136fc4a7f393fd31db4e6406dc76086bc22 SHA512 e28d7d2eabd96df9e18f8e55f61adda39b07c2223605f77a6c2d92a02f7b57e9ce8b83d4b4de1124faa5670509d204d3db70c03b18af5cc5964b6ed6653d6a22
 DIST cuda_11.3.0_465.19.01_linux.run 3029622552 BLAKE2B ca64af09dc68b085a589b5756e3bfce72550e262b778aad06eb1f5b77d9cb30447fb8b57f5f6c3d210b49cd300e0db153c5eec1d51384b6889855a076ee62d07 SHA512 3120455e9513f62f82108539c5a4ccb4e9aa64beb66f816644e559bb8b573ff582c865c6a346ca39c6afb775c0c5fd567f5d31f0a0c5b927d6be849cd2905749
+DIST cuda_11.3.1_465.19.01_linux.run 3158494112 BLAKE2B 0316c6a9bf062f2503c94604b51dea9a8d19c516e304e43ccdbc79f305a242664b7f029f7b7086edd7adc37d92a3bae074f005b3be412e1361917794cb824686 SHA512 e2db8b4dcb5f6aee2c3e8a8a6848186cdcdd7cd9d5f4bfd069bd3dc2ea500797c66a4592f0e28dcbee6c3611d1f88b6fda6afcd734aa9ef45f4aa17a1527aedb
 DIST cuda_9.2.88_396.26_linux.run 1758421686 BLAKE2B 5068b2dfae87e43c124a6a72ac98b7c562aebc7161e7c977cfba68342127e99705228be531aa5bb8af0318e17c4ef8fe36257452d0f507fc3b82e3fbd0184bdc SHA512 2d0d87926e11a1b21d6d3377138753df458a53ba9539d8399f9f252e0784cb41e2c63a5c724ca81ded82b9657b97fda51d812b467b0827e7d361aa2ad73b2dba
 EBUILD nvidia-cuda-toolkit-10.2.89-r3.ebuild 3989 BLAKE2B f965c3c19e7b52156d2daf3473fe563da7bf7b77516a7291735d37dc30f61bb3c6502a9d2807b7f33140e59eae2b8991e5c6881f3b4c6fa462e5093968b75c27 SHA512 611397a2c371a7aedb452d12e2acfa02dc06752b2558eedb12be852788c8050b77883a06c32b3eff131ac54a517a2c852500aa65deeaa0947a0e91f42b50954d
 EBUILD nvidia-cuda-toolkit-11.1.1-r2.ebuild 6302 BLAKE2B 7227d9bd6cfd0232067c035d8c98f6fe2153a53db4e9a82f3a4990ed07dea8c1de129016d29de1adf0bbfe292aafe406ae0b3d4504de2ccfba00426ba5edf049 SHA512 1242e6fe1647f83a9f8c76f58f71ce1b2f0f397fefe752fb6b978152c5d798f444c2cddd333adcd768172f44bc33a684abed176e2517351d71dd427e45b218fb
 EBUILD nvidia-cuda-toolkit-11.2.0-r3.ebuild 7301 BLAKE2B 5d52c2bffc7edba866bd76470ff0663018f22a0d276f8d1ab3022ae858ffb3c68f3746e5da830f2a6149810199f76b3ba349e3d83111b5cf2fca50d8245adbb1 SHA512 d418963abcb41ab8878cdd708bf4164d58fa4a3b54bfa7e9058a8786a5a85ae30afee2e893f1f174b5ac384b242512a294cb86f020f2b03adaca949270a11013
 EBUILD nvidia-cuda-toolkit-11.2.2.ebuild 7183 BLAKE2B 7f0680251da83372ded40804a0f59550c11fd69b2f3d97e16345c2323a8f460fe269830364b25c7894634015c7d5caad28c155a5102b03885066efda2a5b0181 SHA512 95e2644ddbf9985cd507cb3f2caf882f14a87517b62c1e5c6f1e55a3410f8144542df071a0e8851e5e716c6ffd14b67518417e7a64adff6eba35435479a31158
 EBUILD nvidia-cuda-toolkit-11.3.0-r1.ebuild 7190 BLAKE2B 74f757360a13cad90881da62e92de13a456a502d20fa967f8e45bd2dc2d20c61cfdf51b586a6e675832737a57cfb1140d269968c2912d6d2b49e15a772628c21 SHA512 78403780993009a26f84939310fe365d790d86d4fcfdf4640d452e18c9cc312a652771c61c9e83db61e1bd1c413311820fd3a02d59a4d4343d87413379c3686d
+EBUILD nvidia-cuda-toolkit-11.3.1.ebuild 7185 BLAKE2B f224322f449159d66795e97b048b124dbe89636e6f6cacb920418dd40b49425c240ad6d95a5ebe0f64bf5d8e6c5ebd059a6470872e46f64eef89dfb4ccf2eaa5 SHA512 221ec1d80ae94897ec1b207c86c555dfe859c046130dac760f2d10d535e8e038baaa99474fc9f78e08547ea18d2dae680bd4a8cbe459712ea0fa9f95faa585d8
 EBUILD nvidia-cuda-toolkit-9.2.88-r1.ebuild 3423 BLAKE2B 3b54cc972086d15b32a839afb562accb5067be1d9c9a3438455e0d1748169ff9cd6c433510054b8cfc3c0cc95d9133dc4b84d3c18acf27b0841692e61c41de6a SHA512 db45c42e5f1b6b48ea4e77c52e7519e2a3c4de82a3439b4e69414fb85f8ae2973d0158d4c04dbbd4b803bcff026bb80fcd367a9005c6644609ae7cc09eaa26a5
 MISC metadata.xml 724 BLAKE2B fd9e30ae430f56599bab7004b9cd46a79bd9b94e75b0a4574ae393d8979b5e40862bf30d110d5d47186d74e629f035f854cea720d8393709d95a9c14b1185a26 SHA512 3a77849ec1bf2e61da35ffd76c20464b5de745c73abd14ffcb7e7d3b2f52e7d114c7d4630292ea219a23e327f1b6a0a8ec488a8cbdaf763a73554f17f50c2f7f
diff --git a/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-11.3.1.ebuild b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-11.3.1.ebuild
new file mode 100644
index 000000000000..60cb5fa59a90
--- /dev/null
+++ b/dev-util/nvidia-cuda-toolkit/nvidia-cuda-toolkit-11.3.1.ebuild
@@ -0,0 +1,253 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit check-reqs cuda toolchain-funcs unpacker
+
+DRIVER_PV="465.19.01"
+
+DESCRIPTION="NVIDIA CUDA Toolkit (compiler and friends)"
+HOMEPAGE="https://developer.nvidia.com/cuda-zone"
+SRC_URI="https://developer.download.nvidia.com/compute/cuda/${PV}/local_installers/cuda_${PV}_${DRIVER_PV}_linux.run"
+S="${WORKDIR}"
+
+LICENSE="NVIDIA-CUDA"
+SLOT="0/${PV}"
+KEYWORDS="-* ~amd64 ~amd64-linux"
+IUSE="debugger nsight profiler vis-profiler sanitizer"
+RESTRICT="bindist mirror"
+
+BDEPEND=""
+RDEPEND="
+	<sys-devel/gcc-11_pre[cxx]
+	>=x11-drivers/nvidia-drivers-${DRIVER_PV}
+	debugger? (
+		dev-libs/openssl
+		sys-libs/libtermcap-compat
+		sys-libs/ncurses-compat:5[tinfo]
+	)
+	vis-profiler? (
+		dev-libs/openssl
+		>=virtual/jre-1.8:*
+	)"
+
+QA_PREBUILT="opt/cuda/*"
+CHECKREQS_DISK_BUILD="6800M"
+
+pkg_setup() {
+	# We don't like to run cuda_pkg_setup as it depends on us
+	check-reqs_pkg_setup
+}
+
+src_prepare() {
+	# ATTENTION: change requires revbump
+	local cuda_supported_gcc="8.5 9.3 9.4 10.2 10.3"
+
+	sed \
+		-e "s:CUDA_SUPPORTED_GCC:${cuda_supported_gcc}:g" \
+		"${FILESDIR}"/cuda-config.in > "${T}"/cuda-config || die
+
+	default
+}
+
+src_install() {
+	local cudadir=/opt/cuda
+	local ecudadir="${EPREFIX}${cudadir}"
+	local pathextradirs ldpathextradirs
+	dodir ${cudadir}
+	into ${cudadir}
+
+	# Install standard sub packages
+	local builddirs=(
+		builds/cuda_{cudart,cuobjdump,memcheck,nvcc,nvdisasm,nvml_dev,nvprune,nvrtc,nvtx,thrust}
+		builds/lib{cublas,cufft,curand,cusolver,cusparse,npp,nvjpeg}
+		$(usex profiler "builds/cuda_nvprof builds/cuda_cupti" "")
+		$(usex vis-profiler "builds/cuda_nvvp" "")
+		$(usex debugger "builds/cuda_gdb" "")
+	)
+
+	local d f
+	for d in "${builddirs[@]}"; do
+		ebegin "Installing ${d}"
+		[[ -d ${d} ]] || die "Directory does not exist: ${d}"
+
+		if [[ -d ${d}/bin ]]; then
+			for f in ${d}/bin/*; do
+				if [[ -f ${f} ]]; then
+					dobin "${f}"
+				else
+					insinto ${cudadir}/bin
+					doins -r "${f}"
+				fi
+			done
+		fi
+
+		insinto ${cudadir}
+		if [[ -d ${d}/targets ]]; then
+			doins -r "${d}"/targets
+		fi
+		if [[ -d ${d}/share ]]; then
+			doins -r "${d}"/share
+		fi
+		if [[ -d ${d}/extras ]]; then
+			doins -r "${d}"/extras
+		fi
+		eend
+	done
+	dobin "${T}"/cuda-config
+
+	doins builds/EULA.txt
+	# nvml and nvvm need special handling
+	ebegin "Installing nvvm"
+	doins -r builds/cuda_nvcc/nvvm
+	fperms +x ${cudadir}/nvvm/bin/cicc
+	eend
+
+	ebegin "Installing nvml"
+	doins -r builds/cuda_nvml_dev/nvml
+	eend
+
+	if use sanitizer; then
+		ebegin "Installing sanitizer"
+		dobin builds/integration/Sanitizer/compute-sanitizer
+		doins -r builds/cuda_sanitizer_api/compute-sanitizer
+		# special handling for the executable
+		fperms +x ${cudadir}/compute-sanitizer/compute-sanitizer
+		eend
+	fi
+
+	use profiler && ldpathextradirs+=":${ecudadir}/extras/CUPTI/lib64"
+
+	if use vis-profiler; then
+		ebegin "Installing libnvvp"
+		doins -r builds/cuda_nvvp/libnvvp
+		# special handling for the executable
+		fperms +x ${cudadir}/libnvvp/nvvp
+		eend
+		pathextradirs+=":${ecudadir}/libnvvp"
+	fi
+
+	if use nsight; then
+		local ncu_dir=$(grep -o 'nsight-compute-[0-9][0-9\.]*' -m1 manifests/cuda_x86_64.xml)
+		ebegin "Installing ${ncu_dir}"
+		mv builds/nsight_compute builds/${ncu_dir} || die
+		doins -r builds/${ncu_dir}
+
+		# check this list on every bump
+		local exes=(
+			${ncu_dir}/host/linux-desktop-glibc_2_11_3-x64/libexec/QtWebEngineProcess
+			${ncu_dir}/host/linux-desktop-glibc_2_11_3-x64/CrashReporter
+			${ncu_dir}/host/linux-desktop-glibc_2_11_3-x64/ncu-ui
+			${ncu_dir}/host/linux-desktop-glibc_2_11_3-x64/ncu-ui.bin
+			${ncu_dir}/target/linux-desktop-glibc_2_11_3-x64/TreeLauncherTargetLdPreloadHelper
+			${ncu_dir}/target/linux-desktop-glibc_2_11_3-x64/TreeLauncherSubreaper
+			${ncu_dir}/target/linux-desktop-glibc_2_11_3-x64/ncu
+		)
+
+		dobin builds/integration/nsight-compute/{ncu,ncu-ui,nv-nsight-cu,nv-nsight-cu-cli}
+		eend
+
+		local nsys_dir=$(grep -o 'nsight-systems-[0-9][0-9\.]*' -m1 manifests/cuda_x86_64.xml)
+		ebegin "Installing ${nsys_dir}"
+		mv builds/nsight_systems builds/${nsys_dir} || die
+		doins -r builds/${nsys_dir}
+
+		# check this list on every bump
+		exes+=(
+			${nsys_dir}/host-linux-x64/nsys-ui
+			${nsys_dir}/host-linux-x64/nsys-ui.bin
+			${nsys_dir}/host-linux-x64/ResolveSymbols
+			${nsys_dir}/host-linux-x64/ImportNvtxt
+			${nsys_dir}/host-linux-x64/CrashReporter
+			${nsys_dir}/host-linux-x64/QdstrmImporter
+			${nsys_dir}/host-linux-x64/libexec/QtWebEngineProcess
+			${nsys_dir}/target-linux-x64/nsys
+			${nsys_dir}/target-linux-x64/launcher
+			${nsys_dir}/target-linux-x64/nvgpucs
+			${nsys_dir}/target-linux-x64/nsys-launcher
+			${nsys_dir}/target-linux-x64/sqlite3
+			${nsys_dir}/target-linux-x64/python/bin/python
+		)
+
+		dobin builds/integration/nsight-systems/{nsight-sys,nsys,nsys-exporter,nsys-ui}
+		eend
+
+		# nsight scripts and binaries need to have their executable bit set, #691284
+		for f in "${exes[@]}"; do
+			fperms +x ${cudadir}/${f}
+		done
+
+		# remove foreign archs (triggers SONAME warning, #749903)
+		rm -r "${ED}"/${cudadir}/${ncu_dir}/target/linux-desktop-glibc_2_19_0-ppc64le || die
+		rm -r "${ED}"/${cudadir}/${ncu_dir}/target/linux-desktop-t210-a64 || die
+		rm -r "${ED}"/${cudadir}/${nsys_dir}/target-linux-armv8 || die
+
+		# TODO: unbundle qt5
+		# TODO: unbundle boost
+		# TODO: unbundle icu
+		# TODO: unbundle openssl
+		# TODO: unbundle mesa
+		# TODO: unbundle libz
+		# TODO: unbundle libstdc++
+		# TODO: unbundle libSshClient
+		# TODO: unbundle sqlite
+		# TODO: unbundle libpfm ?
+	fi
+
+	# Add include and lib symlinks
+	dosym targets/x86_64-linux/include ${cudadir}/include
+	dosym targets/x86_64-linux/lib ${cudadir}/lib64
+
+	newenvd - 99cuda <<-EOF
+		PATH=${ecudadir}/bin${pathextradirs}
+		ROOTPATH=${ecudadir}/bin
+		LDPATH=${ecudadir}/lib64:${ecudadir}/nvvm/lib64${ldpathextradirs}
+	EOF
+
+	# Cuda prepackages libraries, don't revdep-build on them
+	insinto /etc/revdep-rebuild
+	newins - 80${PN} <<-EOF
+		SEARCH_DIRS_MASK="${ecudadir}"
+	EOF
+	# TODO: Add pkgconfig files for installed libraries
+}
+
+pkg_postinst_check() {
+	local a="$(${EROOT}/opt/cuda/bin/cuda-config -s)"
+	local b="0.0"
+	local v
+	for v in ${a}; do
+		ver_test "${v}" -gt "${b}" && b="${v}"
+	done
+
+	# if gcc and if not gcc-version is at least greatest supported
+	if tc-is-gcc && \
+		ver_test $(gcc-version) -gt "${b}"; then
+			ewarn
+			ewarn "gcc > ${b} will not work with CUDA"
+			ewarn "Make sure you set an earlier version of gcc with gcc-config"
+			ewarn "or append --compiler-bindir= pointing to a gcc bindir like"
+			ewarn "--compiler-bindir=${EPREFIX}/usr/*pc-linux-gnu/gcc-bin/gcc${b}"
+			ewarn "to the nvcc compiler flags"
+			ewarn
+	fi
+}
+
+pkg_postinst() {
+	if [[ ${MERGE_TYPE} != binary ]]; then
+		pkg_postinst_check
+	fi
+
+	if use profiler || use nsight; then
+		einfo
+		einfo "nvidia-drivers restrict access to performance counters."
+		einfo "You'll need to either run profiling tools (nvprof, nsight) "
+		einfo "using sudo (needs cap SYS_ADMIN) or add the following line to "
+		einfo "a modprobe configuration file "
+		einfo "(e.g. /etc/modprobe.d/nvidia-prof.conf): "
+		einfo
+		einfo "options nvidia NVreg_RestrictProfilingToAdminUsers=0"
+		einfo
+	fi
+}
diff --git a/dev-util/opencl-headers/Manifest b/dev-util/opencl-headers/Manifest
index 5b2d8bc0cd84..657c789abf36 100644
--- a/dev-util/opencl-headers/Manifest
+++ b/dev-util/opencl-headers/Manifest
@@ -1,3 +1,5 @@
+DIST opencl-headers-2020.06.16.tar.gz 54769 BLAKE2B 8b8bf4e1948a38e12cbaba8a5df22757136655c72059af3c1e4526db529e272198fb84d805a79b275bf8432eec6a0f102f062f203e5d43b29bb482d109d05b08 SHA512 702c64648cd5d220aaeea1fc7f8a552f3ec75d1a867e1e9db7295452b288f22c2794e7b9a9bce7f01362b1fc2466940eef45aa7e88dd0e5a4570450a79c66391
 DIST opencl-headers-2021.04.29.tar.gz 59775 BLAKE2B 9e1728ce33066430711de911f4b2713abca5a0a57b8e52cb662aabe37657c703ab39dbbd990332847ae3d9f31f4855708c17832b801f8ca6a6f12ab12b139711 SHA512 370d02044c61f2394e9a8a9772b30b996074e3b51461387a570aaf1c29488844fe9090d873b2679eb4a472135bac7a9ba5590daf9d79c006de17f709afcb74e1
+EBUILD opencl-headers-2020.06.16.ebuild 607 BLAKE2B 256e0ef32db80dc37bfa06a49135f081b11154dfe791752b2322058a32d074ede2b780bf6bc1354ad015de25812b05cbfe477c3bfd4d8aa38f20bca27fb40826 SHA512 3da5cc9e8e83a0ed1d96817990b16920e3172e52cd99621d10e2f59c98a89368f212533f1470267dbfae8e0eab94d54340ec3a5f62f9cb1586b251eb2f1d78ee
 EBUILD opencl-headers-2021.04.29.ebuild 502 BLAKE2B ed8d78b56b10d92d13591261fed0edc8257bc572b3dd42f136df1b5f6b91a03f5d26bbff8ba0015f01732228752693bfc3b5217c16d59647b073dd5c2a1f6f8f SHA512 f6a9733f71dc0dc3c20bc2fe0c9e4782f8c8a60ca6feb13a546836d5022b4221f33ecdecdb3902ccd34c147435e226758cf6b23a28c0d1bd4d86b8fadba2a426
 MISC metadata.xml 1054 BLAKE2B 30fb473e3841df882a700e175f5abef4d5ed0c198c60efdcce36622bb8a1dedf69c1b1a9f745f35b0f2be64fcf13f4c5ca2cd5503dadbf7021a74469f10438fa SHA512 85d2d58484a5def1de36b0922a796658cfcd104c2d25ca6e9916287768955b5a9dc6fce5d00f93211e9ad2b0a743abb07637a78131b6da3bcdfd880c86b7139c
diff --git a/dev-util/opencl-headers/opencl-headers-2020.06.16.ebuild b/dev-util/opencl-headers/opencl-headers-2020.06.16.ebuild
new file mode 100644
index 000000000000..b2c250d351b7
--- /dev/null
+++ b/dev-util/opencl-headers/opencl-headers-2020.06.16.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN="OpenCL-Headers"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Unified C language headers for the OpenCL API"
+HOMEPAGE="https://github.com/KhronosGroup/OpenCL-Headers"
+SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="amd64 x86"
+
+# To avoid file collisions in /usr/include/CL/
+DEPEND="!app-eselect/eselect-opencl"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${MY_P}"
+
+src_install() {
+	insinto /usr/include
+	doins -r "${S}"/CL
+}
diff --git a/dev-util/pycharm-community/Manifest b/dev-util/pycharm-community/Manifest
index 2abc94296629..616b7d080b5c 100644
--- a/dev-util/pycharm-community/Manifest
+++ b/dev-util/pycharm-community/Manifest
@@ -1,10 +1,4 @@
 AUX README.gentoo 169 BLAKE2B fc7191056cb5de1fedf9a7e9516029e8ee50f7ab3749e05c73156f63892b1e126ac068d5b2f271d1b71a77486205848cce72452d671692418b6e09e8e25da60e SHA512 a0254552b98b6ec8dadd91ed7df35bf990d08025d8352366f58ecabe94cdde2df64d8665447d0a2ffc1edacdeb05124c2a82722d5ad70b614d90bb0ae38544d2
-DIST pycharm-community-2020.1.1.tar.gz 383138867 BLAKE2B 872c658709cab76636f864caff4be4086f861347f5591cf846f6e2b57593380d796a417a684e935b5d3cc6482d80d60f04553e1c11f31fb63554df6a683512ba SHA512 91465d6754981f88a1175ba7da40eb8aed128897b732ba598caa3dbbd6b928f56857c0e80c7bc6c27bb276ffa9a5529dbdcd4508ea1b038579bc7bf359d83ab4
-DIST pycharm-community-2020.1.3.tar.gz 384015566 BLAKE2B a8f69912d7f24ce81c0f4ab579423ef45de6be3f1a0d9d72c6a1566d28c4be41917b3a586964f0b3e7cba7a658da6e5d852d89844f0fd166919f55f3f487380a SHA512 d66f3fb07f06fbaf7282c81f9a81b3106c61d1f60c9b5acf9f512dd5ec12bc772f93192aa535823c808531aea973653b0d59aa770fe898eaa406be319b8873fe
-DIST pycharm-community-2020.1.tar.gz 382333125 BLAKE2B 5fa9000bad467784f2276286639c98509481ab3aef7482f8d0d166d058b2798fb027c037762c76dfd947376320e75f05045b34f172f849198c63950fe27d9855 SHA512 7e2663ac21536f7663910d0e2561a93869f46cc7b1d06bbc448d5afbdf89c4fcb834b9e7e3f61263e5c0a3d25caf35c663a42c6219ae2d5a67cb2516eba2e8e6
-DIST pycharm-community-2020.3.tar.gz 486641961 BLAKE2B 35172e213cd90378637adecfc12ecbb758866a5359a5b6159d5201d232ff1e99a0af447163a598057d94c2d307d4d9c627f3f971b58c18c3d95cc2d9d81ef0fc SHA512 16d3508dfd89a3c4b17cdc68e35b2f44e3e18903b94c323c3e845801a8c0d7609b5f9693d7a76ad927860f8d1ec8c9537a1595391167cb5648cb97f248ffa171
-EBUILD pycharm-community-2020.1.1.ebuild 1134 BLAKE2B c065c47e6f6b8aa64534bc5bec2ba2006deec1745707cf2e54a184dc0acf0cd3fd019af49401ce662c54a345ddda2d7158f752243bebfa2a602aac55bcaafa76 SHA512 d4b35967415eae3d09b73a37a7a43a511e05d0ba91d995da81e808b0ebf719698f86a67f375721439c0029382eb9ec587979ce6b23bc976a73222c8931d785cc
-EBUILD pycharm-community-2020.1.3.ebuild 1132 BLAKE2B 44dac3daca672d4d919fa4334972ef5464194bfe5629ff79d98720205dd5625625c27c010ee4d70d7d444f97007e62b3b9ff8ea342c15ede844f6493635d0005 SHA512 ada56803f2bf6a6e84bd22571b60cf05c987794a59e13c66bcfe4531eed63cd8066f823666ab7ee1e2df74ca3afe6da6ca94965c339daff9d40e43a7cb7c2920
-EBUILD pycharm-community-2020.1.ebuild 1134 BLAKE2B c065c47e6f6b8aa64534bc5bec2ba2006deec1745707cf2e54a184dc0acf0cd3fd019af49401ce662c54a345ddda2d7158f752243bebfa2a602aac55bcaafa76 SHA512 d4b35967415eae3d09b73a37a7a43a511e05d0ba91d995da81e808b0ebf719698f86a67f375721439c0029382eb9ec587979ce6b23bc976a73222c8931d785cc
-EBUILD pycharm-community-2020.3.ebuild 1268 BLAKE2B 65d0d7373f528ad0bbb0d9536bc981300ab73699f868b2c7573f97dc942f43de69a127c7676f41c7d3f9fecbcdb2f97204cee192e19725422b47ba74254336f1 SHA512 531197d0878cc7b0af12b926e747f132a927b1c81e07214708f3b0d99f5f72674f47cb28d6c2e25d205f34763c7b9afb370f0b37b52cdf5f3db107e2fbe18a40
+DIST pycharm-community-2021.1.2.tar.gz 466806126 BLAKE2B 403cc5949ccb0e5f7d39d55b91d962889e35342715501466c007a5b3b044cbe33260de99e7d299f35a6e789c6f7e5726bc7106bc206d4e4890f8948eab7a15a2 SHA512 180d813d1162456312eb4482f414443350d784effab56cc53f2f6c2c79931f9af597849ec395089d8fc1ca2b87015722fad3cc43e03bfb4418e2c926b5af0107
+EBUILD pycharm-community-2021.1.2.ebuild 1219 BLAKE2B de6552d1e569adeb315d9c4ee969d0d4623c464c308ed2dd6b5aeb9bdfe634543c30a7876ec053cef63333d8ea3b1148f15faeb5c5552debd7e58743c9c84856 SHA512 e9e2c6e790a66dbc9d382a5f0288c32ce70f746cae1327a60247f5686f553cf1072aa4be991bc97f17534aaaca45ffb78d791b7eac7b68553c58d87e1847a10f
 MISC metadata.xml 305 BLAKE2B 0a2bb327add477e508177540871b19dcfd282f2a140dc2be97698d5a2e4b5c0999e3137e1d4175a529604a960633aee4beb374c4b196d731ded3e1b545a2b3af SHA512 d1d991fd226ee6166b0d3460a7f7192824191aa4939503cd9792cb51e9f317442fcb9a700e1e2d8f9317e3f3e1031b1ef2594749b996d4f0f36e68047a8f37e4
diff --git a/dev-util/pycharm-community/pycharm-community-2020.1.1.ebuild b/dev-util/pycharm-community/pycharm-community-2020.1.1.ebuild
deleted file mode 100644
index ae416f7ef84b..000000000000
--- a/dev-util/pycharm-community/pycharm-community-2020.1.1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit desktop gnome2-utils readme.gentoo-r1 xdg
-
-DESCRIPTION="Intelligent Python IDE with unique code assistance and analysis"
-HOMEPAGE="http://www.jetbrains.com/pycharm/"
-SRC_URI="http://download.jetbrains.com/python/${P}.tar.gz"
-
-LICENSE="Apache-2.0 BSD CDDL MIT-with-advertising"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+bundled-jdk"
-
-RDEPEND="!bundled-jdk? ( >=virtual/jre-1.8 )
-	dev-libs/libdbusmenu
-	dev-python/pip"
-
-RESTRICT="mirror strip"
-
-QA_PREBUILT="*"
-
-MY_PN=${PN/-community/}
-
-src_install() {
-	insinto /opt/${PN}
-	doins -r *
-
-	if use bundled-jdk; then
-		fperms -R a+x /opt/pycharm-community/jbr/bin/
-	else
-		rm -r "${D}"/opt/pycharm-community/jbr/ || die
-	fi
-
-	fperms a+x /opt/${PN}/bin/{pycharm.sh,fsnotifier{,64},inspect.sh}
-
-	dosym ../../opt/${PN}/bin/pycharm.sh /usr/bin/${PN}
-	newicon bin/${MY_PN}.png ${PN}.png
-	make_desktop_entry ${PN} ${PN} ${PN}
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_icon_cache_update
-}
diff --git a/dev-util/pycharm-community/pycharm-community-2020.1.3.ebuild b/dev-util/pycharm-community/pycharm-community-2020.1.3.ebuild
deleted file mode 100644
index f524f07d6ec5..000000000000
--- a/dev-util/pycharm-community/pycharm-community-2020.1.3.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit desktop gnome2-utils readme.gentoo-r1 xdg
-
-DESCRIPTION="Intelligent Python IDE with unique code assistance and analysis"
-HOMEPAGE="http://www.jetbrains.com/pycharm/"
-SRC_URI="http://download.jetbrains.com/python/${P}.tar.gz"
-
-LICENSE="Apache-2.0 BSD CDDL MIT-with-advertising"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+bundled-jdk"
-
-RDEPEND="!bundled-jdk? ( >=virtual/jre-1.8 )
-	dev-libs/libdbusmenu
-	dev-python/pip"
-
-RESTRICT="mirror strip"
-
-QA_PREBUILT="*"
-
-MY_PN=${PN/-community/}
-
-src_install() {
-	insinto /opt/${PN}
-	doins -r *
-
-	if use bundled-jdk; then
-		fperms -R a+x /opt/pycharm-community/jbr/bin/
-	else
-		rm -r "${D}"/opt/pycharm-community/jbr/ || die
-	fi
-
-	fperms a+x /opt/${PN}/bin/{pycharm.sh,fsnotifier{,64},inspect.sh}
-
-	dosym ../../opt/${PN}/bin/pycharm.sh /usr/bin/${PN}
-	newicon bin/${MY_PN}.png ${PN}.png
-	make_desktop_entry ${PN} ${PN} ${PN}
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_icon_cache_update
-}
diff --git a/dev-util/pycharm-community/pycharm-community-2020.1.ebuild b/dev-util/pycharm-community/pycharm-community-2020.1.ebuild
deleted file mode 100644
index ae416f7ef84b..000000000000
--- a/dev-util/pycharm-community/pycharm-community-2020.1.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit desktop gnome2-utils readme.gentoo-r1 xdg
-
-DESCRIPTION="Intelligent Python IDE with unique code assistance and analysis"
-HOMEPAGE="http://www.jetbrains.com/pycharm/"
-SRC_URI="http://download.jetbrains.com/python/${P}.tar.gz"
-
-LICENSE="Apache-2.0 BSD CDDL MIT-with-advertising"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+bundled-jdk"
-
-RDEPEND="!bundled-jdk? ( >=virtual/jre-1.8 )
-	dev-libs/libdbusmenu
-	dev-python/pip"
-
-RESTRICT="mirror strip"
-
-QA_PREBUILT="*"
-
-MY_PN=${PN/-community/}
-
-src_install() {
-	insinto /opt/${PN}
-	doins -r *
-
-	if use bundled-jdk; then
-		fperms -R a+x /opt/pycharm-community/jbr/bin/
-	else
-		rm -r "${D}"/opt/pycharm-community/jbr/ || die
-	fi
-
-	fperms a+x /opt/${PN}/bin/{pycharm.sh,fsnotifier{,64},inspect.sh}
-
-	dosym ../../opt/${PN}/bin/pycharm.sh /usr/bin/${PN}
-	newicon bin/${MY_PN}.png ${PN}.png
-	make_desktop_entry ${PN} ${PN} ${PN}
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_icon_cache_update
-}
diff --git a/dev-util/pycharm-community/pycharm-community-2020.3.ebuild b/dev-util/pycharm-community/pycharm-community-2020.3.ebuild
deleted file mode 100644
index e4fe870ae5c6..000000000000
--- a/dev-util/pycharm-community/pycharm-community-2020.3.ebuild
+++ /dev/null
@@ -1,60 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit desktop gnome2-utils readme.gentoo-r1 xdg
-
-DESCRIPTION="Intelligent Python IDE with unique code assistance and analysis"
-HOMEPAGE="http://www.jetbrains.com/pycharm/"
-SRC_URI="http://download.jetbrains.com/python/${P}.tar.gz"
-
-LICENSE="Apache-2.0 BSD CDDL MIT-with-advertising"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+bundled-jdk"
-
-RDEPEND="!bundled-jdk? ( >=virtual/jre-1.8 )
-	dev-libs/libdbusmenu
-	dev-python/pip"
-
-RESTRICT="mirror strip"
-
-QA_PREBUILT="*"
-
-MY_PN=${PN/-community/}
-
-src_install() {
-	insinto /opt/${PN}
-	doins -r *
-
-	if use bundled-jdk; then
-		fperms -R a+x /opt/pycharm-community/jbr/bin/
-	else
-		rm -r "${D}"/opt/pycharm-community/jbr/ || die
-	fi
-
-	local rub
-
-	for rub in aarch64 mips64el ppc64le; do
-		rm -r "${D}"/opt/pycharm-community/lib/pty4j-native/linux/${rub} || die
-	done
-
-	fperms a+x /opt/${PN}/bin/{pycharm.sh,fsnotifier{,64},inspect.sh}
-
-	dosym ../../opt/${PN}/bin/pycharm.sh /usr/bin/${PN}
-	newicon bin/${MY_PN}.png ${PN}.png
-	make_desktop_entry ${PN} ${PN} ${PN}
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_icon_cache_update
-}
diff --git a/dev-util/pycharm-community/pycharm-community-2021.1.2.ebuild b/dev-util/pycharm-community/pycharm-community-2021.1.2.ebuild
new file mode 100644
index 000000000000..6954ddae2fa5
--- /dev/null
+++ b/dev-util/pycharm-community/pycharm-community-2021.1.2.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop readme.gentoo-r1 xdg-utils
+
+DESCRIPTION="Intelligent Python IDE with unique code assistance and analysis"
+HOMEPAGE="http://www.jetbrains.com/pycharm/"
+SRC_URI="http://download.jetbrains.com/python/${P}.tar.gz"
+
+LICENSE="Apache-2.0 BSD CDDL MIT-with-advertising"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="+bundled-jdk"
+
+RDEPEND="!bundled-jdk? ( >=virtual/jre-1.8 )
+	dev-libs/libdbusmenu
+	dev-python/pip"
+
+RESTRICT="mirror strip"
+
+QA_PREBUILT="*"
+
+MY_PN=${PN/-community/}
+
+src_install() {
+	insinto /opt/${PN}
+	doins -r *
+
+	if use bundled-jdk; then
+		fperms -R a+x /opt/pycharm-community/jbr/bin/
+	else
+		rm -r "${D}"/opt/pycharm-community/jbr/ || die
+	fi
+
+	local rub
+
+	for rub in aarch64 mips64el ppc64le; do
+		rm -r "${D}"/opt/pycharm-community/lib/pty4j-native/linux/${rub} || die
+	done
+
+	fperms a+x /opt/${PN}/bin/{pycharm.sh,fsnotifier{,64},inspect.sh}
+
+	dosym ../../opt/${PN}/bin/pycharm.sh /usr/bin/${PN}
+	newicon bin/${MY_PN}.png ${PN}.png
+	make_desktop_entry ${PN} ${PN} ${PN}
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/dev-util/pycharm-professional/Manifest b/dev-util/pycharm-professional/Manifest
index febf100013e3..1b26fab1fca4 100644
--- a/dev-util/pycharm-professional/Manifest
+++ b/dev-util/pycharm-professional/Manifest
@@ -1,10 +1,4 @@
 AUX README.gentoo 169 BLAKE2B fc7191056cb5de1fedf9a7e9516029e8ee50f7ab3749e05c73156f63892b1e126ac068d5b2f271d1b71a77486205848cce72452d671692418b6e09e8e25da60e SHA512 a0254552b98b6ec8dadd91ed7df35bf990d08025d8352366f58ecabe94cdde2df64d8665447d0a2ffc1edacdeb05124c2a82722d5ad70b614d90bb0ae38544d2
-DIST pycharm-professional-2020.1.1.tar.gz 507346192 BLAKE2B eb035967475fa1baf7833cf0b4ea18a7870e9ddeb68cef1ed6eaa0690ae21cb2482a61138cfe230928aa41a65e6f78078107d44b6c98b1ace7e6de22af5db555 SHA512 222f2e7284fb77018ace14907da6fbbe58bb8411f71aef9b2875e8c375ea2754a8595bfe9b5847bcfde2f8d59d0480f8fb4acf342231933a58f0f99fafc5a48d
-DIST pycharm-professional-2020.1.3.tar.gz 508036989 BLAKE2B 13bca1d093596bfedcad3c7837ab26c21631d15b5dce9ca62798baab281a7a4736e35fcbd96acc94b8e336119398c82c23583798ad53555eb8f1eac86febf031 SHA512 57a7878d3ee817778c7e1087d97e4d7a615fdd2f987fafecf4c6bcd7e1c0e7c1cb4411283214849cbd76fa92a2b98a074045b52cf1cd306f2e2995ed3b53e0e0
-DIST pycharm-professional-2020.1.tar.gz 507643980 BLAKE2B f0869ebec8ae6396a4ff9579214a913be631d52e67cf12b437800a6f3292c96bef67b8b813bb9d703a2b6893ad27835a6868cce5ac4f3db818bacc2de4aed87c SHA512 23737bdd8bafb57dab794b4c874e6d14bb3b2591706bf13a835b0172fbe914ade932c701a313d982d7c393d02b15629a8273f3be092a92178ed0bfd4eff9baa5
-DIST pycharm-professional-2020.3.tar.gz 614570714 BLAKE2B 48ecb93a8db053b2b5983392b6270388fc1bf0ddf18e99453d04f87975ac3b8accfe14895b23db9d0b2eb199c0a64c9b137ea09142fc0cbe0d2ca6196ca2ec55 SHA512 e0c726abddbb98dc5d23043e6e5d2e41a3b813c18352ee3ad9596f0c37bdadfdefba3c74890bb9d2e9c0c8f6114841c2b52c6af2169e021256060452aacb7ec7
-EBUILD pycharm-professional-2020.1.1.ebuild 1210 BLAKE2B 1532c3051770eafeba3a2c40935c0470378bd123c711656bc6dac8b11fb0092a0514f4771fc297810152ca56cf7644355a71197e4f9afc333134921098f25eb2 SHA512 b210a6a3f0f1f00255a2f8c91a46da52b503341adf924a8b50f3b91ec5604bb03da6105460b2c4fb440f8d88ad20b4715228a6d4428285c4dd0f090d09e4a908
-EBUILD pycharm-professional-2020.1.3.ebuild 1208 BLAKE2B abd51cb81697b23c4180e4888139ac8fea4fc9700a4b8c7ba5fb2eca47b6bb5883ce1ea1d8caff7109cc54709e0377c294c62d5447fcef180e8ed916618efce8 SHA512 503b6fdff28d0110e9313c9049a1858e4fcda7671298732bc620322ea7f7a4590560eefe693048f7c3d43ed32f09e8d33c1afba61548699f9819f430114c882a
-EBUILD pycharm-professional-2020.1.ebuild 1210 BLAKE2B 1532c3051770eafeba3a2c40935c0470378bd123c711656bc6dac8b11fb0092a0514f4771fc297810152ca56cf7644355a71197e4f9afc333134921098f25eb2 SHA512 b210a6a3f0f1f00255a2f8c91a46da52b503341adf924a8b50f3b91ec5604bb03da6105460b2c4fb440f8d88ad20b4715228a6d4428285c4dd0f090d09e4a908
-EBUILD pycharm-professional-2020.3.ebuild 1347 BLAKE2B 17901fdfa5855f89ea37bece2bb7b15ca2792f8188566b4a610b5e94f72ba877808b1380d2abbf9cb5833c5acea4d42d502a7a4199e99556b05e922363e00534 SHA512 e305ef9955099ba71aaf07a72df403870d899933171c98f4dd118afc4631aec4c68d81c79f7eca84a8835abf301fbbddd112b40c9cf5d32e60b052be1f8c22c3
+DIST pycharm-professional-2021.1.2.tar.gz 580807899 BLAKE2B ba21f9ba000c34f3073b778b7314c727e5204de480afd34fd79e97aca2da673252324897d3f40bda998e8d6ad2645c173f9c0abfbaf745de2c58782faa18c29d SHA512 c76c3113c620084cb6a3a647998cde61b3a6b2e9ff05870469f3f980295d5853911521095e26fae365cd94d2f6843866ced39db5e510bef3495931c60094f49c
+EBUILD pycharm-professional-2021.1.2.ebuild 1298 BLAKE2B ad0dd142c421841b3a99df25810b0744379818a5bff06ce0a11347cad0ac5b3960c0ac9cfec8c268972e08f7a926c2578bd5035ac3fc596adafd5fe46a8b71b7 SHA512 3b3920495391375f13f48a08c70b0907a063e629f5fee01f03eec5e7cfbe0450d31747ed421ed41b8a12b9a6e12c61196379473654295c343510676e83e28d25
 MISC metadata.xml 305 BLAKE2B 0a2bb327add477e508177540871b19dcfd282f2a140dc2be97698d5a2e4b5c0999e3137e1d4175a529604a960633aee4beb374c4b196d731ded3e1b545a2b3af SHA512 d1d991fd226ee6166b0d3460a7f7192824191aa4939503cd9792cb51e9f317442fcb9a700e1e2d8f9317e3f3e1031b1ef2594749b996d4f0f36e68047a8f37e4
diff --git a/dev-util/pycharm-professional/pycharm-professional-2020.1.1.ebuild b/dev-util/pycharm-professional/pycharm-professional-2020.1.1.ebuild
deleted file mode 100644
index 03e39e824852..000000000000
--- a/dev-util/pycharm-professional/pycharm-professional-2020.1.1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit desktop gnome2-utils readme.gentoo-r1 xdg
-
-DESCRIPTION="Intelligent Python IDE with unique code assistance and analysis"
-HOMEPAGE="http://www.jetbrains.com/pycharm/"
-SRC_URI="http://download.jetbrains.com/python/${P}.tar.gz"
-
-LICENSE="PyCharm_Academic PyCharm_Classroom PyCharm PyCharm_OpenSource PyCharm_Preview"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+bundled-jdk"
-
-RDEPEND="!bundled-jdk? ( >=virtual/jre-1.8 )
-	dev-libs/libdbusmenu
-	dev-python/pip"
-
-RESTRICT="mirror strip"
-
-QA_PREBUILT="*"
-
-MY_PN=${PN/-professional/}
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_install() {
-	insinto /opt/${PN}
-	doins -r *
-
-	if use bundled-jdk; then
-		fperms -R a+x /opt/pycharm-professional/jbr/bin/
-	else
-		rm -r "${D}"/opt/pycharm-professional/jbr/ || die
-	fi
-
-	fperms a+x /opt/${PN}/bin/{pycharm.sh,fsnotifier{,64},inspect.sh}
-
-	dosym ../../opt/${PN}/bin/pycharm.sh /usr/bin/${PN}
-	newicon bin/${MY_PN}.png ${PN}.png
-	make_desktop_entry ${PN} ${PN} ${PN}
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_icon_cache_update
-}
diff --git a/dev-util/pycharm-professional/pycharm-professional-2020.1.3.ebuild b/dev-util/pycharm-professional/pycharm-professional-2020.1.3.ebuild
deleted file mode 100644
index 9eaa204428ba..000000000000
--- a/dev-util/pycharm-professional/pycharm-professional-2020.1.3.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit desktop gnome2-utils readme.gentoo-r1 xdg
-
-DESCRIPTION="Intelligent Python IDE with unique code assistance and analysis"
-HOMEPAGE="http://www.jetbrains.com/pycharm/"
-SRC_URI="http://download.jetbrains.com/python/${P}.tar.gz"
-
-LICENSE="PyCharm_Academic PyCharm_Classroom PyCharm PyCharm_OpenSource PyCharm_Preview"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+bundled-jdk"
-
-RDEPEND="!bundled-jdk? ( >=virtual/jre-1.8 )
-	dev-libs/libdbusmenu
-	dev-python/pip"
-
-RESTRICT="mirror strip"
-
-QA_PREBUILT="*"
-
-MY_PN=${PN/-professional/}
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_install() {
-	insinto /opt/${PN}
-	doins -r *
-
-	if use bundled-jdk; then
-		fperms -R a+x /opt/pycharm-professional/jbr/bin/
-	else
-		rm -r "${D}"/opt/pycharm-professional/jbr/ || die
-	fi
-
-	fperms a+x /opt/${PN}/bin/{pycharm.sh,fsnotifier{,64},inspect.sh}
-
-	dosym ../../opt/${PN}/bin/pycharm.sh /usr/bin/${PN}
-	newicon bin/${MY_PN}.png ${PN}.png
-	make_desktop_entry ${PN} ${PN} ${PN}
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_icon_cache_update
-}
diff --git a/dev-util/pycharm-professional/pycharm-professional-2020.1.ebuild b/dev-util/pycharm-professional/pycharm-professional-2020.1.ebuild
deleted file mode 100644
index 03e39e824852..000000000000
--- a/dev-util/pycharm-professional/pycharm-professional-2020.1.ebuild
+++ /dev/null
@@ -1,55 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit desktop gnome2-utils readme.gentoo-r1 xdg
-
-DESCRIPTION="Intelligent Python IDE with unique code assistance and analysis"
-HOMEPAGE="http://www.jetbrains.com/pycharm/"
-SRC_URI="http://download.jetbrains.com/python/${P}.tar.gz"
-
-LICENSE="PyCharm_Academic PyCharm_Classroom PyCharm PyCharm_OpenSource PyCharm_Preview"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+bundled-jdk"
-
-RDEPEND="!bundled-jdk? ( >=virtual/jre-1.8 )
-	dev-libs/libdbusmenu
-	dev-python/pip"
-
-RESTRICT="mirror strip"
-
-QA_PREBUILT="*"
-
-MY_PN=${PN/-professional/}
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_install() {
-	insinto /opt/${PN}
-	doins -r *
-
-	if use bundled-jdk; then
-		fperms -R a+x /opt/pycharm-professional/jbr/bin/
-	else
-		rm -r "${D}"/opt/pycharm-professional/jbr/ || die
-	fi
-
-	fperms a+x /opt/${PN}/bin/{pycharm.sh,fsnotifier{,64},inspect.sh}
-
-	dosym ../../opt/${PN}/bin/pycharm.sh /usr/bin/${PN}
-	newicon bin/${MY_PN}.png ${PN}.png
-	make_desktop_entry ${PN} ${PN} ${PN}
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_icon_cache_update
-}
diff --git a/dev-util/pycharm-professional/pycharm-professional-2020.3.ebuild b/dev-util/pycharm-professional/pycharm-professional-2020.3.ebuild
deleted file mode 100644
index 0d9e280fe197..000000000000
--- a/dev-util/pycharm-professional/pycharm-professional-2020.3.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit desktop gnome2-utils readme.gentoo-r1 xdg
-
-DESCRIPTION="Intelligent Python IDE with unique code assistance and analysis"
-HOMEPAGE="http://www.jetbrains.com/pycharm/"
-SRC_URI="http://download.jetbrains.com/python/${P}.tar.gz"
-
-LICENSE="PyCharm_Academic PyCharm_Classroom PyCharm PyCharm_OpenSource PyCharm_Preview"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="+bundled-jdk"
-
-RDEPEND="!bundled-jdk? ( >=virtual/jre-1.8 )
-	dev-libs/libdbusmenu
-	dev-python/pip"
-
-RESTRICT="mirror strip"
-
-QA_PREBUILT="*"
-
-MY_PN=${PN/-professional/}
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-src_install() {
-	insinto /opt/${PN}
-	doins -r *
-
-	if use bundled-jdk; then
-		fperms -R a+x /opt/pycharm-professional/jbr/bin/
-	else
-		rm -r "${D}"/opt/pycharm-professional/jbr/ || die
-	fi
-
-	fperms a+x /opt/${PN}/bin/{pycharm.sh,fsnotifier{,64},inspect.sh}
-
-	dosym ../../opt/${PN}/bin/pycharm.sh /usr/bin/${PN}
-	newicon bin/${MY_PN}.png ${PN}.png
-	make_desktop_entry ${PN} ${PN} ${PN}
-
-	local rub
-
-	for rub in aarch64 mips64el ppc64le; do
-		rm -r "${D}"/opt/pycharm-professional/lib/pty4j-native/linux/${rub} || die
-	done
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_pkg_postrm
-	gnome2_icon_cache_update
-}
diff --git a/dev-util/pycharm-professional/pycharm-professional-2021.1.2.ebuild b/dev-util/pycharm-professional/pycharm-professional-2021.1.2.ebuild
new file mode 100644
index 000000000000..3f340f7deba3
--- /dev/null
+++ b/dev-util/pycharm-professional/pycharm-professional-2021.1.2.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit desktop readme.gentoo-r1 xdg-utils
+
+DESCRIPTION="Intelligent Python IDE with unique code assistance and analysis"
+HOMEPAGE="http://www.jetbrains.com/pycharm/"
+SRC_URI="http://download.jetbrains.com/python/${P}.tar.gz"
+
+LICENSE="PyCharm_Academic PyCharm_Classroom PyCharm PyCharm_OpenSource PyCharm_Preview"
+SLOT="0"
+KEYWORDS="amd64 x86"
+IUSE="+bundled-jdk"
+
+RDEPEND="!bundled-jdk? ( >=virtual/jre-1.8 )
+	dev-libs/libdbusmenu
+	dev-python/pip"
+
+RESTRICT="mirror strip"
+
+QA_PREBUILT="*"
+
+MY_PN=${PN/-professional/}
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+src_install() {
+	insinto /opt/${PN}
+	doins -r *
+
+	if use bundled-jdk; then
+		fperms -R a+x /opt/pycharm-professional/jbr/bin/
+	else
+		rm -r "${D}"/opt/pycharm-professional/jbr/ || die
+	fi
+
+	fperms a+x /opt/${PN}/bin/{pycharm.sh,fsnotifier{,64},inspect.sh}
+
+	dosym ../../opt/${PN}/bin/pycharm.sh /usr/bin/${PN}
+	newicon bin/${MY_PN}.png ${PN}.png
+	make_desktop_entry ${PN} ${PN} ${PN}
+
+	local rub
+
+	for rub in aarch64 mips64el ppc64le; do
+		rm -r "${D}"/opt/pycharm-professional/lib/pty4j-native/linux/${rub} || die
+	done
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/dev-util/rocminfo/Manifest b/dev-util/rocminfo/Manifest
index c668baec3a70..ec8082a4e00d 100644
--- a/dev-util/rocminfo/Manifest
+++ b/dev-util/rocminfo/Manifest
@@ -4,11 +4,13 @@ DIST rocminfo-3.8.0.tar.gz 15103 BLAKE2B afa6a2cd3315b18f2711cf1de4701e672beac76
 DIST rocminfo-3.9.0.tar.gz 15106 BLAKE2B 0be734ee03298a83892fb237f7b171c7bb5779d153efa2f49ceadd27a32709fd7f6fe4895d43c7d55763be6a5ddf22a4ab9c6b42e4f28946b0d35d44cd897d54 SHA512 aaa2feaad1e0c8583f5211d629934c270f30c046d4e4067c142ea5ddc4fba95c6719d38cd623d1f5190962ccbbfc63196a3f4618d84e9b223bc6ee8cc5544530
 DIST rocminfo-4.0.0.tar.gz 15104 BLAKE2B 858d0856a63af88bfb8d948f729fa4108aff0bbe21270d9679d14a2b5bb3230471f498143ce67921af3271e619896ca2cb1a624029f3154e7aa127c018dc9d74 SHA512 40496919dd40cd3a551c01be6023d81a60aebefa5aebdd2aee87cdec44fde4b54b89b67c380d65e25747ae7fc4d5b592dd01d4728dde447079ee7f63396c0c1a
 DIST rocminfo-4.1.0.tar.gz 15379 BLAKE2B dcf7a663792538dbe5c02fbc9e5874d1e716f2986db0a82f49c20130b4f26e8689be9821dd2e3a7363ad1f54106280e511f157b0d9ba2f67b9bc6fd064c7fe82 SHA512 a0bca3c42f360dfee6739de30d932d6eb0b627cd5d369b437d2fac6054a007a3b958ddf6f8b318bf9cab71b051cdf66ecd123b4cce4ef071bf98e0f2bb739c37
+DIST rocminfo-4.2.0.tar.gz 15379 BLAKE2B a76dd3f0d550d5b8a8c39454ef44d5f0a76ad24e4a3b75a9fd2a1b0d4d983a02a877c0eb4d2e4158f9c8c97602b52a2de9a1f535fad609a52e8cad48c4c8a833 SHA512 801c29ae88878b9448ad2f2c9faaa7ffba3a46c77887bebf2fa8d3db7e9258fb4678cf2b898ddfc88a34fcc0fdcc91c9aa2f4a1509eeb05db6a7b085ae28f3dc
 EBUILD rocminfo-3.10.0.ebuild 614 BLAKE2B 06e1e5b14bd58c8ca3519a9b446fec7e6ce46043cbb0bfedd6bc22b9e45d3c41d03a135c742c5451aa3b23d3a811fe76dcd0d71ba29f8ea37b62b4626414c8c3 SHA512 523379bff77eee0cb15ff6fa529f724698fb4e3ea590af72555db46ae51644ecfc3c4ece36db2a3864314f66ec4bbe8fed954cccf4d1fb2afcbb8115b020a840
 EBUILD rocminfo-3.7.0.ebuild 614 BLAKE2B 06e1e5b14bd58c8ca3519a9b446fec7e6ce46043cbb0bfedd6bc22b9e45d3c41d03a135c742c5451aa3b23d3a811fe76dcd0d71ba29f8ea37b62b4626414c8c3 SHA512 523379bff77eee0cb15ff6fa529f724698fb4e3ea590af72555db46ae51644ecfc3c4ece36db2a3864314f66ec4bbe8fed954cccf4d1fb2afcbb8115b020a840
 EBUILD rocminfo-3.8.0.ebuild 614 BLAKE2B 06e1e5b14bd58c8ca3519a9b446fec7e6ce46043cbb0bfedd6bc22b9e45d3c41d03a135c742c5451aa3b23d3a811fe76dcd0d71ba29f8ea37b62b4626414c8c3 SHA512 523379bff77eee0cb15ff6fa529f724698fb4e3ea590af72555db46ae51644ecfc3c4ece36db2a3864314f66ec4bbe8fed954cccf4d1fb2afcbb8115b020a840
 EBUILD rocminfo-3.9.0.ebuild 614 BLAKE2B 06e1e5b14bd58c8ca3519a9b446fec7e6ce46043cbb0bfedd6bc22b9e45d3c41d03a135c742c5451aa3b23d3a811fe76dcd0d71ba29f8ea37b62b4626414c8c3 SHA512 523379bff77eee0cb15ff6fa529f724698fb4e3ea590af72555db46ae51644ecfc3c4ece36db2a3864314f66ec4bbe8fed954cccf4d1fb2afcbb8115b020a840
 EBUILD rocminfo-4.0.0.ebuild 614 BLAKE2B 06e1e5b14bd58c8ca3519a9b446fec7e6ce46043cbb0bfedd6bc22b9e45d3c41d03a135c742c5451aa3b23d3a811fe76dcd0d71ba29f8ea37b62b4626414c8c3 SHA512 523379bff77eee0cb15ff6fa529f724698fb4e3ea590af72555db46ae51644ecfc3c4ece36db2a3864314f66ec4bbe8fed954cccf4d1fb2afcbb8115b020a840
 EBUILD rocminfo-4.1.0.ebuild 614 BLAKE2B 93d578aeac7bbd6173fa8133c1da9240c351e0fe62f5cfc5ff10d12d68e116b3320276eb25c29180e45969594d16215d90921a4c21caa9d2d68f8f87ed9bf1f0 SHA512 0bcf6920d17952e31f090b2a0830a70cfbe737a31987024a7901d9728795b9166cac2894f6ec995e17a71f7cf33001655e8b5a4c1956413a38d0751b7c1669ac
+EBUILD rocminfo-4.2.0.ebuild 614 BLAKE2B 93d578aeac7bbd6173fa8133c1da9240c351e0fe62f5cfc5ff10d12d68e116b3320276eb25c29180e45969594d16215d90921a4c21caa9d2d68f8f87ed9bf1f0 SHA512 0bcf6920d17952e31f090b2a0830a70cfbe737a31987024a7901d9728795b9166cac2894f6ec995e17a71f7cf33001655e8b5a4c1956413a38d0751b7c1669ac
 EBUILD rocminfo-9999.ebuild 606 BLAKE2B 74046413f39f646c076f8cbc9d0a5d1373c3be8e303bd50767d6019d3b1a58a06d05ef0dbdacdcd079aeb519c28fc163c38246608024b9fc4225c99051d3b6df SHA512 20dcaa312421446d3ee1882f85babfdfd51a51dd598eae824b36d7fc8969da717f05685d436c59b61d2d1744479672a4de544667379a7fb9163c5e9637fab70c
 MISC metadata.xml 369 BLAKE2B 6549050343e744050fde68092a20018b058f5d2411b4f7dcb5ade0e7ea56e7f8f9f6a00040882f1384f01ed2f5b74a1d453c276c8d35aaa12021225f0c7c6346 SHA512 4b7e636a59c30446dfb02d82d80804706dbc04b464f7d7ce37340be1076a9723cb5ec164972dc07a325b69fefb1dc3026055fb5b87588b6b6fbaf4e9dfbc2ef9
diff --git a/dev-util/rocminfo/rocminfo-4.2.0.ebuild b/dev-util/rocminfo/rocminfo-4.2.0.ebuild
new file mode 100644
index 000000000000..a4b4217d09b1
--- /dev/null
+++ b/dev-util/rocminfo/rocminfo-4.2.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2021 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/RadeonOpenCompute/rocminfo/"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/RadeonOpenCompute/rocminfo/archive/rocm-${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+	S="${WORKDIR}/rocminfo-rocm-${PV}"
+fi
+
+DESCRIPTION="ROCm Application for Reporting System Info"
+HOMEPAGE="https://github.com/RadeonOpenCompute/rocminfo"
+LICENSE="MIT"
+SLOT="0/$(ver_cut 1-2)"
+
+RDEPEND=">=dev-libs/rocr-runtime-${PV}"
+DEPEND="${RDEPEND}"
diff --git a/dev-util/vulkan-tools/Manifest b/dev-util/vulkan-tools/Manifest
index 622777301cc4..c66c48b6c3f1 100644
--- a/dev-util/vulkan-tools/Manifest
+++ b/dev-util/vulkan-tools/Manifest
@@ -3,6 +3,6 @@ DIST vulkan-tools-1.2.170.tar.gz 835063 BLAKE2B 5b7b9c9ea07b3a25d2b989a0981417b4
 DIST vulkan-tools-1.2.179.tar.gz 843725 BLAKE2B 0304f7672b5405404dca9b9800dd0927f3af0f17580f021bc30e651ecda5b5e6194971a6a95e30cce956d094cc8fbab580f0f0ecd8fa4c81a9bc15ced5ad92ac SHA512 227b5023c21720c94fb5583f0f6635cf2b9d8067cae02dc6f22f39a106bc0b3e569b2730a1dc4fd469fe0a5e5653167fdc56fe37852a1acfc38df953b4524dcc
 EBUILD vulkan-tools-1.2.162.ebuild 1881 BLAKE2B 4c9129b5619a374830b27c7d425f2c119e1613a667c9d901101cdf0a59ae5c9c70d340e5fdf885b1b84901df01f152b03a4e687d1674d9d8ad65620fdb30a386 SHA512 ec5501ccda226135f0b33c818c6c5fe1fd33325d3bb01586775a55d6236e1d5aec3bac9c87cc309f88a648df0754bfaae310cfd92e4a818c4bd8024d3c46e3b1
 EBUILD vulkan-tools-1.2.170.ebuild 1881 BLAKE2B 4c9129b5619a374830b27c7d425f2c119e1613a667c9d901101cdf0a59ae5c9c70d340e5fdf885b1b84901df01f152b03a4e687d1674d9d8ad65620fdb30a386 SHA512 ec5501ccda226135f0b33c818c6c5fe1fd33325d3bb01586775a55d6236e1d5aec3bac9c87cc309f88a648df0754bfaae310cfd92e4a818c4bd8024d3c46e3b1
-EBUILD vulkan-tools-1.2.179.ebuild 1886 BLAKE2B 9c2492531c87da11e3a5cdb6c9fd863ae721013392c867a0ab47f21a07b872e910d13c2c0147bb364dca8c0dca0bb59a2f31cbab9d48d7861427b2d2e43e7851 SHA512 314aa393ac36a75192062eac58ea3eeb3fbaa5d67565757db67cf30a674fa49cfe16a675d413cdcd0249d03b9e559a94a06ff46610c3cd28565f1a8bd699ff5c
-EBUILD vulkan-tools-9999.ebuild 1886 BLAKE2B 2afef23e4399f9547e7fd691ec1050473993ca0decefa62e56a1d5499663bc5071aaa680d0a743a4776993997c0adc5bc92587ad24dc0cce3ffa6c325a86b35c SHA512 1769b436f7e1a8d4c4c22a7f99d1c2884db790b0f15dcdd8dc4e7cb144796654c48cfa6a75ff413653a5a2bf974c142c7a1dc0e81804fd7968e8d7a78bf5fb39
+EBUILD vulkan-tools-1.2.179.ebuild 1865 BLAKE2B d1666ff63c8fc969109848012d01ca40071995b98fda6203c5663a9cc4443d4f452272837a1c1aafc74646e95a78057971ddbeb4633f1d13158108fb297e16b3 SHA512 abe5dcc70239e8d31d31412a8beed52c8c3dfcd03889857e8ae91923f16435fc413fdda9aa5137f4b7801ab2deb0f6b94c3aea6e0f53c8cf33b32eae127bda70
+EBUILD vulkan-tools-9999.ebuild 1860 BLAKE2B 90d45eff50aecafa4f59ddfcfe22919ad54c32d75f8d1c398cc91286ce092a32bfe34c168f29355b51284226f04879f3de7b236770dc8f4e4599b0466ad22cdf SHA512 ae072450e257f0766f657be7bcad7180679eed3983858284fe649e59f9acdc2039cf6f23f146aa67c542d7576caae9b564d9f31b88fd4db034a541ce9a552b15
 MISC metadata.xml 499 BLAKE2B 9ede9725de281e0877f865e41ce68be15d5c04fd95023d3ab1180f4987c506a8f12ad23412ecf5795f6f8e6f36e576bc65f7cef786ced70296f5a4a8584ac4f1 SHA512 eb5dbcfbb58449c5a6ae7580f0c8a25c06f85fd6ac32fe1354fffe550214465921dace3c05264c11517d7dbeeffa444eb468d63f4781c6383f4be8a4202ecefd
diff --git a/dev-util/vulkan-tools/vulkan-tools-1.2.179.ebuild b/dev-util/vulkan-tools/vulkan-tools-1.2.179.ebuild
index dd3ff96da94c..fd88aef18326 100644
--- a/dev-util/vulkan-tools/vulkan-tools-1.2.179.ebuild
+++ b/dev-util/vulkan-tools/vulkan-tools-1.2.179.ebuild
@@ -5,7 +5,7 @@ EAPI=7
 
 MY_PN=Vulkan-Tools
 CMAKE_ECLASS="cmake"
-PYTHON_COMPAT=( python3_{7,8,9} )
+PYTHON_COMPAT=( python3_{8,9} )
 inherit cmake-multilib python-any-r1
 
 if [[ ${PV} == *9999* ]]; then
@@ -14,7 +14,7 @@ if [[ ${PV} == *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/KhronosGroup/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv"
 	S="${WORKDIR}"/${MY_PN}-${PV}
 fi
 
@@ -26,7 +26,7 @@ SLOT="0"
 IUSE="cube wayland +X"
 
 # Cube demo only supports one window system at a time
-REQUIRED_USE="!cube? ( || ( X wayland ) ) cube? ( ^^ ( X wayland ) )"
+REQUIRED_USE="cube? ( ^^ ( X wayland ) )"
 
 BDEPEND="${PYTHON_DEPS}
 	>=dev-util/cmake-3.10.2
@@ -65,11 +65,11 @@ multilib_src_configure() {
 		-DBUILD_WSI_WAYLAND_SUPPORT=$(usex wayland)
 		-DBUILD_WSI_XCB_SUPPORT=$(usex X)
 		-DBUILD_WSI_XLIB_SUPPORT=$(usex X)
-		-DVULKAN_HEADERS_INSTALL_DIR="${EPREFIX}/usr"
+		-DVULKAN_HEADERS_INSTALL_DIR="${ESYSROOT}/usr"
 	)
 
 	use cube && mycmakeargs+=(
-		-DGLSLANG_INSTALL_DIR="${EPREFIX}/usr"
+		-DGLSLANG_INSTALL_DIR="${ESYSROOT}/usr"
 		-DCUBE_WSI_SELECTION=$(usex X XCB WAYLAND)
 	)
 
diff --git a/dev-util/vulkan-tools/vulkan-tools-9999.ebuild b/dev-util/vulkan-tools/vulkan-tools-9999.ebuild
index e9b91a71bdd7..217cda131c45 100644
--- a/dev-util/vulkan-tools/vulkan-tools-9999.ebuild
+++ b/dev-util/vulkan-tools/vulkan-tools-9999.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
@@ -26,7 +26,7 @@ SLOT="0"
 IUSE="cube wayland +X"
 
 # Cube demo only supports one window system at a time
-REQUIRED_USE="!cube? ( || ( X wayland ) ) cube? ( ^^ ( X wayland ) )"
+REQUIRED_USE="cube? ( ^^ ( X wayland ) )"
 
 BDEPEND="${PYTHON_DEPS}
 	>=dev-util/cmake-3.10.2
@@ -65,11 +65,11 @@ multilib_src_configure() {
 		-DBUILD_WSI_WAYLAND_SUPPORT=$(usex wayland)
 		-DBUILD_WSI_XCB_SUPPORT=$(usex X)
 		-DBUILD_WSI_XLIB_SUPPORT=$(usex X)
-		-DVULKAN_HEADERS_INSTALL_DIR="${EPREFIX}/usr"
+		-DVULKAN_HEADERS_INSTALL_DIR="${ESYSROOT}/usr"
 	)
 
 	use cube && mycmakeargs+=(
-		-DGLSLANG_INSTALL_DIR="${EPREFIX}/usr"
+		-DGLSLANG_INSTALL_DIR="${ESYSROOT}/usr"
 		-DCUBE_WSI_SELECTION=$(usex X XCB WAYLAND)
 	)
 
-- 
cgit v1.2.3