11 files changed, 82 insertions, 236 deletions
diff --git a/dev-util/catalyst/catalyst-9999.ebuild b/dev-util/catalyst/catalyst-9999.ebuild
index 92a11773a637..df6fbbf129c5 100644
--- a/dev-util/catalyst/catalyst-9999.ebuild
+++ b/dev-util/catalyst/catalyst-9999.ebuild
@@ -51,6 +51,10 @@ RDEPEND="
 		amd64? (
 			sys-boot/grub[grub_platforms_efi-32,grub_platforms_efi-64]
 		)
+		arm64?  (
+			sys-boot/grub[grub_platforms_efi-64]
+			sys-fs/mtools
+		)
 		ia64?  (
 			sys-boot/grub[grub_platforms_efi-64]
 			sys-fs/mtools
diff --git a/dev-util/difffilter/Manifest b/dev-util/difffilter/Manifest
deleted file mode 100644
index 6905af447e91..000000000000
--- a/dev-util/difffilter/Manifest
+++ /dev/null
@@ -1 +0,0 @@
-DIST difffilter-0.3.3.tar.bz2 291226 BLAKE2B 95a43e025668318c1d8e216ae4259e874983f899da8bff402b2fa60c7d8d1f7cb203854b76dfe12b2577f6e2ce8f86cedb93fe50b596c1782a436346069b5eb0 SHA512 ac9aa95dd7e41b6c49c1416be9d1929a41b629587ecb90f3dcadd3982a46d8eb49d181f8f1b1645322113becd9a4b708d0df1e27f6fb9064ffb06b37e5f101f8
diff --git a/dev-util/difffilter/difffilter-0.3.3-r1.ebuild b/dev-util/difffilter/difffilter-0.3.3-r1.ebuild
deleted file mode 100644
index bffbd2c1c637..000000000000
--- a/dev-util/difffilter/difffilter-0.3.3-r1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Filter files out of unified diffs using POSIX extended regular expressions"
-HOMEPAGE="http://ohnopub.net/~ohnobinki/difffilter/"
-SRC_URI="http://mirror.ohnopub.net/mirror/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86 ~amd64-linux"
-
-RDEPEND=">=dev-libs/liblist-2.3.1
-	dev-libs/libstrl
-	dev-libs/tre"
-DEPEND="${RDEPEND}"
-
-PATCHES=( "${FILESDIR}"/${P}-fno-common.patch )
-
-src_install() {
-	default
-	newman "${FILESDIR}"/${PN}-0.3.3.man1 ${PN}.1
-}
diff --git a/dev-util/difffilter/files/difffilter-0.3.3-fno-common.patch b/dev-util/difffilter/files/difffilter-0.3.3-fno-common.patch
deleted file mode 100644
index 8e4c57738b76..000000000000
--- a/dev-util/difffilter/files/difffilter-0.3.3-fno-common.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- a/src/block.h
-+++ b/src/block.h
-@@ -38,7 +38,7 @@
-  *   The string literal ``\ No newline at end of file'' including the
-  *   newline at the end.
-  */
--const char *DIFFFILTER_DIFF_NO_NL_AT_EOF;
-+extern const char *DIFFFILTER_DIFF_NO_NL_AT_EOF;
- 
- struct diff_block;
- typedef struct diff_block *diff_block_t;
diff --git a/dev-util/difffilter/files/difffilter-0.3.3.man1 b/dev-util/difffilter/files/difffilter-0.3.3.man1
deleted file mode 100644
index ad7a6331827b..000000000000
--- a/dev-util/difffilter/files/difffilter-0.3.3.man1
+++ /dev/null
@@ -1,194 +0,0 @@
-.\" Text automatically generated by txt2man
-.TH difffilter 1 "04 November 2018" "difffilter 0.3.3" ""
-.SH NAME
-\fBdifffilter \fP- Filter diffs out of multi-file patches
-.SH SYNOPSIS
-.nf
-.fam C
-\fBdifffilter\fP [\fB-U\fP <lines>] [\fB-hv\fP] [--] [\fB-e\fP <regex>] [\fB-a\fP] [\fB-e\fP <regex>] [\fB-x\fP] [\fB-e\fP <regex>] \.\.\.
-.fam T
-.fi
-.fam T
-.fi
-.SH DESCRIPTION
-\fBdifffilter\fP reads in a series of unified-diffs and filters out any file
-which matches one of the passed extended regular expressions. The remaining
-diffs are written to standard out. \fBdifffilter\fP is a traditional unix filter,
-reading input from standard input and writing the results to standard
-output.
-.PP
-If \fBdifffilter\fP encounters a parsing or input reading error, it will exit
-after writing an error message to standard output. In such a case,
-\fBdifffilter\fP's return value is non-zero. As the parser is not guaranteed to
-be perfect and badly-formatted input may be accepted by commands like
-\fBpatch\fP(1), it is advised that scripts use error checking on \fBdifffilter\fP.
-.SH OPTIONS
-.TP
-.B
-\fB-h\fP
-Displays some amount of helpful or unhelpful information which is intended
-to be helpful. \fBdifffilter\fP will exit without performing any filtering.
-.TP
-.B
-\fB-v\fP
-Displays \fBdifffilter\fP's version information.
-.TP
-.B
-\fB-e\fP BRE
-A POSIX Basic Regular Expression which a filename in the input
-diff may be matched against. The default action for a matched regex
-is to exclude that portion of the diff from the output.
-.TP
-.B
-\fB-E\fP ERE
-Like \fB-e\fP but uses a POSIX Extended Regular Expression.
-.TP
-.B
-\fB-a\fP
-Any following \fB-e\fP options will cause files which match the regex to
-be included in the output diff. This allows one to preserve selected files
-which later patterns will exclude. See EXAMPLE for an application.
-.TP
-.B
-\fB-x\fP
-Any following \fB-e\fP options will cause files matching the regex to be excluded
-from the output diff. This is the default state of difffilter. I.e.,
-$ \fBdifffilter\fP \fB-e\fP 'configure$'
-has the same functionality of
-$ \fBdifffilter\fP \fB-x\fP \fB-e\fP 'configure$' .
-.TP
-.B
-\fB-b\fP
-Attempt to make the patch appear as if it were generated using \fBdiff\fP(1)'s \fB-b\fP
-option. This is similar to \fB-w\fP but only removes changes involving changes
-in the amount of whitespace. This means that completely removing a block of
-whitespace or inserting whitespace between two non-whitespace characters
-will still be seen as a change. See \fBdiff\fP(1) for more details.
-.TP
-.B
-\fB-k\fP BRE
-A POSIX Basic Regular Expression which will be matched against
-the name of a CVS keyword whose effect is to be nullified. For example, if
-the CVS keyword looks like $Pizza: I'm hungry$, a regex of `hungry' would
-not match but a regex of `Pi.*a$' would.
-.TP
-.B
-\fB-K\fP ERE
-Like \fB-k\fP but uses a POSIX Extended Regular Expression.
-.TP
-.B
-\fB-R\fP
-Reverse the patch. This is intended to recover from accidents when the
-sources used to generate a diff are not available but the reverse diff
-is.
-.TP
-.B
-\fB-U\fP lines
-Reduce the number of lines of context of the diff to the specified
-number of lines. Specify \fB-1\fP or a high number to avoid reducing the number
-of lines of context. This is set to \fB-1\fP by default. You should set it to 3 in
-most cases so that the effects of \fB-k\fP, \fB-b\fP, \fB-w\fP, and other flags can be more useful.
-.TP
-.B
-\fB-w\fP
-Attempt to make the patch as if it had been created by \fBdiff\fP(1) with the
-\fB-w\fP option. This removes changes from the input diff for which only whitespace
-was added or removed.
-.SH EXAMPLES
-This command should be adequate to filter out many auto-generated
-files that don't belong in a Version Control System. This will
-filter out files like config.log, config.status, Makefile, and
-Makefile.in. It preserves Makefile.am and sourcecode files. Not that
-\fB-E\fP is used instead of \fB-e\fP because the command utilizes Extended
-Regular Expressions.
-.PP
-.nf
-.fam C
-    $ difffilter -E '(^|/)config\.(log|status|guess|rpath|sub)$' -E '(^|/)(install-sh|configure|ac(include|local)\.m4|ltmain\.sh|lt[^/]*\.m4)$' -a -E '(^|/)Makefile\.am$' -x -E '(^|/)Makefile' < dirty.patch > clean.patch
-
-.fam T
-.fi
-If a dirty patch is submitted to a bugtracker with random whitespace
-changes which should be ignored, the patch may be feed through
-\fBdifffilter\fP with the \fB-b\fP or \fB-w\fP options. For most cases, \fB-b\fP is more
-reasonable -- and is definitely safer than \fB-w\fP. See the CVS keyword
-removal example for information on how \fB-U\fP might apply to this
-situation.
-.PP
-.nf
-.fam C
-    $ difffilter -w < bug-34567-dirty.patch > bug-34567-clean.patch
-
-.fam T
-.fi
-If you want to see only changes made to a particular file in a
-multifile patch, such as README.txt, you may use the \fB-a\fP and \fB-x\fP flags
-to effectively invert the normal filtering convention. Any files
-which match expressions following an \fB-a\fP will be accepted if that
-rule is processed. To revert \fBdifffilter\fP back to its normal mode of
-treating expressions as files to discard, use \fB-x\fP. We use an empty
-regular expression after the \fB-x\fP because the empty regular expression
-matches everything and we want to discard everything but
-README.txt. One can also easily modify this example to extract all
-changes to \.c$ or \.h$ files.
-.PP
-.nf
-.fam C
-    $ difffilter -a -e 'README\.txt$' -x -e '' < changes-bigpatch.patch > README.txt-changes.patch
-
-.fam T
-.fi
-To nullify diff lines which are caused by changes in CVS keywords'
-content, use the \fB-k\fP and \fB-K\fP options. For example, a diff might catch
-changes in an $Id: $ line, which is likely to happen when creating
-diffs from tarballs, where CVS control files are not available. If
-the $Id: $ line has change in the diff meaning that there are two
-versions of the $Id: $, the user is likely going to be applying the
-diff to the same file which would have a third value for the $Id: $
-line. Thus, applying such a patch would be troublesome (depending on
-the method of applying it). With \fB-k\fP and \fB-K\fP, we can get
-.PP
-.nf
-.fam C
-    $ difffilter -k Id < not-from-cvs.patch > not-from-cvs-fixed.patch
-
-    - /* $Id: binki /var/test/etc/rc.conf.RCS 1.1$ */
-    + /* $Id: mgorny /var/test/etc/rc.conf.RCS 2.1.5.3$ */
-
-.fam T
-.fi
-to be nullified. This means that we end up getting rid of the '+'
-and '-' lines and end up with a ' ' line:
-.PP
-.nf
-.fam C
-     /* $Id: binki /var/test/etc/rc.conf.RCS 1.1$ */
-
-.fam T
-.fi
-To most effectively avoid such problems, the change should be first
-nullified with \fB-k\fP or \fB-K\fP. Then the \fB-U\fP option should be used. The \fB-U\fP
-option is used to reduce the number of lines of context a diff may
-have. It would be customary to pass the value 3 to this option. If a
-certain block or a portion of the diff has a series of 3 or more
-null or noop lines, then \fBdifffilter\fP starts removing these. If a
-whole block (or chunk, as \fBpatch\fP(1) calls it) contains no changes,
-then \fBdifffilter\fP will completely drop that block from the diff. In
-many cases, this may completely remove the block, especially when
-(as is often the case) the CVS keyword being nullified is a line in
-the header comments of a file where actual edits occur infrequently.
-.PP
-.nf
-.fam C
-    $ difffilter -k Id -U 3 < not-from-cvs.patch > not-from-cvs-fixed.patch
-
-.fam T
-.fi
-.SH SEE ALSO
-\fBcolordiff\fP(1), \fBdiff\fP(1), \fBpatch\fP(1), \fBhg\fP(1)
-.SH BUGS
-There are no known bugs.
-.PP
-There is a bug tracker at http://ohnopub.net/bugzilla/ .
-.SH AUTHOR
-Nathan Phillip Brink (binki) <ohnobinki@ohnopublishing.net>
diff --git a/dev-util/difffilter/metadata.xml b/dev-util/difffilter/metadata.xml
deleted file mode 100644
index 83d00b14c8d4..000000000000
--- a/dev-util/difffilter/metadata.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
-<pkgmetadata>
- 
- <origin>gentoo-staging</origin>
-</pkgmetadata>
-\ No newline at end of file
diff --git a/dev-util/rocm-cmake/Manifest b/dev-util/rocm-cmake/Manifest
index a7b7dabc4801..586c8527e10e 100644
--- a/dev-util/rocm-cmake/Manifest
+++ b/dev-util/rocm-cmake/Manifest
@@ -4,3 +4,4 @@ DIST rocm-cmake-3.9.0.tar.gz 15815 BLAKE2B 86fedeb90ee27367b5fcfe842009055ef0739
 DIST rocm-cmake-4.0.0.tar.gz 15815 BLAKE2B a6e6ce5f63ea6e1c14ce4c74a627d54987321e20d977e575615caa7037f2e3c734cc9f88dc5cdff7a9ee81caefab17440043bdc88a201d4fec29eb167ea709fe SHA512 1d42f7d17f783355b7d559db17020258dd686a0439c481cde04bb3750494dc2e5757dad0fed7e96c1da6ce875b03f97366efec5a75ece09fd92fbd9265a58e34
 DIST rocm-cmake-4.1.0.tar.gz 19736 BLAKE2B 1a7baec723155f0e760682296eb940ec723a0b2c9321209ca3beb81f35614830ceb9d6b6f73fcd499f6e6a3608a9d665cd478f5b2d1b6dd01cf55e6c8000135f SHA512 86ea9db05975472148f4146079246dd7179089e416bcac2f4d82d0152275c5b9372455a92328cece87b220022d2874c8300eb9f6108283ae6f643cc01baebf11
 DIST rocm-cmake-4.2.0.tar.gz 22147 BLAKE2B 14d90d187a845fd148b77cd73a628653405be42859cf981e2dcec7abf46edc5d30ab50792754fb4a75267cc2c574b68e5d6e1af2f3ca69c75c67dc40c71fce4d SHA512 7ddbdef28e4490936fa7334e1aca273fa1510332609a3d7ed79a8fa448ec032843883c46411995c3868f585f184e0c13a2e0be6d667d1f8532e07d968d810ac8
+DIST rocm-cmake-4.3.0.tar.gz 22912 BLAKE2B 588ba127aa401826021e40d2c0dc05fb40e6000bf26ad2f32a40d52b4882a5e0705f9d303784ca830f2dc88dbda4fc7ffe89e0080d862dd8867a021f7c008331 SHA512 1277336c9535fa934bd7f255299d31d817ae3c659468ade4d7689325df175aa3029f5b1ebde072a4f1d5edf31281582371a44902fa46171634ad238fc8b3bde0
diff --git a/dev-util/rocm-cmake/rocm-cmake-4.3.0.ebuild b/dev-util/rocm-cmake/rocm-cmake-4.3.0.ebuild
new file mode 100644
index 000000000000..1d70327b58e3
--- /dev/null
+++ b/dev-util/rocm-cmake/rocm-cmake-4.3.0.ebuild
@@ -0,0 +1,26 @@
+# 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/rocm-cmake/"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/RadeonOpenCompute/rocm-cmake/archive/rocm-${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64"
+	S="${WORKDIR}/rocm-cmake-rocm-${PV}"
+fi
+
+DESCRIPTION="Radeon Open Compute CMake Modules"
+HOMEPAGE="https://github.com/RadeonOpenCompute/rocm-cmake"
+LICENSE="MIT"
+SLOT="0/$(ver_cut 1-2)"
+RESTRICT="test"
+
+src_prepare() {
+	sed -e "s:set(ROCM_INSTALL_LIBDIR lib):set(ROCM_INSTALL_LIBDIR $(get_libdir)):" -i "${S}/share/rocm/cmake/ROCMInstallTargets.cmake" || die
+	cmake_src_prepare
+}
diff --git a/dev-util/rocminfo/Manifest b/dev-util/rocminfo/Manifest
index 0cf9de248418..904d889fa683 100644
--- a/dev-util/rocminfo/Manifest
+++ b/dev-util/rocminfo/Manifest
@@ -5,3 +5,4 @@ DIST rocminfo-3.9.0.tar.gz 15106 BLAKE2B 0be734ee03298a83892fb237f7b171c7bb5779d
 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
+DIST rocminfo-4.3.0.tar.gz 15379 BLAKE2B 86683d8e88d26a8730cf84b3a1d4f69231ff7158186ca6b867b5a029ae485978cf0d67db2b07c05c046bb300b55b6e80e280b9429cef903e3077dc1da0945b8d SHA512 88b7f1ad86e76ede270d12fc3065eba192fcf3938d749b8345dac3b71be0985071dc5139a801ff46015369cd09b3eefcd8ff9ea71ab297476dda195f57792849
diff --git a/dev-util/rocminfo/files/rocminfo-4.3.0-detect-builtin-amdgpu.patch b/dev-util/rocminfo/files/rocminfo-4.3.0-detect-builtin-amdgpu.patch
new file mode 100644
index 000000000000..a01eb3ec3909
--- /dev/null
+++ b/dev-util/rocminfo/files/rocminfo-4.3.0-detect-builtin-amdgpu.patch
@@ -0,0 +1,25 @@
+/sys/module/amdgpu instead of lsmod for builtin amdgpu kernel module
+
+https://github.com/RadeonOpenCompute/rocminfo/pull/43
+https://github.com/RadeonOpenCompute/rocminfo/issues/42
+--- a/rocminfo.cc
++++ b/rocminfo.cc
+@@ -1035,14 +1035,15 @@ AcquireAndDisplayAgentInfo(hsa_agent_t agent, void* data) {
+ 
+ int CheckInitialState(void) {
+   // Check kernel module for ROCk is loaded
+-  FILE *fd = popen("lsmod | grep amdgpu", "r");
+-  char buf[16];
+-  if (fread (buf, 1, sizeof (buf), fd) <= 0) {
++  int module_dir;
++  module_dir = open("/sys/module/amdgpu", O_DIRECTORY);
++  if (module_dir < 0) {
+     printf("%sROCk module is NOT loaded, possibly no GPU devices%s\n",
+                                                           COL_RED, COL_RESET);
+     return -1;
+   } else {
+     printf("%sROCk module is loaded%s\n", COL_WHT, COL_RESET);
++	close(module_dir);
+   }
+ 
+   // Check if user belongs to the group for /dev/kfd (e.g. "video" or
diff --git a/dev-util/rocminfo/rocminfo-4.3.0.ebuild b/dev-util/rocminfo/rocminfo-4.3.0.ebuild
new file mode 100644
index 000000000000..ba629c1e3b72
--- /dev/null
+++ b/dev-util/rocminfo/rocminfo-4.3.0.ebuild
@@ -0,0 +1,25 @@
+# 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}"
+
+PATCHES=("${FILESDIR}/${PN}-4.3.0-detect-builtin-amdgpu.patch")