gentoo auto-resync : 28:09:2024 - 01:25:57

14 files changed, 134 insertions, 31 deletions

diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 0639eaa6c107..99064bfa286e 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/android-studio/Manifest b/dev-util/android-studio/Manifest
index 7e0f1c8595a0..3ba3ab405daf 100644
--- a/dev-util/android-studio/Manifest
+++ b/dev-util/android-studio/Manifest
@@ -1,3 +1,5 @@
 DIST android-studio-2023.1.1.22-linux.tar.gz 1153989524 BLAKE2B 4dfd857543018c8a4584c4e2fff557d243a757ebe5974e915b3ea73a2a163fdb022e9e2bebc7a40ead74b6f2dccdd65a0bd796f45ffc43b598688d66533bb459 SHA512 f60495cc27cb70d240d8cf5f2c26009b50f91a75b807a53ee95f23dc8753cf569ed429ab351b7d64e8bf3b80c132e17a4ee2ee89602c4b564503cecf042a0297
+DIST android-studio-2024.1.2.13-linux.tar.gz 1236270079 BLAKE2B df145896887ac8a9cfe84172fbd097fdf4473eec04f829235b2e10773097441e752826afaabf715418d8de45ef007522833ab2a72c7f30770cce3f508b51300f SHA512 fd28fcbe11acabf6035ffebc861dde3c4dcb741f4d8bf067980762d0efb401303766a9b79c854c087e3772f76aca200332aa3f6eccf51543ddbc21a00dab3f88
 EBUILD android-studio-2023.1.1.22-r1.ebuild 4329 BLAKE2B 21d12a2f112828cf36ba33d1f58cdc0d2def5a1002b21fc76ed8bc9a93483303e8f8e96b37a825bdd835037e2cbad095c235f1f580d0b791f036626495c5149a SHA512 118f1d785a025556ff64afc38e67ad6b38721840935ff9e30ddaa392bd8748cbc1d29d0d46122a334906f84a6d1ddacc172eec6e60793a046fb67ed7be70b7bf
+EBUILD android-studio-2024.1.2.13.ebuild 4356 BLAKE2B 5e187be7b5237c28c53b1d9a05ba2cf098fe835ccc7f151ef800aaea388a92dc00609687a5d0fbe5875f27e9238d64165573d13f29df7be460314fad7ea9975e SHA512 e2449c9f7b9318961f47f5cc3477f923da017c4c99f0c5c1f046359ae1a238258076c66d912668657433711318acf46e9ac248f987966658af1a020ad16e575b
 MISC metadata.xml 298 BLAKE2B 8f13e01e8c5a24c9af764e8882e2d5677ebf485cad143f35720ede0d491f2c09fd009ce48433cd33f863fb618d6413eac97e07a6d3526f5c8e679d9e51995908 SHA512 2c9d3c5d14e2499fac58df1d3cb2844172833f371fe4d557791efc0848b879191bca36aa772792cea6edd8f6e3be83452a188c0db043906a46c87af0dcacd4e2
diff --git a/dev-util/android-studio/android-studio-2024.1.2.13.ebuild b/dev-util/android-studio/android-studio-2024.1.2.13.ebuild
new file mode 100644
index 000000000000..836e5a4556d1
--- /dev/null
+++ b/dev-util/android-studio/android-studio-2024.1.2.13.ebuild
@@ -0,0 +1,122 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit desktop wrapper
+
+QA_PREBUILT="
+	opt/${PN}/bin/*
+	opt/${PN}/jbr/bin/*
+	opt/${PN}/jbr/lib/*
+	opt/${PN}/jbr/lib/jli/*
+	opt/${PN}/jbr/lib/server/*
+	opt/${PN}/lib/pty4j-native/linux/*/*
+	opt/${PN}/plugins/android/resources/installer/*/*
+	opt/${PN}/plugins/android/resources/native/*
+	opt/${PN}/plugins/android/resources/perfetto/*/*
+	opt/${PN}/plugins/android/resources/screen-sharing-agent/*/*
+	opt/${PN}/plugins/android/resources/simpleperf/*/*
+	opt/${PN}/plugins/android/resources/trace_processor_daemon/*
+	opt/${PN}/plugins/android/resources/transport/*/*
+	opt/${PN}/plugins/android/resources/transport/native/agent/*/*
+	opt/${PN}/plugins/android-ndk/resources/lldb/android/*/*
+	opt/${PN}/plugins/android-ndk/resources/lldb/bin/*
+	opt/${PN}/plugins/android-ndk/resources/lldb/lib/python3.9/lib-dynload/*
+	opt/${PN}/plugins/android-ndk/resources/lldb/lib64/*
+	opt/${PN}/plugins/design-tools/resources/layoutlib/data/linux/lib64/*
+	opt/${PN}/plugins/c-clangd/bin/clang/linux/*/*
+	opt/${PN}/plugins/webp/lib/libwebp/linux/*
+"
+
+DESCRIPTION="Android development environment based on IntelliJ IDEA"
+HOMEPAGE="https://developer.android.com/studio"
+SRC_URI="https://redirector.gvt1.com/edgedl/android/studio/ide-zips/${PV}/${P}-linux.tar.gz"
+S=${WORKDIR}/${PN}
+LICENSE="Apache-2.0 android BSD BSD-2 CDDL-1.1 CPL-0.5
+	EPL-1.0 GPL-2 GPL-2+ JDOM IJG LGPL-2.1 MIT
+	MPL-1.1 MPL-2.0 NPL-1.1 OFL-1.1 ZLIB"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="selinux"
+RESTRICT="bindist mirror strip"
+
+RDEPEND="${DEPEND}
+	selinux? ( sec-policy/selinux-android )
+	>=app-arch/bzip2-1.0.8-r4
+	>=dev-libs/expat-2.5.0
+	>=dev-libs/libffi-3.4.4
+	>=media-libs/fontconfig-2.14.0-r1
+	>=media-libs/freetype-2.12.1-r1
+	>=media-libs/libpng-1.6.39
+	>=media-libs/mesa-22.2.5[X(+)]
+	|| ( gnome-extra/zenity kde-apps/kdialog x11-apps/xmessage x11-libs/libnotify )
+	sys-libs/ncurses-compat:5[tinfo]
+	>=sys-libs/zlib-1.2.13-r1
+	>=x11-libs/libX11-1.8.1
+	>=x11-libs/libXau-1.0.11
+	>=x11-libs/libXdamage-1.1.6
+	>=x11-libs/libXdmcp-1.1.4-r2
+	>=x11-libs/libXext-1.3.5
+	>=x11-libs/libXfixes-6.0.0
+	>=x11-libs/libXrender-0.9.11
+	>=x11-libs/libXxf86vm-1.1.5
+	>=x11-libs/libdrm-2.4.114
+	>=x11-libs/libxcb-1.15-r1
+	>=x11-libs/libxshmfence-1.3.2
+	virtual/libcrypt:=
+"
+
+src_compile() {
+	:;
+}
+
+src_install() {
+	local dir="/opt/${PN}"
+	insinto "${dir}"
+	doins -r *
+
+	fperms 755 "${dir}"/bin/{fsnotifier,format.sh,game-tools.sh,inspect.sh,ltedit.sh,profiler.sh,studio.sh,studio_safe.sh}
+	fperms -R 755 "${dir}"/bin/{helpers,lldb}
+	fperms -R 755 "${dir}"/jbr/bin
+	fperms 755 "${dir}"/jbr/lib/{jexec,jspawnhelper}
+	fperms -R 755 "${dir}"/plugins/Kotlin/kotlinc/bin
+	fperms -R 755 "${dir}"/plugins/android/resources/installer
+	fperms -R 755 "${dir}"/plugins/android/resources/perfetto
+	fperms -R 755 "${dir}"/plugins/android/resources/simpleperf
+	fperms -R 755 "${dir}"/plugins/android/resources/trace_processor_daemon
+	fperms -R 755 "${dir}"/plugins/android/resources/transport/{arm64-v8a,armeabi-v7a,x86,x86_64}
+	fperms -R 755 "${dir}"/plugins/android-ndk/resources/lldb/{android,bin,lib,shared}
+	fperms 755 "${dir}"/plugins/c-clangd-plugin/bin/clang/linux/x64/clangd
+	fperms -R 755 "${dir}"/plugins/terminal/shell-integrations/{,fish}
+
+	newicon "bin/studio.png" "${PN}.png"
+	make_wrapper ${PN} ${dir}/bin/studio.sh
+	make_desktop_entry ${PN} "Android Studio" ${PN} "Development;IDE" "StartupWMClass=jetbrains-studio"
+
+	# https://developer.android.com/studio/command-line/variables
+	newenvd - 99android-studio <<-EOF
+		# Configuration file android-studio
+		STUDIO_JDK="${dir}/jbr"
+	EOF
+
+	# recommended by: https://confluence.jetbrains.com/display/IDEADEV/Inotify+Watches+Limit
+	mkdir -p "${D}/etc/sysctl.d/" || die
+	echo "fs.inotify.max_user_watches = 524288" > "${D}/etc/sysctl.d/30-android-studio-inotify-watches.conf" || die
+}
+
+pkg_postrm() {
+	elog "Android Studio data files were not removed."
+	elog "If there will be no other programs using them anymore"
+	elog "(especially another flavor of Android Studio)"
+	elog "remove manually following folders:"
+	elog ""
+	elog "		~/.android/"
+	elog "		~/.config/Google/AndroidStudio*/"
+	elog "		~/.local/share/Google/AndroidStudio*/"
+	elog "		~/Android/"
+	elog ""
+	elog "Also, if there are no other programs using Gradle, remove:"
+	elog ""
+	elog "		~/.gradle/"
+}
diff --git a/dev-util/debootstrap/Manifest b/dev-util/debootstrap/Manifest
index 098ccc9e6385..d445d4f9ff4b 100644
--- a/dev-util/debootstrap/Manifest
+++ b/dev-util/debootstrap/Manifest
@@ -4,5 +4,5 @@ DIST debootstrap_1.0.123.tar.gz 78175 BLAKE2B e507ee76817eef20cfea4e37eaf893f8e6
 DIST devices.tar.gz 47835 BLAKE2B 03bfe097fda12a7a0aa19d3308c0d44382ad945defea05a63b17a72e4051ef94f0e60e75bde35baeace81da59d9f04126f6e463163609475b9c0fdf518f533ef SHA512 994ec8d72e3d52d2d872f7ff0da2336e4cbd3a5fa73bb6cdb9e06f5e7f5b8c69cea639c738fdba1186f382d6dcf62e7746fface664bfbd744aac24b16f034432
 EBUILD debootstrap-1.0.123.ebuild 1167 BLAKE2B a1487aeb97503bc82f671ab669d24be420f1cd2e6ee26a411e1cf7086528ed353ab2be64d5e0fef35cc0f11284ca795ff69ae9f333a425fe961c8e5601ca18b4 SHA512 4d9d2982bbaa2bb3ed008ff779e0a7c2094db0db965345babaea9e324e42867dac4dcb91222c6f3f2373f927f8c1d065fbce8d79e38d23fe0662a674b0b875a0
 EBUILD debootstrap-1.0.128_p2.ebuild 1252 BLAKE2B 35a529cd515516b1ecd75dfb3508a8a7e3fcb320da6842f09b4d97a299c76fb066a5df28e28c0c749f50f15e4dff375739b2550f7b46ab93fbdd510fcd72179d SHA512 77ba69a979c5eeeed5c5c6f55df94c0944fcded1ec06fee8178e1e5c75bf75dcb38e93603184731862f2abb581c1c5591736142a39f9a3e815d0c07475a937c8
-EBUILD debootstrap-1.0.134.ebuild 1259 BLAKE2B 5734a665abccb6aad6a9bf6c690de3edd0e34b1e27640ee41794a2aefe32e2a1a8c9f11911cdb1da775e2e5a4db30470d5e79a49f2aaff6ddde9abcf0b1ca70e SHA512 1250e2b6d9b4ccd9c4392d26ba750f6f99bce2fadc61b513829c5a5f90439b7abf904fd6233f97165cd100a09f3613f422c329854e33ba457e9169d0a1391bd0
+EBUILD debootstrap-1.0.134.ebuild 1266 BLAKE2B b7ba3407365e395cf4ed430ecb811432071bcb8eb6bb8cfc36ed56e9bc9f14a5acbe8c5996410043cbd3f31b9c22e4d73cecf8cbabe6413217281b03a3a4da8f SHA512 2b98d2efc68015ad88a61b6d79e7633e4804a35bcd52d1ef51fbe0fdebc7cdf1d0af7f36ab97a0b3ce7166f638303be2e611d8a2eee6c67f506459aaa9eae46a
 MISC metadata.xml 812 BLAKE2B 6c607eb4a6403cd0b2c92e536d3c74e899c84c7c5a1ab091d09dde27d3a9bfed22d0cce0480de5870af156fe1528836d8d348d502109f32190fd85bf44cec9b2 SHA512 706bf733c643b2e5528c14ab328eb0d137e28fe75ad29eae68898a30bf1eb7330cf89f8bf7cb98c59bb20c6b9a75a36ca8465a3a5e1d731a64ba3803bdb726d0
diff --git a/dev-util/debootstrap/debootstrap-1.0.134.ebuild b/dev-util/debootstrap/debootstrap-1.0.134.ebuild
index f215653cd560..fa925d825877 100644
--- a/dev-util/debootstrap/debootstrap-1.0.134.ebuild
+++ b/dev-util/debootstrap/debootstrap-1.0.134.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://salsa.debian.org/installer-team/${PN}/-/archive/${MY_PV}/${PN}-
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	app-arch/dpkg
diff --git a/dev-util/gpp/Manifest b/dev-util/gpp/Manifest
index 6d84d77c9e36..53f7762906ed 100644
--- a/dev-util/gpp/Manifest
+++ b/dev-util/gpp/Manifest
@@ -1,5 +1,3 @@
-DIST gpp-2.27.tar.gz 66226 BLAKE2B 18490dae11fa295c6a038c6de86919a9b37a10c6008490bd554f11e52916e92e80238bb858c799fa1345419a56b37f9f817cd9c8d0fe221bd8c51b3d12245fb1 SHA512 ad7eaf89796208668143c160bfe764d5b38fb734dfa29869d2b222ce4c1982e8f5eef679960645de51c7d4fda6a18cac4ded55334a62cd16698a42b89aebf71e
 DIST gpp-2.28.tar.gz 66655 BLAKE2B 5ac2fe6abfd623071139a5592d17a963889f566d568f2cb083a307bf60fc94ab528908a08ebdee4f0a7e4a40ca25ee0feb11bd218da9686b984e779e57641aff SHA512 725b521abeb768e06bc58a4c443c80e0aab65a74f4dfaa524399a9d71037d70e1790fed602ec22c3e7d3ffc788a0b03c4c37dd6f483758bf8b306b5d7ef3e493
-EBUILD gpp-2.27.ebuild 446 BLAKE2B 876792343ef218b60b1577d1a1aa56ad6e4c4a54fed72ff904fb25bcc4b88e752bcd5f58240bf1d4b3bf2b46ccf1a7b60872a433c2ab30b677f5086b314ebe64 SHA512 472dcedd7f35ec2fa43f0508f211fd4e6ff05d045df38addfbfcbf22c5b9c8781e66df6ced1e4e68ed01aeb3ac572971a3d66a6f89f3ab0e0551606963e650ff
-EBUILD gpp-2.28.ebuild 452 BLAKE2B 1b477ea9c8c4ba3e5b8a42da71dedb9a3f6885c5e9b6a25118209f6a0102a350b30f3c85c39fd9c9378357af03b65e9d9bf0acc91b66c42306dd372644da6667 SHA512 18126b28cb6b8a0b45b10c437ff0974319467b991428e59d70abf7b05fdb93de6ec19c651f5e65f49f97cb67b279e3818f15b7954fa93da473a5cd7b3d0433db
+EBUILD gpp-2.28.ebuild 446 BLAKE2B 66126df63c687e8655dca715f811316678d76668fd4ad2e6de1055b08781149c73b623386341826cb78e8bd418b8a3ef8827d1133caf66104fd10060ae797fbe SHA512 998d11a49572e75bcb949f176a488b3a95d808a5e7986446521adfcef811e57cab0ccffefedcb494b2a053980ac7a0d934b85736bd553099d72c004c0af5a0a3
 MISC metadata.xml 823 BLAKE2B fe21889c430825056b947677778a7509837b1ba56156c88d18128497eea04adb2c78c396bd3538a4da698b658917590ee88907c4fe969c3d52ca214ca301f253 SHA512 65f205222a6a282b18c617d9ded5ecbff3b4cb08d068794f6141c5db675fbd6b806f0dd1b7f43af0ab31017a363639c4fd053f1c54851da2c0ec5b52b5daddcf
diff --git a/dev-util/gpp/gpp-2.27.ebuild b/dev-util/gpp/gpp-2.27.ebuild
deleted file mode 100644
index 5969c05c483f..000000000000
--- a/dev-util/gpp/gpp-2.27.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools
-
-DESCRIPTION="A generic preprocessor"
-HOMEPAGE="https://logological.org/gpp https://github.com/logological/gpp"
-SRC_URI="https://github.com/logological/${PN}/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="LGPL-3+"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
-
-src_prepare() {
-	default
-	eautoreconf
-}
diff --git a/dev-util/gpp/gpp-2.28.ebuild b/dev-util/gpp/gpp-2.28.ebuild
index 754a44680eec..6845f5c0601c 100644
--- a/dev-util/gpp/gpp-2.28.ebuild
+++ b/dev-util/gpp/gpp-2.28.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/logological/${PN}/archive/refs/tags/${PV}.tar.gz ->
 
 LICENSE="LGPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 x86"
 
 src_prepare() {
 	default
diff --git a/dev-util/pkgcheck/Manifest b/dev-util/pkgcheck/Manifest
index b9a880f218d4..3fc33b6c670e 100644
--- a/dev-util/pkgcheck/Manifest
+++ b/dev-util/pkgcheck/Manifest
@@ -4,6 +4,6 @@ DIST pkgcheck-0.10.30.tar.gz 378098 BLAKE2B f80224d707f7656ca45f58932936e1ce780d
 DIST pkgcheck-0.10.31.tar.gz 379079 BLAKE2B b3e308a8d496c954d649677a41394b1fe1fbab43ce6c629616249306fafaad8e5c2cfa38fc9c838117f7abc381a0c04cea60ba5a2b3ab6a1612bbfc68d858832 SHA512 539cf262c950547dbd85441a7b40e76fcdc0810fdd633ab9042a13c7b19db4826c05ea1bbacf64b50c68884e31fff6a88e6b2baf94b2e6a4b2738123441da6ec
 EBUILD pkgcheck-0.10.29-r1.ebuild 2259 BLAKE2B 0106d3f25f757ae7c9e65cbf78c56411baab534885e67bbf8b368c5425f555e4be0cd8ce992725d53923a3014277d19d3658919d1dc038d9db2c0a6248ad23d3 SHA512 7e18f3e52ce912f0a9d267f3b1482bec81aee58609958f9699015ea22339aa153fcd2a8d49bf62c29e0901b317ea4dfd9c70454acedb176b7875095f5497950d
 EBUILD pkgcheck-0.10.30-r1.ebuild 2254 BLAKE2B 94e3ff89fcc6a8b08b35ad9c46f1e1d54e5f548da3a8b1e7c941d0315852d405a0a6e3c6f9260ac0bc4bbc7f374d94cbd3394c3db098dc7e194152d1c8eb282a SHA512 9e0488bf01869d88c8ac2978bba0cffe8ff96b331b94b2f8ce242fa4e84ba80f98271979fdf3f50bbbb0191fea4d1ee22be92f96fbcdc365f27631b5e79aa27a
-EBUILD pkgcheck-0.10.31.ebuild 2235 BLAKE2B 753d9c855cd97484254d400b597f4917e8e04de71d5b5fab8f259338a6ca0c2b5f73c360f5e4076ace2d56dc23ccaee839abf8ad91b777772ec5838b3d6e367e SHA512 2ea971efaa8869cdd0247264232b2cce08d2d6fc80e82aa8c5ce48371c0079fa62d766e8da90c0988ccee5c7c6f540ce9886f5315f8d701c5e33c5bc4b4957f2
+EBUILD pkgcheck-0.10.31.ebuild 2229 BLAKE2B 9f9d10a9bf6e422e8b9db3ded98d0871cc5ae874ac6ca4ec2f55a655fe378b98035d9d978a3c01eef9732237567499c6f25092a42181c8d9021b6bc4a013191b SHA512 78bf7b1e1f5c23be22fb900c22ecfd39d1a3ef2eaa1cd1c0139b175a43966b2167fdbc763c454881f124206f7d04018371493f48877f83b80a7cb0a600829c46
 EBUILD pkgcheck-9999.ebuild 2223 BLAKE2B 664fee3e5ed354eea1f55e852a6c8038f5eff0fb93ee2efaa3c24103e52246e9737df512f5a86af703174a22fe467aabcad7232701e13bab2423cd7cc2b50553 SHA512 a246781aeed620aa012da683f5969576a7069451ccdc0f036fdbf05c4765527a6169b04afc9f5942b3c6878508430a5117435dd57c1f1ac55cb4c63339a20f75
 MISC metadata.xml 455 BLAKE2B b544db3532ef1da966833d5edbc79988cc1fd85b6d6276476684b49d4485814d6e2d969e742d3633c8176e7f37cae6614dae1654fd1424d71475f022166f6e6a SHA512 5abd1584f486e88992bab8c51c191b4915a5854752130f8a591147ff4b2af2102fdc8ab182e7358c3e4bbb3fdc8400563a250e2dba1793d365f0edc7c5f7c33a
diff --git a/dev-util/pkgcheck/pkgcheck-0.10.31.ebuild b/dev-util/pkgcheck/pkgcheck-0.10.31.ebuild
index 6928104fa39e..37ce36b372ed 100644
--- a/dev-util/pkgcheck/pkgcheck-0.10.31.ebuild
+++ b/dev-util/pkgcheck/pkgcheck-0.10.31.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == *9999 ]] ; then
 		https://github.com/pkgcore/pkgcheck.git"
 	inherit git-r3
 else
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
 	inherit pypi
 fi
 
diff --git a/dev-util/pwntools/Manifest b/dev-util/pwntools/Manifest
index 323e46d66044..b788179939f0 100644
--- a/dev-util/pwntools/Manifest
+++ b/dev-util/pwntools/Manifest
@@ -5,7 +5,7 @@ DIST pwntools-4.13.0.gh.tar.gz 4388643 BLAKE2B 59a50621135e5e0fd247de37f9367d071
 DIST pwntools-4.13.0_beta0.gh.tar.gz 4385937 BLAKE2B 17232ab24139ccc9376f71ea31a1f4ef5a0bbcc0610e868c894c4f79865c44ccd9c029956cf566accddb38b64d2f5a1649113f8163d69fa3c0acf20e21817de7 SHA512 3bed645b6f9e19ef4b625e9a51a33d301e6ad640eeee4d1f647b081d10d34b6eed7f083a89d77da3bd03eac2d9cda462ca380b354de2691e87d0dfc2d74a53da
 DIST pwntools-4.14.0_beta0.gh.tar.gz 4424598 BLAKE2B c4457fbafe8e85a377de36e9889f937310b592f982529f0c6fe79ab2459ffe84aae29e5a2f1d8b8827239607b828eb2c196789b77636ee92d01d0bc45003c6a0 SHA512 eb18d5c6b6008854eeb1698a094c6f42bef0ab07c65e4222dde3ef785c5ea57bd0244038c144f2b597cad83ad173bd73a5af90b7e309a207615976dc8c5c501f
 EBUILD pwntools-4.12.0.ebuild 2028 BLAKE2B 517a26da71bc0e73e0fb6dc970aa05c9fc15445e225829002bee69037d72100866c0d28b1a620056de53b83cf99d36f2c6f5e1d134ee5ef8cb90614848c1eef3 SHA512 4c81a9bc7ccedf507c31265d2156bb89bda5372731cd600be06e732eadffa0b215c6686b3dca39c82e8523b13c7ef06d3feb2addf1ac1b4058397ed272a3c3f7
-EBUILD pwntools-4.13.0.ebuild 2030 BLAKE2B 2ce5e7cc858a274c887d684daec8095b53e1f1d8db324a004b7b6680d0135c41ee564822e66044089cdaf0bac3d7e2ee4987fc503948780330db00bd7841b1bf SHA512 052134d5915c05a463824eda84d412e6a491c23daaa59ff09ac225d0f61b3b4f5608dd4a324c163d12f558c935ae854a7e51fafebe9699fabbf76db71a0bac46
+EBUILD pwntools-4.13.0.ebuild 2028 BLAKE2B 517a26da71bc0e73e0fb6dc970aa05c9fc15445e225829002bee69037d72100866c0d28b1a620056de53b83cf99d36f2c6f5e1d134ee5ef8cb90614848c1eef3 SHA512 4c81a9bc7ccedf507c31265d2156bb89bda5372731cd600be06e732eadffa0b215c6686b3dca39c82e8523b13c7ef06d3feb2addf1ac1b4058397ed272a3c3f7
 EBUILD pwntools-4.13.0_beta0.ebuild 2030 BLAKE2B 2ce5e7cc858a274c887d684daec8095b53e1f1d8db324a004b7b6680d0135c41ee564822e66044089cdaf0bac3d7e2ee4987fc503948780330db00bd7841b1bf SHA512 052134d5915c05a463824eda84d412e6a491c23daaa59ff09ac225d0f61b3b4f5608dd4a324c163d12f558c935ae854a7e51fafebe9699fabbf76db71a0bac46
 EBUILD pwntools-4.14.0_beta0.ebuild 2030 BLAKE2B f2feca7c7ebf4b5e4ee8e1d9f17f40fc508d2a2cb96aa3f24750697862ae561e2392ef9978a3d8f33a0ec00acc893112e27b5350f11588769d3753b3419ba4cb SHA512 c87c889dfb28667e536a43c67cb766f3a52529f2f5dd2cb815ee88f9fda26c463fb474c1049626c0f6deaa4defad71c0d80dbccb58814f209be4c8cbf55bbb41
 EBUILD pwntools-9999.ebuild 2030 BLAKE2B f2feca7c7ebf4b5e4ee8e1d9f17f40fc508d2a2cb96aa3f24750697862ae561e2392ef9978a3d8f33a0ec00acc893112e27b5350f11588769d3753b3419ba4cb SHA512 c87c889dfb28667e536a43c67cb766f3a52529f2f5dd2cb815ee88f9fda26c463fb474c1049626c0f6deaa4defad71c0d80dbccb58814f209be4c8cbf55bbb41
diff --git a/dev-util/pwntools/pwntools-4.13.0.ebuild b/dev-util/pwntools/pwntools-4.13.0.ebuild
index 7811e0a1eebf..3c844a90b542 100644
--- a/dev-util/pwntools/pwntools-4.13.0.ebuild
+++ b/dev-util/pwntools/pwntools-4.13.0.ebuild
@@ -16,7 +16,7 @@ if [[ ${PV} == "9999" ]]; then
 else
 	SRC_URI="https://github.com/Gallopsled/pwntools/archive/${PV/_beta/beta}.tar.gz -> ${P}.gh.tar.gz"
 	if [[ ${PV} != *_beta* ]] ; then
-		KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+		KEYWORDS="amd64 ~arm64 ~riscv x86"
 	fi
 	S="${WORKDIR}/${PN}-${PV/_beta/beta}"
 fi
diff --git a/dev-util/tree-sitter-cli/Manifest b/dev-util/tree-sitter-cli/Manifest
index 477bcae9b266..60c720c22bd7 100644
--- a/dev-util/tree-sitter-cli/Manifest
+++ b/dev-util/tree-sitter-cli/Manifest
@@ -3,5 +3,5 @@ DIST tree-sitter-0.23.0.tar.gz 2977346 BLAKE2B e10846d5bd0a6aa1ecac362e2ab2ccf0f
 DIST tree-sitter-cli-0.22.6-crates.tar.xz 22184056 BLAKE2B f18cfafa9a767fb1b3408dd473d97b2d7a87c9c37a50fb108e164074641e656cc2ca322914f98d627209485cf7b14f92280a50a64cf5136f8375e5870d2b097f SHA512 a3e6eb6585d61c86e32de21c0422c2cd1f95c6116823f5a8ee291f6682658fb7afe5e1369eda4682d4e842d91531b56e6fadb99e4d575230f4c1d65a6b0778ca
 DIST tree-sitter-cli-0.23.0-crates.tar.xz 18131480 BLAKE2B 796a05ed87ce0f248491600bee4af9d14ba6a244ce04d4cda3192226c5063be921e2a4c5e454c91f712f629481c6cca160544a457cf7635c6024d0d10291e3a0 SHA512 98472d6603d973c34f1cafc042219495228693a0fbbe9af920120d8cf27fd78e5263052fb784c79b38e8b27f9b881d18205ebb439de15945c3f10410590ed76a
 EBUILD tree-sitter-cli-0.22.6.ebuild 909 BLAKE2B 5a7d01cf494ae8551e36ba9b1509f5c0bd0b0b86cfaa2377750099988c2e7250924996880fea53a8e1101363646d3a543625b83b01941efc637ced4f5f074f75 SHA512 d45b4ed49fa313db416873451dab644baf65844e9985d9c91e8fa59438003283a48166b23dd73719d52a43c046ee498025daba3ee9b0c4e9349651bdf3cf2011
-EBUILD tree-sitter-cli-0.23.0.ebuild 938 BLAKE2B 085b47f3ae6de1cd2e7d78ce04106e2a551148d7dcd014dcfdbfc7a281e55240c2283b5e586beda19222fe395d1ab47dde182767a78622dd0ca106cbbbaf78d0 SHA512 6d6fa315b57e33f0a500b13367433290c16a15225077bb925232e4d7c38e1ae9825ed5ba78e54898e70c6f79ecbba21038d3b031fb6fcc85481ec2b2a27382d7
+EBUILD tree-sitter-cli-0.23.0.ebuild 932 BLAKE2B aaaae084f3f2f80483f5075b48ace8c81207ff3758c258c210a9f9fb269eb21a42ce0ab11cbc282c4c510dd476924afc95bd4d9ac6759ff93bcb1cc775a79052 SHA512 810e53f134a0d1fc7dbba6e086da9a1d8e5a16604dbc13098d49afcfa4f825cda7561b9ae269dd2d00ebe8c0f35f4098370fbcb6e5c0f4f0a04c509b3caaff68
 MISC metadata.xml 575 BLAKE2B 947ff8b1c885927a6b51e08f761706ecace1c18177e3b455ea25b1cb17eb5c1fbe5aeb6ce68bbffdf626dc968a99f8cf2792356c8e90f27ab8f0fc23d618f09e SHA512 2f19b11f3aff1313d5983697628e1df2e04505611d20d3bd0331d4265cc0f569fd2694a61edb67c6834885e2a61d7d9ef650731a72be04c96d00c574e7d9ba09
diff --git a/dev-util/tree-sitter-cli/tree-sitter-cli-0.23.0.ebuild b/dev-util/tree-sitter-cli/tree-sitter-cli-0.23.0.ebuild
index 1fe76acc30bb..30f2c8ed61b9 100644
--- a/dev-util/tree-sitter-cli/tree-sitter-cli-0.23.0.ebuild
+++ b/dev-util/tree-sitter-cli/tree-sitter-cli-0.23.0.ebuild
@@ -23,7 +23,7 @@ LICENSE+="
 	Unicode-DFS-2016
 "
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 
 # Test seems to require files (grammar definitions) that we don't have.
 RESTRICT="test"