gentoo auto-resync : 27:01:2023 - 13:58:28

21 files changed, 249 insertions, 143 deletions

diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 07048b7f2533..29bb9ef62bb1 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/cscope/Manifest b/dev-util/cscope/Manifest
index 1442daac1ba3..432ae6d95255 100644
--- a/dev-util/cscope/Manifest
+++ b/dev-util/cscope/Manifest
@@ -1,6 +1,8 @@
 AUX 50cscope-gentoo.el 1442 BLAKE2B 73a5542b5ac18dd6ffb34169764cae590cb009c3d04816cb09361d24ea16c3e2fdb2355cca2301e932108fbb333ff433783b75bb379ecf4ec8996f8e162f422a SHA512 63bb70766d69a85f78c43204e3539bcabaf5765f19703f6f8ad1dcc2bc076c1c20623a3120eeeaff89842fac9f17d5b3f17820780eab9844716cbcd6a138d384
 AUX cscope-15.7a-ocs-sysdir.patch 582 BLAKE2B f9144657cb8d584f4d504481b986f68322d1a08b408e4f623db0ed3e22474895f4f8464e297a90e635a3dd3e71cb06f79b092a82ab8876d0ed308b71fa0d2812 SHA512 aa296d8839da73b6838c450dfabc9782940a2f9c9cfba2f738993c777c1d4096688d79205ccec58dbf931b2faf45a4c3850ddbd894c7b7e616d18a0014cacfdb
+AUX cscope-15.9-emacs-27.patch 1083 BLAKE2B 0982fcd6a804e6b2a1c5d5b47f184ec6f74a38ebeef737aaf8164db183787d817f0927fe7757cd51a82f9eba1d7034d565d61a403f2ee4532ea08e730d87e68d SHA512 d3c6c90d2a1838945a68b2495b1771a37dd2837d77b16793955f3e021741ad9fa2244fee3b0ce6790c0704430508febecd09e59ce60c071872ed0e988eef9956
 AUX cscope-15.9-pkgconfig.patch 833 BLAKE2B 4f8869517758d4b8725d772c7b4252c4f7aec57b3d63ab36c3fd4a6df08c6374773b016901a0418327b76c04f9fce131b58845c074073e1bcdc3f319261c74a3 SHA512 98002268e01be238a4f918bd95d9f69957477e9bbd0bd7cd0be204efc421fec8daf2aac86cfad9310c7bbd1f6ef0b6234e11e6e9d5490787ae2011160080f731
 DIST cscope-15.9.tar.gz 613948 BLAKE2B 66c0c85d0db810e8cd5a286925eeb1026fa4a9e9c3a5a9decd1412188fca43f831949c231acca428b5eeb476662b7ce9f81defcda81759c18027655535b855be SHA512 f3b95da5eb5c036cd39215785990c7cce7ce7b8eda4b18e60792e70d01ffb63809ce32ace310a9aefd88e6761c1609039ccfab0e8e49f81730bc1630babbcb80
+EBUILD cscope-15.9-r1.ebuild 1649 BLAKE2B 3f80363685da55565eac0faa93a76812979f8ec288ea21411fc0ac7a787f3fbe11bbdcd7285ca202330e2de20572812d8f344acd983aeb9ea6a758fbeacd78a7 SHA512 60287e23693a253e310c7aee068a8af15bf61e1995d59bc880a37fd3c6dfbfd53bd432184ce947ab89d3aa47c96bb5617bd3991de4137ed6f375d73371517b1b
 EBUILD cscope-15.9.ebuild 1593 BLAKE2B c7457f0aebbd3b11d37057991c2f9f34f49aa941fe29078749186f4d6d7f8640b38d8e272fccfca9da4219735bae1cda7955cd9230b5cfcc1e71d9442a2624ea SHA512 efc09755079ae3e3d54b102692a3ce62414b2b64bc132fa5203370fdd3222bc6691e65db040737ebcb176f2def101af48e2340e94294167e88baf75905669a7e
 MISC metadata.xml 1087 BLAKE2B 2e4779a4e1d063adc26a16774898a6cca08788ddfbfa036d29ae751e547a74cbf3252645e2b6444c59ed106f6088acb0bb5490dde7e7f5b55c74b3c9f941ea1c SHA512 6db0a7194cf116f4f1a1b34de222729dd0521dfb21486ead4885b068e52c3191091bf98e52b31b2e9d4d564560cec9a184d8d7c2387262afcf8442d66507c60b
diff --git a/dev-util/cscope/cscope-15.9-r1.ebuild b/dev-util/cscope/cscope-15.9-r1.ebuild
new file mode 100644
index 000000000000..f0ca12cf9cfc
--- /dev/null
+++ b/dev-util/cscope/cscope-15.9-r1.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools elisp-common toolchain-funcs
+
+DESCRIPTION="Interactively examine a C program"
+HOMEPAGE="https://cscope.sourceforge.net/"
+SRC_URI="mirror://sourceforge/cscope/${P}.tar.gz"
+
+LICENSE="BSD GPL-2+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
+IUSE="emacs"
+
+RDEPEND=">=sys-libs/ncurses-5.2:0=
+	emacs? ( >=app-editors/emacs-23.1:* )"
+DEPEND="${RDEPEND}"
+BDEPEND="sys-devel/flex
+	virtual/pkgconfig
+	app-alternatives/yacc"
+
+SITEFILE="50${PN}-gentoo.el"
+
+src_prepare() {
+	eapply "${FILESDIR}/${PN}-15.7a-ocs-sysdir.patch" #269305
+	eapply "${FILESDIR}/${PN}-15.9-pkgconfig.patch"
+	eapply "${FILESDIR}/${PN}-15.9-emacs-27.patch"
+	eapply_user
+	mv configure.{in,ac} || die
+	eautoreconf		  # prevent maintainer mode later on
+}
+
+src_configure() {
+	econf --with-ncurses="${EPREFIX}"/usr
+}
+
+src_compile() {
+	emake CURSES_LIBS="$("$(tc-getPKG_CONFIG)" --libs ncurses)"
+	if use emacs; then
+		cd "${S}"/contrib/xcscope || die
+		elisp-compile *.el
+	fi
+}
+
+src_install() {
+	default
+
+	if use emacs; then
+		cd "${S}"/contrib/xcscope || die
+		elisp-install ${PN} *.el *.elc
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+		dobin cscope-indexer
+	fi
+
+	cd "${S}"/contrib/webcscope || die
+	docinto webcscope
+	dodoc INSTALL TODO cgi-lib.pl cscope hilite.c
+	docinto webcscope/icons
+	dodoc icons/*.gif
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
+}
diff --git a/dev-util/cscope/files/cscope-15.9-emacs-27.patch b/dev-util/cscope/files/cscope-15.9-emacs-27.patch
new file mode 100644
index 000000000000..48cd7150176d
--- /dev/null
+++ b/dev-util/cscope/files/cscope-15.9-emacs-27.patch
@@ -0,0 +1,28 @@
+https://bugs.gentoo.org/892071
+
+commit eaea31cb93ecddda69a373f83f632e1a450c3c90
+Author: Brock Zheng Techyauld Ltd <yzheng@techyauld.com>
+Date:   Tue Aug 25 20:28:11 2020 +0800
+
+    emacs plugin fixup: GNU/Emacs 27.1 removes function process-kill-without-query
+
+--- a/contrib/xcscope/xcscope.el
++++ b/contrib/xcscope/xcscope.el
+@@ -2006,7 +2006,7 @@
+ 	      (set-process-filter cscope-process cscope-filter-func)
+ 	      (set-process-sentinel cscope-process cscope-sentinel-func)
+ 	      (set-marker (process-mark cscope-process) (point))
+-	      (process-kill-without-query cscope-process)
++              (set-process-query-on-exit-flag cscope-process nil)
+ 	      (if cscope-running-in-xemacs
+ 		  (setq modeline-process ": Searching ..."))
+ 	      (setq buffer-read-only t)
+@@ -2139,7 +2139,7 @@
+ 		   cscope-indexing-script args))
+       (set-process-sentinel cscope-unix-index-process
+ 			    'cscope-unix-index-files-sentinel)
+-      (process-kill-without-query cscope-unix-index-process)
++      (set-process-query-on-exit-flag cscope-unix-index-process nil)
+       )
+     ))
+ 
diff --git a/dev-util/gnome-builder/Manifest b/dev-util/gnome-builder/Manifest
index c67dd58c00d6..6304f68dc6df 100644
--- a/dev-util/gnome-builder/Manifest
+++ b/dev-util/gnome-builder/Manifest
@@ -1,3 +1,3 @@
 DIST gnome-builder-43.4.tar.xz 10284936 BLAKE2B 50af653566b35525a751d1ab0698c42e205aa8ab3205b390d10625f67a984986f24e5c0a5512629d81c082265435d5f39380de2c675d64e9f0b6d47c2fc62451 SHA512 c8600aea7bd01fb8a75baf321d8670600aa0ac77f7a42cccc7107fd9d2addd0264f132a4e36c2ae66ad7dbd8dc94dfc52421655254eee93d0a3298aa2cc224db
-EBUILD gnome-builder-43.4.ebuild 8735 BLAKE2B 75bc929cbfd9cb233a05229774e7d1c13f3df2ae528a45c093a0ea7f619c538f89c58790491f2e545f0ac1bf11d70769dadfa4b73296bdc81a566778b546ee27 SHA512 5718ebcf0c8fe1a3ac3c5535f497a214d7ac0c69610a0a90582adb1f00bdb96e632b29b2bb29f95c631a3da272779b5b77932a1b79fd0465fbe2c91711836d9a
+EBUILD gnome-builder-43.4.ebuild 8733 BLAKE2B af7facf902f7d84accc297d52f4835723f33afa2ba1582047151e984f3a36a187318b2951c4aa49704fcec149c7e249e3d988a98026f359255265e72f2556f86 SHA512 3a32edf77f4eb16ca9a4ca0e4b451767d79a36c97910e3c775e8c54696d246383ba9d85d44fba15dd27f1fb3ead680d98f31ec5d02c686eb04a26b04d2825caf
 MISC metadata.xml 1095 BLAKE2B e32e4a52f11c192e37b0593106b2938b3d8ded0cbb60859b7f30e9195667ef46b6ddb9b180e3aaa4459d6560027b3a85cb04b92930e191031966635d0bce4f42 SHA512 468bee5867936afa6d47cf4b7fcc36cb807fc2ad1d5a54e63013a1c862a157da35d051f12980331fece8f473ad5696c7a1c24e8bd53e2c41dd057250017b36b2
diff --git a/dev-util/gnome-builder/gnome-builder-43.4.ebuild b/dev-util/gnome-builder/gnome-builder-43.4.ebuild
index 348c39c08c64..048939fab95b 100644
--- a/dev-util/gnome-builder/gnome-builder-43.4.ebuild
+++ b/dev-util/gnome-builder/gnome-builder-43.4.ebuild
@@ -111,7 +111,7 @@ that are currently available with packages include:
   autocompletion support.
 * dev-util/valgrind for integration with valgrind.
 * dev-util/meson for integration with the Meson build system.
-* dev-util/cargo for integration with the Rust Cargo build system.
+* virtual/rust for integration with the Rust Cargo build system.
 * dev-util/cmake for integration with the CMake build system.
 * net-libs/nodejs[npm] for integration with the NPM package system.
 '
diff --git a/dev-util/lldb/Manifest b/dev-util/lldb/Manifest
index 0b66a3ad3b64..8663f218c91e 100644
--- a/dev-util/lldb/Manifest
+++ b/dev-util/lldb/Manifest
@@ -1,14 +1,11 @@
 DIST llvm-project-14.0.6.src.tar.xz 105618228 BLAKE2B ee67c5407df8cef493b9c0004f15e428f22a536a17e5f4e3eb29a003b8a8ec0abe0fa3e072591161d5f30ef7d8867c1ce34d1b341ad858e93c00263499941a99 SHA512 6fc6eeb60fac698702d1aac495fc0161eb7216a1f8db2020af8fccec5837831f7cc20dc2a169bf4f0b5f520748280b4a86621f3697d622aa58faaa45dbfaad13
 DIST llvm-project-14.0.6.src.tar.xz.sig 566 BLAKE2B cb658ad43d8ab6c43a5773aedadf0569c97b5ee4b1bd58eceb10e1879a30880c741c3d66bedd462c892309b688fb7b2673115a62d1f74d71ee375a578de9547f SHA512 b4a7b368532a7a4a24376cfa7db8f6d3478f6d4446474342fc00b474ecf466330cd0f16783209263c4c72d5fc7ddedfb11b95578842e700cfb7ee0bb34cc95d6
-DIST llvm-project-15.0.6.src.tar.xz 112074576 BLAKE2B 74b1aa967c95191fa492f06b3a21930842da0ccbd9995dd33b4c2cf07852bbedcae97041fd5966209b16c63b90c87cc02fb2e858eda13dd9cc0641edcede0f75 SHA512 3311d85f4e02610af52f06e83c8c6d2b93950d24324b831b7afc47c39a20a546d39683a14e1a315da87d226379042de900a3f36a0351053547482af9035ab949
-DIST llvm-project-15.0.6.src.tar.xz.sig 438 BLAKE2B 3c97dbd55667f52dad964ef71257c36e3075794f5616cfd46de8bf874867e861bf45c0d56cff2d0ad5d4f1b5a1c9b3a395aedcc40bce545ce7f3c84ac75ae3da SHA512 a184103d84f8197a709c6c067fa83ca9290cd06532c487ad2c1fefa423438a1ac3c7f88835a94e3c9f04876e8d5f09afabef15bd8605df38aec6a4118597090c
 DIST llvm-project-15.0.7.src.tar.xz 110936452 BLAKE2B f3d277e2029157329e5be78b78af36b0826a1dfd9a337992499bf701e33149665bfc47d5e14978e38f342559629a559f8b2ce328705ba34fdf6830f5ae9721a5 SHA512 4836d3603f32e8e54434cbfa8ef33d9d473ac5dc20ebf9c67132653c73f4524931abd1084655eaee5f20bcfcb91bcc4bbc5c4a0b603ad0c9029c556e14dc4c52
 DIST llvm-project-15.0.7.src.tar.xz.sig 566 BLAKE2B 47dc8c82d86237b80c6d85f83a6c9a6e9e174cf8e7f367b071e0cd9481d7cd408e991337c5624e07f3f370f26387c814f212808575ed1c1b58404d3e3836b7df SHA512 fc6891b440dd1175eb8df3790590af8d36bc92301660f84744ae15123475aeb900a151e6a8e7998ded27ec4d86871903ad0b89cd61164943054c2e3bc8d8beb2
 DIST llvm-project-6dc85bd3fde7df2999fda07e9e9f2e83d52c6125.tar.gz 175208511 BLAKE2B cf87cf7e9bf7c74aab8ccda0f153369cb81798047fdd48025c3c7030857b128babbaafb667385a5c8e9916e16038b14fee39f1623d329471e73c39c2f2d7bbfa SHA512 e6dc0cacd6c079be8a00364e4c244782d764d9a8d514d65f9078427cb4a0c1663ff88761bfbc1e955a1a990451439110497c2cb7af7f56b2c91f2e9db4389894
 DIST llvmorg-13.0.1.tar.gz 147290251 BLAKE2B 2a44b012a672501761d0c27c6b3a315b69bfef0cd13b078a7e7d2fccc4a9c8c0f2bee0f164c4271c9106b0a99cb06e8b64986f66253b613336719fb86b82541b SHA512 9a8cb5d11964ba88b7624f19ec861fb28701f23956ea3c92f6ac644332d5f41fde97bd8933dd3ee70ed378058c252fa3a3887c8d1af90d219970c2b27691166f
 EBUILD lldb-13.0.1.ebuild 2587 BLAKE2B e71ae0f087f5490352932e4ed8daed99377a7579f93fb325c01b39faebd3000ebe8c73e9875dc609dda168649d5ca6e092fa9cdad8e847cbf01b1ddf95d1be2e SHA512 9ed40d4927f116f6c18a8c2d38287fb386c280d0f8ec40514c886b1298b5f19fae5f4102f715284e00503401df96e0ecb6cc23378c23e91d2baa383a76488ee3
 EBUILD lldb-14.0.6.ebuild 2661 BLAKE2B 57d0c4810421eff9d3fab976f16d8ad92e67764aaa9c72154a793c7783d98e835789df2cdd2c64f44c035f85e29652e5e50b72ceb161d4dc0dc803983234c08f SHA512 54120a86d7655cc53bb0ee858561959e112f415e9f23e4d56cd0d7716147b2563bdcb3800005eebd8311c237659319f735176072547a7f2162fc9b4f641dfdf0
-EBUILD lldb-15.0.6.ebuild 2716 BLAKE2B 88e5c97e848e7e83261c6c18c6f4857f173515b346d734641c2add5ac31d840cbe1795a3ee46e619aff337192e6d618f43dac21eeba5a3e3f541b715768f9f17 SHA512 d4f9993fc13dd50504d05fc23b000796c6e747d65f816d23856d0eade3aa419fc8d68d77bab3e17f09013606b6f02ce7389e08877ee7d8a75fbe9f99a99e9e0e
 EBUILD lldb-15.0.7.ebuild 2716 BLAKE2B 88e5c97e848e7e83261c6c18c6f4857f173515b346d734641c2add5ac31d840cbe1795a3ee46e619aff337192e6d618f43dac21eeba5a3e3f541b715768f9f17 SHA512 d4f9993fc13dd50504d05fc23b000796c6e747d65f816d23856d0eade3aa419fc8d68d77bab3e17f09013606b6f02ce7389e08877ee7d8a75fbe9f99a99e9e0e
 EBUILD lldb-16.0.0.9999.ebuild 2664 BLAKE2B 791938f67edd484c779b8663b1658a6c6db81d0283a2bc62b36c5499e27c61424055356511f5d4e306987fcbc4a490277d986d60ae77342021975ae89119fe14 SHA512 619c4fc08e3f0e175e97d3eeb8c37321ef5423e2d179d423c0daa586862e7ed21ceab83d36c6a6dd7cec82cc91f9f9ba34d17296bbad2b97cb4b14663796c2bb
 EBUILD lldb-16.0.0_pre20230107.ebuild 2664 BLAKE2B 791938f67edd484c779b8663b1658a6c6db81d0283a2bc62b36c5499e27c61424055356511f5d4e306987fcbc4a490277d986d60ae77342021975ae89119fe14 SHA512 619c4fc08e3f0e175e97d3eeb8c37321ef5423e2d179d423c0daa586862e7ed21ceab83d36c6a6dd7cec82cc91f9f9ba34d17296bbad2b97cb4b14663796c2bb
diff --git a/dev-util/lldb/lldb-15.0.6.ebuild b/dev-util/lldb/lldb-15.0.6.ebuild
deleted file mode 100644
index 37c23ed60fb5..000000000000
--- a/dev-util/lldb/lldb-15.0.6.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..11} )
-inherit cmake llvm llvm.org python-single-r1
-
-DESCRIPTION="The LLVM debugger"
-HOMEPAGE="https://llvm.org/"
-
-LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
-SLOT="0/${LLVM_SOABI}"
-KEYWORDS="amd64 arm arm64 x86"
-IUSE="debug +libedit lzma ncurses +python test +xml"
-RESTRICT="test"
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-
-DEPEND="
-	libedit? ( dev-libs/libedit:0= )
-	lzma? ( app-arch/xz-utils:= )
-	ncurses? ( >=sys-libs/ncurses-5.9-r3:0= )
-	xml? ( dev-libs/libxml2:= )
-	~sys-devel/clang-${PV}
-	~sys-devel/llvm-${PV}
-"
-RDEPEND="
-	${DEPEND}
-	python? (
-		$(python_gen_cond_dep '
-			dev-python/six[${PYTHON_USEDEP}]
-		')
-		${PYTHON_DEPS}
-	)
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	>=dev-util/cmake-3.16
-	python? (
-		>=dev-lang/swig-3.0.11
-		$(python_gen_cond_dep '
-			dev-python/six[${PYTHON_USEDEP}]
-		')
-	)
-	test? (
-		$(python_gen_cond_dep "
-			~dev-python/lit-${PV}[\${PYTHON_USEDEP}]
-			dev-python/psutil[\${PYTHON_USEDEP}]
-		")
-		sys-devel/lld
-	)
-"
-
-LLVM_COMPONENTS=( lldb cmake )
-LLVM_TEST_COMPONENTS=( llvm/lib/Testing/Support llvm/utils/unittest )
-llvm.org_set_globals
-
-pkg_setup() {
-	LLVM_MAX_SLOT=${LLVM_MAJOR} llvm_pkg_setup
-	python-single-r1_pkg_setup
-}
-
-src_configure() {
-	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
-	use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
-
-	local mycmakeargs=(
-		-DLLDB_ENABLE_CURSES=$(usex ncurses)
-		-DLLDB_ENABLE_LIBEDIT=$(usex libedit)
-		-DLLDB_ENABLE_PYTHON=$(usex python)
-		-DLLDB_ENABLE_LUA=OFF
-		-DLLDB_ENABLE_LZMA=$(usex lzma)
-		-DLLDB_ENABLE_LIBXML2=$(usex xml)
-		-DLLDB_USE_SYSTEM_SIX=1
-		-DLLVM_ENABLE_TERMINFO=$(usex ncurses)
-
-		-DLLDB_INCLUDE_TESTS=$(usex test)
-
-		-DCLANG_LINK_CLANG_DYLIB=ON
-		# TODO: fix upstream to detect this properly
-		-DHAVE_LIBDL=ON
-		-DHAVE_LIBPTHREAD=ON
-
-		# normally we'd have to set LLVM_ENABLE_TERMINFO, HAVE_TERMINFO
-		# and TERMINFO_LIBS... so just force FindCurses.cmake to use
-		# ncurses with complete library set (including autodetection
-		# of -ltinfo)
-		-DCURSES_NEED_NCURSES=ON
-
-		-DLLDB_EXTERNAL_CLANG_RESOURCE_DIR="${BROOT}/usr/lib/clang/${LLVM_VERSION}"
-
-		-DPython3_EXECUTABLE="${PYTHON}"
-	)
-	use test && mycmakeargs+=(
-		-DLLVM_BUILD_TESTS=$(usex test)
-		-DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm"
-		-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
-		-DLLVM_LIT_ARGS="$(get_lit_flags)"
-	)
-
-	cmake_src_configure
-}
-
-src_test() {
-	local -x LIT_PRESERVES_TMP=1
-	cmake_build check-lldb-{shell,unit}
-	# failures + hangs
-	#use python && cmake_build check-lldb-api
-}
-
-src_install() {
-	cmake_src_install
-	find "${D}" -name '*.a' -delete || die
-
-	use python && python_optimize
-}
diff --git a/dev-util/packer/Manifest b/dev-util/packer/Manifest
index 07cfe7a5d91b..9ec9a6ed9f33 100644
--- a/dev-util/packer/Manifest
+++ b/dev-util/packer/Manifest
@@ -1,4 +1,7 @@
 DIST packer-1.7.10-deps.tar.xz 628140836 BLAKE2B 6cfb8409a9a9aef2130e58f2b70b1bb73b491aa9fb2d1f2b59b2c3c9e721465a51111f0e6357a58e9eed4d8b024a4fe9a0f20cf9a5b84e7d20f3a8d52ad55e4c SHA512 cd0af0f60029b7b3e887fbe4245e26e12d798fe5c3b650d63774ffeb2d5eab9609d8506a06c35d8ff4d499db1cab69d767b8b386d04136fd65ea43de3940df88
 DIST packer-1.7.10.tar.gz 2414352 BLAKE2B 7c48aaac8411dd81cae2201cf9b03eab0906b78dcc6aecf654f498b44884a0758f0d5fc10d03b9e526f7753d18db8754b74d8c2eef133b4170b872f41c8261f3 SHA512 12f032afef95be92be4f6e98cf2af5548189cb179c25d74b8f7943b4a6af0ab49c5a86523f27385e5eee05624d7e9de8d572fe19442305227c5bddd21a66f97a
+DIST packer-1.8.5-deps.tar.xz 385789132 BLAKE2B 680852f380bc6b2c74183bf0c32baf8e3c796b5eaee59fd8f395e2fa2765a3aa2ec36d30647ffd90965fad9b1cfe8ea00e4ad684c026cb60a6c4a9df4f5c8501 SHA512 a84b2d3287ccb618063ea960773a3ebe306ae8a36c708fd8ca057f6ce70b82ff7590922aa733c1fade93fbbca14f87b0c5ecda530413b573fab8bd981dd254fc
+DIST packer-1.8.5.tar.gz 2278013 BLAKE2B 0465356e78b62a67e71ef943a7dfb89b5f50b3b3cdb34c3ca41ac6d57e32fad8f40da1316ba8f54d93ae0c25b22627cc9f633f4e488ee9cc66fc6e6080b5769e SHA512 8ffd9e0a755e5e537c63a70454756a6df787d299cb5f3a8d6dea9c7e93dbea744017cd2f2c4fa9a8b6fbc052dedecb702dc6ac656b4c6c293ad5eab1f581872e
 EBUILD packer-1.7.10.ebuild 782 BLAKE2B d07c471c1ddd43a126dce74e3f877f10978f6b549fa251c6f947a9775f5a9ec4e4688eaef370cd2001c56086b43397facf9b6dfc6a2ae63029c748716c604457 SHA512 5fa4d8825455b08c39f6c69049d6452b569b10944e4fcac6aaabae9a4c93503c8a8815e11004ff54a562e8eaef1389e9f8a3f15e11d04b4446fc0daccb0ac2cb
+EBUILD packer-1.8.5.ebuild 782 BLAKE2B 81c1510edf376fb2119db7e14bceac85c4046765acd0e2c8759473f7b6ead8118dc0a9001705cccbcb6ffce793d592f242625ca7cc72b19e371057ca5be0953c SHA512 2184baea8a3cb822477356c72079f14fee5ce3061e7e56e40c6a4cc3d87c3168e4f1b936fd394563e3380b1fc3e8dfb94e927059de6680464c331216d998445e
 MISC metadata.xml 1408 BLAKE2B 04204c3ac4c45b58a23e611fbd34014423fd1839829101f7a30a188fc8b4588532f72b05c41a77f093170c6a6d9bd804c47bc831a8006ecbda5d3a30ccf6ade6 SHA512 2a45870ccadf85968c81c3129cfffa16184c3cc6ed135b716a84e545d9c80ed35064be231386b0bbfbe6fb7f9a12704c25d7fabc9383b3211d61720691c2ae9b
diff --git a/dev-util/packer/packer-1.8.5.ebuild b/dev-util/packer/packer-1.8.5.ebuild
new file mode 100644
index 000000000000..5d2c7f38d9d4
--- /dev/null
+++ b/dev-util/packer/packer-1.8.5.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit go-module
+
+DESCRIPTION="A tool to create identical machine images for multiple platforms"
+HOMEPAGE="https://www.packer.io"
+SRC_URI="https://github.com/hashicorp/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	https://gentoofiles.s3.eu-central-1.amazonaws.com/${P}-deps.tar.xz"
+
+LICENSE="Apache-2.0 BSD-2 BSD-4 MIT MPL-2.0 unicode"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~riscv"
+
+DOCS=( {README,CHANGELOG}.md )
+
+RESTRICT+=" test"
+
+src_compile() {
+	ego build \
+		-mod=readonly \
+		-ldflags "${go_ldflags}" \
+		-work -o "bin/${PN}" ./ || die
+}
+
+src_install() {
+	dobin bin/packer
+
+	einstalldocs
+
+	insinto /usr/share/zsh/site-functions
+	doins contrib/zsh-completion/_packer
+}
diff --git a/dev-util/pwndbg/Manifest b/dev-util/pwndbg/Manifest
index 53788111f3ff..ce5297889ea0 100644
--- a/dev-util/pwndbg/Manifest
+++ b/dev-util/pwndbg/Manifest
@@ -3,6 +3,6 @@ DIST gdb-pt-dump-f25898adc61d60e5f30c6452b15700bbf1bd630c.tar.gz 385826 BLAKE2B
 DIST pwndbg-20220830.tar.gz 8302318 BLAKE2B fd6821d0846646927a3a7f0f352067360984f90156702bb8d2001b40651e20b11c8a33b07fa522f568f39ce6337f2503d930f745ab424d5ce6948a270e331c1f SHA512 be59544eb959ba05e6a662dbc629eb33a014c39d5ad5fceb44e9c6a9ccfa3ac6c133c082adfda1602002aff9eab3326d5b97aff7b6ce1357116a2d1fe6aa28fb
 DIST pwndbg-20221219.tar.gz 8344938 BLAKE2B 1ecda02573ef03b569f8a46c390f5388e6db9cfbb0df84410f245e4f043e89be16b6581d0e07fe840d50cab875943dd5a30dab1c2fc40fb93c5982cecc33e490 SHA512 1578ea834d7aa1d574e559844dae1991eddc9575c4e445ae02d05f0024900c550253293cba7277ed651df613cb2a2e2028486c2b8bc52adc0dedb9d9796c58d8
 EBUILD pwndbg-20220830.ebuild 2437 BLAKE2B 3fe7d16aeeae24d78d437006980bc31f3a4fed5c49a2fb560002710d21e9d8ef113e62369b33320f7a363c25a891f1100d5ed965c69a296d5d6a7077e5535b9a SHA512 f75cc09ec1b3ab84ed1fc0cafca1f97d4a0b6e14958408110341a91d7c539aca68c3da9a7568c4ba0e5db72446ea6371ae6408d9db6cc26358ada9a59d341d64
-EBUILD pwndbg-20221219-r1.ebuild 2367 BLAKE2B d1827935bc67787cc532cc559d3022f4cb9c14418ef96df137bf9c09ce7729a5348db7ba4b0455a2b11a46f08266ba1f2682201e08e9e5c0250e3ef8a642ad2b SHA512 49f3edbf9d7c8f9a28e8f4726293ac7d7677a23327d03862c818da91e40062d1cf7a5b01088e8cd01331b872cfad3f0c1348375008eb2adcd5de71f62318d4b5
+EBUILD pwndbg-20221219-r1.ebuild 2366 BLAKE2B 5ad3f881de127a195034ba355028fd81f442458c6fba4a64322309f6a07ec9fd98be2af0ac1b84e082d1916778af42247f2b3d173fdc498d638d406f23f61f38 SHA512 90e270d187ac34312a47c109052ba5179c62aa0a70e395ec59427739b9e91137538f9a11e1af43443203160e566ca7eb72c94ed296a23781cb2f375ccdc93cd1
 EBUILD pwndbg-99999999.ebuild 2368 BLAKE2B d60022004f9951e7aa16810e602ad66c158d4f89e79bfb66e46d7335ee4129355e47697ad5db0558b526a6690224f7e1d1c6e45bfe0ba9b67d8c3b9ff8e54252 SHA512 8c9a910929ece0d118fbdd282abcdc95b44aa56ca4f2394cb6c39e6726931d15cc0d443521433a3931109e12a19d408cef1d4611dab85cf52c8f837883ee0f2d
 MISC metadata.xml 692 BLAKE2B bb74dda183fe35e5873e7cbaa5886dec5beaf082968b16352bcda55f2e14dbdb78ee48d2e0195baa735b0f615b0469f8fd48429c47f4a81d2fc0391cafaade76 SHA512 8a6a9ec3aa03e597d8302a5b1001fbfd569e6efb08157445bedb58ec82b4d7812aad7a852ae3eb0d0f245cbf89c85a357e532855c19e6dbc9d438c16e0bd549d
diff --git a/dev-util/pwndbg/pwndbg-20221219-r1.ebuild b/dev-util/pwndbg/pwndbg-20221219-r1.ebuild
index a7bd8ceb8dcf..84259afcf501 100644
--- a/dev-util/pwndbg/pwndbg-20221219-r1.ebuild
+++ b/dev-util/pwndbg/pwndbg-20221219-r1.ebuild
@@ -20,7 +20,7 @@ else
 		https://github.com/pwndbg/pwndbg/archive/${MY_PV}.tar.gz -> ${P}.tar.gz
 		https://github.com/martinradev/gdb-pt-dump/archive/${GDB_PT_DUMP_COMMIT}.tar.gz -> gdb-pt-dump-${GDB_PT_DUMP_COMMIT}.tar.gz
 	"
-	KEYWORDS="amd64 ~x86"
+	KEYWORDS="amd64 x86"
 	S="${WORKDIR}/${PN}-${MY_PV}"
 fi
 
diff --git a/dev-util/rocm-smi/Manifest b/dev-util/rocm-smi/Manifest
index 108e10e63802..3fc688094598 100644
--- a/dev-util/rocm-smi/Manifest
+++ b/dev-util/rocm-smi/Manifest
@@ -1,8 +1,11 @@
 AUX rocm-smi-5.0.2-gcc12-memcpy.patch 605 BLAKE2B 8dcf4c74b9f1ccf832d71cc8b54d50aa1c7c2978bd70c359875548b753bcf52b54bfefe30b34aecc211499c9b46a9b0e62661ef8725c1c1ef3cde81da669b581 SHA512 7a39dcae0fd99fc82b92fca0a9080d42f9378065f120712132a42841ed67c056ff469e3b13760181f5d96861c1169fe8c6f0426e5351e5b67d6439605a11c41f
 AUX rocm-smi-5.1.3-detect-builtin-amdgpu.patch 983 BLAKE2B c1d926ce5ce1bef272f718f1f37869e5432993ca016ff7278cc14d7744d61efc813ee100e462bb9bb1bd61975fb620e82eaab37abe94bf415a9e40815919f59a SHA512 cd22af4b79ef366d10a36d663faf89c60a618aa9394fcac96d3521a9b9d1d270d20e216d918f18222930d883a8e2c72588ef97ab5a60086eed950a0ccfc7cddb
+AUX rocm-smi-5.4.2-detect-builtin-amdgpu.patch 1071 BLAKE2B 1957d49b0c3c1f9db24add59b8dd464c6ce8571ded2601cb259a0686938e4fb718b6affd99c366f6e8aa360f53034c0e7c231dd3518bcab84bb8d5a755c4ebb5 SHA512 a531b3ae4b73dcd03e6f3de3da4dbf1250e6a6d05ec052fa8ff412f65233b5fcd418a7128f9b913aa71e1bbf970ba5b74c7b407a0654e1030f695e7f13ebd5dc
 DIST rocm-smi-5.0.2.tar.gz 1677784 BLAKE2B 28e136a8b3c630ed7d5b514ad5bf985ff540df8e1fc2378b855032a6ebd2bcbcd4aab5e8a5a9e6462eacd2ac9ada0b8940aed582ce118d1066bded115af42e22 SHA512 bbad2bbebb81de42a15d8aa48e4751dbf9b8f9ee74633d16828f6977fadff35e9db0b7c9ee465a61c40a3e8f2f0f99b79cd5c5b142785cf61958d432f13d7f05
 DIST rocm-smi-5.1.3.tar.gz 1701386 BLAKE2B c5e779f5c33fec0b1b39b09c758dfadd3c24e28f15381593f2959e5c2fb9f49af3a7ca1f9ab7d6bf34c5af4fbe3f0c0ae20c6c049cbf9421a9184735bb4a64a2 SHA512 7bf7af2b42a035c298c2f9009b6123671af41f9ca1a50607cfa362f39dbd82ff88f8c13ece6c4edab585edadd9072ed096a400dd3850851e1beef3633a8eb14e
+DIST rocm-smi-5.4.2.tar.gz 1553259 BLAKE2B 0560e115028caafb1d5dd8892cfa677431b792714ecd8c75f31451fa7685d1c7070cbd687c894d7eefd112de5e2df9aa7895aa57821db207dffc4e8890898638 SHA512 0fd651593df0ebbcb2c2327d030d2674efacdb6e883daa5a8adf733db2bde3e5d16dc304856221f4bb07a3cd834944ffcc7ebd689624f7ba24ffd6c262ba74b8
 EBUILD rocm-smi-5.0.2.ebuild 1792 BLAKE2B 9a62e39ff01e7db4aa644d801d357685af916e70d3e9e9a2eb955277125bbad9ed80645a9398a2f666eafd5212de0b8705a2edc66e0994b15565710bf26e25ef SHA512 bee3dcc8be502c1e103aa17236144b2cc15dea47bc5764178978d41edd727c242c5a524142f6c2c1ab234d38d3551cdc57330e2a6a83fabce44835be55f65cc6
-EBUILD rocm-smi-5.1.3.ebuild 1847 BLAKE2B 90d7228651a4b654f7f3feb5d5a8d2df1a9ef50e77acf287a7cdff68bae007e4e6d4ddd8e9f9de75a78433d4e78c8ba52b60a6de556e2906f624794759b58d9f SHA512 3355d38aa70c761c99cbece2d1f3109d7b2f17d1a60327a891475899b25aee169970b4ccaf1b4236737127a5db49ec3469d495f3073b5c1ea3bce9a4be2364ee
-EBUILD rocm-smi-9999.ebuild 1705 BLAKE2B 82dc6c969a80f06b10e0175efa7fb0b28f7a1acece3d7b19b092cb78f06a2e376782f3fec0ac849421a974baf3c9e7fc9775a08d0ab3a173ca4e63c3f689b0c1 SHA512 07efc2a0abbdb8c884659ca86ef5efafd8610fced923ee9b36494d6ddd3839df9991f364ef22d5e80f66dcc656f4e13a194aad67cc5d49b53b255de63fa6e9f2
+EBUILD rocm-smi-5.1.3-r1.ebuild 1850 BLAKE2B ca355e03af98c2af6426ba44e7282d346a5b668c8b9139d2e574bc87e8c2e2641227be849398d956cc9fa12d094016d6c6979849a6ef1c4fa0379c5b8839b3e9 SHA512 b3617a2c4bbfe9287b399d9bbbca898ac0b2fd977fd624f5357e74212a30915c28c7b3b8d656b02743a197d9ec5541e684a6aef24cd84815d12651adc46cc4a4
+EBUILD rocm-smi-5.4.2.ebuild 1454 BLAKE2B 1025768cbe75bb5d815631868c8d9f72ba6dd19a2a0483b0f6fa992a89af4b018731ab247df3679bb836e88e961d80cc94f6550dab70dc00ba25e3d642f5af74 SHA512 5e124efaa71e74ab5b5063244d757f8e9eddc22dbf10d1878c1a5d7ad04dbc88b366470596d4ee48bb489b26bb30e90f8fab51ca756fa0315e5a673971ae8d7e
+EBUILD rocm-smi-9999.ebuild 1454 BLAKE2B 1025768cbe75bb5d815631868c8d9f72ba6dd19a2a0483b0f6fa992a89af4b018731ab247df3679bb836e88e961d80cc94f6550dab70dc00ba25e3d642f5af74 SHA512 5e124efaa71e74ab5b5063244d757f8e9eddc22dbf10d1878c1a5d7ad04dbc88b366470596d4ee48bb489b26bb30e90f8fab51ca756fa0315e5a673971ae8d7e
 MISC metadata.xml 661 BLAKE2B ed6ec563956132012b44907f348091135c7a463fc47a51ac0726e7749da9a4c33811df87442e576fb510799a50c14949cd20c8ca10a5850ee941a8794b70ef7d SHA512 c047963068b4ccefb73539ecd91b4c3310f0863a674acb15e9843dda7f0c917616dc8cbfe5f859e42d9ee25323bf1b66b1ce7fbe9a2e8292963ac38aa0bd72f3
diff --git a/dev-util/rocm-smi/files/rocm-smi-5.4.2-detect-builtin-amdgpu.patch b/dev-util/rocm-smi/files/rocm-smi-5.4.2-detect-builtin-amdgpu.patch
new file mode 100644
index 000000000000..1c406c7d042c
--- /dev/null
+++ b/dev-util/rocm-smi/files/rocm-smi-5.4.2-detect-builtin-amdgpu.patch
@@ -0,0 +1,26 @@
+Detect amdgpu module for amdgpu-builtin kernel
+From dc2a4b5b256692e1a6ecef45210682c316b961e0 Mon Sep 17 00:00:00 2001
+From: YiyangWu <xgreenlandforwyy@gmail.com>
+Date: Sat, 2 Apr 2022 16:40:11 +0800
+Subject: [PATCH] Check /sys/module/amdgpu for ROCk instead of lsmod
+
+Closes: #102
+
+Signed-off-by: YiyangWu <xgreenlandforwyy@gmail.com>
+---
+ python_smi_tools/rocm_smi.py | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+Index: rocm_smi_lib-rocm-5.4.2/python_smi_tools/rocm_smi.py
+===================================================================
+--- rocm_smi_lib-rocm-5.4.2.orig/python_smi_tools/rocm_smi.py
++++ rocm_smi_lib-rocm-5.4.2/python_smi_tools/rocm_smi.py
+@@ -66,7 +66,7 @@ def driverInitialized():
+     """
+     driverInitialized = ''
+     try:
+-        driverInitialized = str(subprocess.check_output("cat /sys/module/amdgpu/initstate |grep live", shell=True))
++        driverInitialized = str(subprocess.check_output("test -d /sys/module/amdgpu", shell=True))
+     except subprocess.CalledProcessError:
+         pass
+     if len(driverInitialized) > 0:
diff --git a/dev-util/rocm-smi/rocm-smi-5.1.3.ebuild b/dev-util/rocm-smi/rocm-smi-5.1.3-r1.ebuild
index 90b2396a727d..f2b4fc660707 100644
--- a/dev-util/rocm-smi/rocm-smi-5.1.3.ebuild
+++ b/dev-util/rocm-smi/rocm-smi-5.1.3-r1.ebuild
@@ -57,6 +57,6 @@ src_configure() {
 
 src_install() {
 	cmake_src_install
-	python_foreach_impl python_newexe python_smi_tools/rocm_smi.py rocm-smi
+	python_foreach_impl python_newscript python_smi_tools/rocm_smi.py rocm-smi
 	python_foreach_impl python_domodule python_smi_tools/rsmiBindings.py
 }
diff --git a/dev-util/rocm-smi/rocm-smi-5.4.2.ebuild b/dev-util/rocm-smi/rocm-smi-5.4.2.ebuild
new file mode 100644
index 000000000000..bc4f8b802371
--- /dev/null
+++ b/dev-util/rocm-smi/rocm-smi-5.4.2.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit cmake python-r1
+
+DESCRIPTION="ROCm System Management Interface Library"
+HOMEPAGE="https://github.com/RadeonOpenCompute/rocm_smi_lib"
+
+if [[ ${PV} == *9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/RadeonOpenCompute/rocm_smi_lib"
+	EGIT_BRANCH="master"
+else
+	SRC_URI="https://github.com/RadeonOpenCompute/rocm_smi_lib/archive/rocm-${PV}.tar.gz -> rocm-smi-${PV}.tar.gz"
+	KEYWORDS="~amd64"
+	S="${WORKDIR}/rocm_smi_lib-rocm-${PV}"
+fi
+
+LICENSE="MIT NCSA-AMD"
+SLOT="0/$(ver_cut 1-2)"
+IUSE=""
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+DEPEND=""
+RDEPEND="${PYTHON_DEPS}"
+BDEPEND=""
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-5.0.2-gcc12-memcpy.patch
+	"${FILESDIR}"/${PN}-5.4.2-detect-builtin-amdgpu.patch
+)
+
+src_prepare() {
+	sed -e "/LICENSE.txt/d" -i CMakeLists.txt || die
+	sed -e "/^path_librocm = /c\path_librocm = '${EPREFIX}/usr/lib64/librocm_smi64.so'" \
+		-i python_smi_tools/rsmiBindings.py || die
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr"
+		-DCMAKE_DISABLE_FIND_PACKAGE_LATEX=ON
+		-DFILE_REORG_BACKWARD_COMPATIBILITY=OFF
+	)
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+	python_foreach_impl python_newscript python_smi_tools/rocm_smi.py rocm-smi
+	python_foreach_impl python_domodule python_smi_tools/rsmiBindings.py
+}
diff --git a/dev-util/rocm-smi/rocm-smi-9999.ebuild b/dev-util/rocm-smi/rocm-smi-9999.ebuild
index 16c82ecdbbe5..bc4f8b802371 100644
--- a/dev-util/rocm-smi/rocm-smi-9999.ebuild
+++ b/dev-util/rocm-smi/rocm-smi-9999.ebuild
@@ -3,9 +3,9 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{9..10} )
+PYTHON_COMPAT=( python3_{9..11} )
 
-inherit cmake multilib prefix python-r1
+inherit cmake python-r1
 
 DESCRIPTION="ROCm System Management Interface Library"
 HOMEPAGE="https://github.com/RadeonOpenCompute/rocm_smi_lib"
@@ -20,7 +20,7 @@ else
 	S="${WORKDIR}/rocm_smi_lib-rocm-${PV}"
 fi
 
-LICENSE="NCSA-AMD"
+LICENSE="MIT NCSA-AMD"
 SLOT="0/$(ver_cut 1-2)"
 IUSE=""
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
@@ -29,28 +29,29 @@ DEPEND=""
 RDEPEND="${PYTHON_DEPS}"
 BDEPEND=""
 
+PATCHES=(
+	"${FILESDIR}"/${PN}-5.0.2-gcc12-memcpy.patch
+	"${FILESDIR}"/${PN}-5.4.2-detect-builtin-amdgpu.patch
+)
+
 src_prepare() {
-	sed -e "/DESTINATION/s,\${OAM_NAME}/lib,$(get_libdir)," \
-		-e "/DESTINATION/s,oam/include/oam,include/oam," -i oam/CMakeLists.txt || die
-	sed -e "/link DESTINATION/,+1d" \
-		-e "/DESTINATION/s,\${ROCM_SMI}/lib,$(get_libdir)," \
-		-e "/bindings_link/,+3d" \
-		-e "/rsmiBindings.py/,+1d" \
-		-e "/DESTINATION/s,rocm_smi/include/rocm_smi,include/rocm_smi," -i rocm_smi/CMakeLists.txt || die
-	sed -e "/LICENSE.txt/d" -e "s,\${ROCM_SMI}/lib/cmake,$(get_libdir)/cmake,g" -i CMakeLists.txt || die
-	sed -e "/^path_librocm = /c\path_librocm = '${EPREFIX}/usr/lib64/librocm_smi64.so'" -i python_smi_tools/rsmiBindings.py || die
+	sed -e "/LICENSE.txt/d" -i CMakeLists.txt || die
+	sed -e "/^path_librocm = /c\path_librocm = '${EPREFIX}/usr/lib64/librocm_smi64.so'" \
+		-i python_smi_tools/rsmiBindings.py || die
 	cmake_src_prepare
 }
 
 src_configure() {
 	local mycmakeargs=(
 		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr"
+		-DCMAKE_DISABLE_FIND_PACKAGE_LATEX=ON
+		-DFILE_REORG_BACKWARD_COMPATIBILITY=OFF
 	)
 	cmake_src_configure
 }
 
 src_install() {
 	cmake_src_install
-	python_foreach_impl python_newexe python_smi_tools/rocm_smi.py rocm-smi
+	python_foreach_impl python_newscript python_smi_tools/rocm_smi.py rocm-smi
 	python_foreach_impl python_domodule python_smi_tools/rsmiBindings.py
 }
diff --git a/dev-util/strace/Manifest b/dev-util/strace/Manifest
index e7d71564d93c..5573950067ab 100644
--- a/dev-util/strace/Manifest
+++ b/dev-util/strace/Manifest
@@ -8,6 +8,6 @@ EBUILD strace-5.17.ebuild 2448 BLAKE2B 99b2514d006878e750d31ea9711581fb5d1980f30
 EBUILD strace-5.18.ebuild 2344 BLAKE2B 2c55a36cfa70076014cbf0ae1c80768193367c71d3e8c123570707f7adbda59dec9fac4699e3c706c1b6a0ba993605434321b032b938c135b0030da5e64fb80d SHA512 dfdac81e07edb2e8ad236a92348fb68feb67a5fa644f7ea0f08aa0345eda737847d67249982595774c44b5934d00d86413630edf9371a604bb461f7bd4ef786f
 EBUILD strace-5.19.ebuild 2447 BLAKE2B 88535b5906a24d4b2ccf26777e4a9fddc382187721598b44a6092e6ca7087601e2895575ba0046bd78c1caeeeface1dc52883b7fb30e266129b40bb5ea19b8df SHA512 c29e74848ff20d686ff02acbec5e08a9ad55d5f1970bc30779fde8e609ba88688fee69d6a63e6607c1da32b53676995f29adea9e81498e3feeaeaa0bb7fe6b16
 EBUILD strace-6.0.ebuild 2442 BLAKE2B 6cb1e240ee130494e165598f3ab853c0f2541365533ec5ee2b2e17bdc4e7b235ab32e2095699a69f461c2818c653975085604304d875134f1b9958ad11b44e49 SHA512 9a94e1bdeb02a857cba180f2ee23bd0b7c8031f5a533ce496396ed7011e85ae7ac6c96dd6919dab4e8ae70a8cf6c37ec5e07ad142e6f60d86899db7c6fe4a0a3
-EBUILD strace-6.1.ebuild 2440 BLAKE2B 2b70019173164e4a594b46ca9ea429cc562d56726267405d44e80ffe09c8dbfd8746a822b0e50434c75ebadbde02ded8af12f9fc9d73485be471c55b78de670b SHA512 33bbc0b1560b1acf0d0c6ed681cfcf90bf104638ff2182176eabccfde252022b76e43cd1351b599cc7be4a7adad7c8e355707d3a340742b2c8580f4ce965e5b2
+EBUILD strace-6.1.ebuild 2436 BLAKE2B dfc6236fdbcecb91b5cb366b6a2de418670fd82c31cc402e157b5dda9c07181c9ac1cb39a7842ec8f171ff899aa046ca566e0f52c3b9d3d8f4e0c1d6d4d09e7a SHA512 82f3e8e5e3f5001bcb1cd45a9ddcfc0840944817f82d9d2754e0cfef1bc052bdaaaa05b8a5f7d516cd760b9f98dca753f18bd88bcb9f7770da12b7ac97258604
 EBUILD strace-9999.ebuild 2442 BLAKE2B 6cb1e240ee130494e165598f3ab853c0f2541365533ec5ee2b2e17bdc4e7b235ab32e2095699a69f461c2818c653975085604304d875134f1b9958ad11b44e49 SHA512 9a94e1bdeb02a857cba180f2ee23bd0b7c8031f5a533ce496396ed7011e85ae7ac6c96dd6919dab4e8ae70a8cf6c37ec5e07ad142e6f60d86899db7c6fe4a0a3
 MISC metadata.xml 779 BLAKE2B 89b4360e876fbb34a7a766a57ba9ca088a5e03e9ef66fdbe0a2b15df4cfb625daba11dc76920dec405b97cb87df49fd3c9edc0e184e73262b14b616af36fa4dd SHA512 88b2d94fd6efebaa617c8344bff3997f31c6262b9376cbce014bf7f6225f02bd8ee7bcaf98df4477435319bbb92addcdb6756e5d37a137a863f0bef1ecc5fced
diff --git a/dev-util/strace/strace-6.1.ebuild b/dev-util/strace/strace-6.1.ebuild
index 4f2c696b7282..92851213887d 100644
--- a/dev-util/strace/strace-6.1.ebuild
+++ b/dev-util/strace/strace-6.1.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == 9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/${PN}/${PN}/releases/download/v${PV}/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 fi
 
 DESCRIPTION="A useful diagnostic, instructional, and debugging tool"
diff --git a/dev-util/valgrind/Manifest b/dev-util/valgrind/Manifest
index 3d2de0a5e90e..5091d5511202 100644
--- a/dev-util/valgrind/Manifest
+++ b/dev-util/valgrind/Manifest
@@ -9,7 +9,7 @@ DIST valgrind-3.19.0.tar.bz2 16403296 BLAKE2B d3ccd25789ec4d87a0ddab58d8098246a3
 DIST valgrind-3.20.0.tar.bz2 16469274 BLAKE2B 8217dcfc185c7f6601fedd8d53bb35d260b985b8049c8c73a26151db6650b1607e8e53b614652c40962ea7382b9301c4b234a933c8d81f57e649ebf3f703e630 SHA512 d6bfb9284d0410134ee7e2a5975b13c01508dd5587b562947d8197b3c113b76fdfac88c4072948be68bbf0dbeb17b4d1acb1412ce898adaa83c30ae2c6a1c12b
 DIST valgrind-3.20.0.tar.bz2.asc 488 BLAKE2B 12642e4f85c7b17bdb892221f74d80ce919554ffde3cdfa79ca27f4c5f8b48dac699084b8296b5cea285b5af660a0bc51c42b108a725be60002b14f0fda7eac7 SHA512 70dd20f15b159ffbf016c118046ee42160dd867415f1c565a92995952b1720ec36fc48557f6b523d28e6f675d62df10a4022e900fa4a104626b9e6ed6fe9ad6d
 EBUILD valgrind-3.19.0.ebuild 3954 BLAKE2B d8d02f214a8c371c7636d9c39ad30e341926028cc77d983f7c99d576a47904499522808c70b03c374b98a19c0df9e4965e60594a52d61b17c01efd35f192df75 SHA512 ce5e9ae78091d0437149aabfe690f3ecd15c18f78318133c08256625846d20e577ba6ed68f5f2773e2bba8cb70e1674e4e22051abb1466d47116d674189da032
-EBUILD valgrind-3.20.0-r2.ebuild 4321 BLAKE2B 4637a8f0c0ce87bdcf4a737c3cd22c1baaaa3734d394043a562aa168d1c8b79d5c7d57fc3179c739c517b4cfcca82169490621e9214ca0fe4df8405524721bac SHA512 70883c072b620a776e3e598751cb770621c00ccf9ad8a317e597eace07077e7e622aa33a3178ee3773e73b36dde3cd878f10ca289beabed6cfdd508b84ae5cad
+EBUILD valgrind-3.20.0-r2.ebuild 4315 BLAKE2B eec52fec10cbb7e16111cc4bb166f91bcc29a81e4d0f23be8fcf09a04c127cf7da58a82880e65fb0d403d007886e7ce87a62ce57b238ca15c5be8c0915a50d8a SHA512 d1867e12e9196f2a493096d82eb01ba967970993e9d68c7dd31913d93d0ee5488eb240544bd4a8e841cb54bcac847846098dc66a0468d47bea573239fd26583c
 EBUILD valgrind-3.20.0.ebuild 3952 BLAKE2B d60d14a52fd07b3deef8cfb9b909919bc4d495b5adacbaf676f6ff31f847ca1389e1b7b9cc1735dc2a54386e592bc90f60edadc61953302db616bb459913ba9b SHA512 71e4d9fe16ebee33d03e10c2933cf9a3ce4a49178560ae4e2a252d49df526ebf9fadb6477331e1e104f4b77e2fef5b3b862fe376f804f401f75253180701da5d
 EBUILD valgrind-9999.ebuild 4230 BLAKE2B e371ed0bfedc19162d814b3939e270405ccc68b49f59e40d92e237d692cfaa2f2fded8d3985887150da212d7f8594453eee70b861b1c057a242550d62903a2e8 SHA512 4d49d8ae018ddc0c0cfab9d30a135554eb31f59f01c4aa0b3b344fd02fae9f9b1cd5576ffdfe084ba894d2ee9c5842f8d5c7b821d093833458914b030712eb07
 MISC metadata.xml 1150 BLAKE2B 05b2508ff61ac0659472f75ab074a5f0cc82a3ead6e9bd6e779984bf11c8257afcadd5734b0c34defa5739f1eb0dadeb2168a448c0482848d8d7bf8b598d5dff SHA512 80841b7058fee9293b9bddeb4ed2b1d2b53b4957d43973d9d748e9797c5a5a4b50f7377d9e6bdf31cc1a0c87702327e02568a15e3e354f1fa6cf280eb439b317
diff --git a/dev-util/valgrind/valgrind-3.20.0-r2.ebuild b/dev-util/valgrind/valgrind-3.20.0-r2.ebuild
index 380fc17ef55f..4c27c1d3c9b1 100644
--- a/dev-util/valgrind/valgrind-3.20.0-r2.ebuild
+++ b/dev-util/valgrind/valgrind-3.20.0-r2.ebuild
@@ -15,7 +15,7 @@ else
 	inherit verify-sig
 	SRC_URI="https://sourceware.org/pub/valgrind/${P}.tar.bz2"
 	SRC_URI+=" verify-sig? ( https://sourceware.org/pub/valgrind/${P}.tar.bz2.asc )"
-	KEYWORDS="-* ~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
+	KEYWORDS="-* amd64 arm arm64 ppc ppc64 x86 ~amd64-linux ~x86-linux ~x64-macos ~x64-solaris"
 fi
 
 LICENSE="GPL-2"