Merge updates from master

13 files changed, 139 insertions, 15 deletions

diff --git a/app-backup/tsm/tsm-8.1.17.2.ebuild b/app-backup/tsm/tsm-8.1.17.2-r1.ebuild
index 8d88813bc04d..de1a9b67bd7a 100644
--- a/app-backup/tsm/tsm-8.1.17.2.ebuild
+++ b/app-backup/tsm/tsm-8.1.17.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -66,7 +66,7 @@ RDEPEND="
 	vmware? ( x11-libs/libXft media-libs/alsa-lib )
 	|| (
 		sys-libs/libxcrypt[compat]
-		sys-libs/glibc[crypt(+)]
+		sys-libs/glibc[crypt(-)]
 	)
 "
 
diff --git a/app-misc/jaq/Manifest b/app-misc/jaq/Manifest
index 03b975d374a1..39050c5fb562 100644
--- a/app-misc/jaq/Manifest
+++ b/app-misc/jaq/Manifest
@@ -2,6 +2,7 @@ DIST ahash-0.8.6.crate 42780 BLAKE2B ce2fb8201a484715d42bbd9ca1bfe2d5f541d90e361
 DIST aho-corasick-1.1.2.crate 183136 BLAKE2B 2d4306d8968061b9f7e50190be6a92b3f668169ba1b9f9691de08a57c96185f7a4288d20c64cb8488a260eb18d3ed4b0e8358b0cca47aa44759b2e448049cbaa SHA512 61ef5092673ab5a60bec4e92df28a91fe6171ba59d5829ffe41fc55aff3bfb755533a4ad53dc7bf827a0b789fcce593b17e69d1fcfb3694f06ed3b1bd535d40c
 DIST allocator-api2-0.2.16.crate 59025 BLAKE2B fda69b52435a7243eb19bc55914a1961e59dbad5ac12c40db39cccdf7a99c742da59c3ef160350808698db24b91e0ce655cd1acedbbcbe20c717604aae23ea5e SHA512 e1eb0df6b44b62115795ebf772f81e9ac0b6d273afd81659dbddb7eb6628b6e5ef6a60ea21413e79ee638afb72e6872ba83a075f6324daf93f2f1eda48daff2f
 DIST ariadne-0.3.0.crate 21829 BLAKE2B 9aa92dab32aaafb131c390206c32b7336f05b1eb5a6eae244db68625cf039830e9ce079faaf6d2d72c9e95a3eb93bb5450bb2915f6f15def13a2d6ec5fac37c0 SHA512 ff00de0667ff8dfabe11086e5bffccaef595924481d6458de5b598bd9362e9f12f103061c2b7faddc3923018e4ed211315ced7d53d4209236bcbc1f923490047
+DIST ariadne-0.4.0.crate 24894 BLAKE2B f53c5b80237c24e02510a66c198534945a9bfe9385b76cd54c7cd63005ffff2f3565a804c73133a1a2ccebb055e3c721ccad40eebf37e07f3423238e1ccbdfbb SHA512 1699be4d7554145d2798f88b1752d3f45efc353c2d311256af751e4dc06bf47d056370e581c16c59657d7696bcf5985bd5a12c1488fce205564ae620d822a344
 DIST atty-0.2.14.crate 5470 BLAKE2B 2db856a9e898a430258f059aeaf7c844a153293e8856d90ac81f7d91a888c89198768ad5cb09303c23241fe85c560a55148fa56a303651a82b0edb895616bfab SHA512 d7b6c4b9a0f898d91ddbc41a5ee45bbf45d1d269508c8cc87ee3e3990500e41e0ec387afb1f3bc7db55bedac396dd86c6509f4bf9e5148d809c3802edcc5e1d9
 DIST base64-0.21.5.crate 77134 BLAKE2B 901cf92d7dd8af2bbb789ffbe60972c1fd295b16690ecebbcb500e4613afa057ab2b294bbafdcaa4007f46412825260a0711d89e55664418a503dde02c8afd1a SHA512 40b1d8470a932c8b7f31717e33bf26742c1bf920caae639b8a992f77e64d5e6d287569742c1348daa25b7325f8ca8d8a312754a743dab3932181f37149d91b16
 DIST bincode-1.3.3.crate 28958 BLAKE2B ea01d2efd8149ecba5e240ed989268b683d542a5f369902d316a4fd1ae4b8edd94e2d4a8cbff0e96646eb29facb04a84b249d74f0781dc3d29c8797ac975aa9f SHA512 49e39d71214dbb623a18e3852f6f2f2a5c3f951b64107d66c8adaa95a442a3283fba978bca41b126c9879b12833b945f478d2c77d35482b3577fc1a894e8e5f3
@@ -28,6 +29,7 @@ DIST instant-0.1.12.crate 6128 BLAKE2B 728923f757c1ee4e4a7afb90e460eed8139206896
 DIST itertools-0.10.5.crate 115354 BLAKE2B f24734bdfedf1dba48554e39b43669efcd4a43656eeb2c511096060daeaf049e1ad3eab232e757057750ce94aabad9fc8a0cf29a997edc6c4b167301c3443391 SHA512 d03c3cfba9841776913bbb6daad0c8945830c155f32ae4b48872e0f937c75a443f0ac9a0355f43b359ff75232f38b15f4f6d446b4be30b00b4209cf66ef770c3
 DIST itoa-1.0.9.crate 10492 BLAKE2B 0d5acef9ae72d3f4b5a387d231952e6025def69da81d38269b4882bc534be7acadc073e526fd8bebdca898a98b2c741735c541e0b6a35ed0f8f8799b906b65b1 SHA512 95f7906edb7d6a2690389167f8c4d01bc37827205bca87d527f2eb33722419ed2f2e8afaa559cc5a0a7e7fac76515c9c44c71c42b536aa34b0e2858c40946b6d
 DIST jaq-1.2.0.gh.tar.gz 83012 BLAKE2B 60a211d5e46ba79f8916606bc8d193fd39d334ab03cc7e133490e61c7c562ebe977e97c1d6d2b607049408bb286f44b9df709e91c1b5a03d2b2f77cd549a93ea SHA512 10b98ea4e147378fbc37b9e76c41dc79b88f65cc446ceb8ad444d8d2c558b4d73b30ecee01cea2dbcd96d8b4b46cb0f5811ae7a71423cce88693cc51f9aba271
+DIST jaq-1.3.0.gh.tar.gz 84115 BLAKE2B 47bac27c23f7d779d92062cf8bc0b747932708cdb93fd9a7e0074f09a54e87de209b5120f194677809b00315be0d24192df89848891e140d7e76a4cc7bc7b15d SHA512 00e3b32dc53036d8437708f48734c136a3c2a219ac84106c65d0bbac5797bac51aa2665064402d7b0efbc8710c859286cec20c5232be3d4e26e1896b968e515b
 DIST libc-0.2.147.crate 686772 BLAKE2B ab2f0c65d071d46b8b88149add1c8429237ef6d9e0563d56ee1adbf23e6147dbb57fb68fbd02498f8ec75327693237a47e5e5259615ce8b0d5ed7a03bbf4fffb SHA512 bfb3c230b59d623b98726f92b7c3f897b47ba3d22fe9834c15f5b4c1b662289aba35a0ae3acfc704ad74696db8c691ee007b9cc6fa03ae65a18eb6bedc81931e
 DIST libm-0.2.8.crate 113450 BLAKE2B fc4a55ecc0d4a558b9014b58861341887679c696af6b6539c7cdb70c033c63219b24f6f30cb8d9b335d15e3af42be6f3a6bd719e189667ca0c43ac818730b674 SHA512 753df71bb2c838abbac360db2e4400c2d931185ecff993da51a979870f2c3f7ac017380fadee4622102fb4b37ebcc1960b0cbd295afc9cd1cb3307524e1f39c5
 DIST libmimalloc-sys-0.1.35.crate 184695 BLAKE2B 13d7793a67c6e2bf2377af59818c2e109e7b9f6d6415089970626b614bb33e96fd30bc962f820d5bb2beeefae6e155a30b7584e7027e3187f088c190eb8115f7 SHA512 7f9ef551d23d7e22073cf9d8593103a4ca17cf82b65b2bc1404dbfc2cec46c4f305ad9dfda9ca1c61e7ff3a617196c6798f505d62c90552dd25b4ba0c05e5847
@@ -69,4 +71,6 @@ DIST winapi-util-0.1.5.crate 10164 BLAKE2B fc800aceae5249a858c806c3e969ef2545766
 DIST winapi-x86_64-pc-windows-gnu-0.4.0.crate 2947998 BLAKE2B 2ad1ea8b5fa07d544e910ccba043ae925269b76b26c9da356305b34b86741dd8b9aff0b9ffe3d562db4fcd7d7c46a11ce9e3168b782b1d89ae6881742b7ede82 SHA512 4a654af6a5d649dc87e00497245096b35a2894ae66f155cb62389902c3b93ddcc5cf7d0d8b9dd97b291d2d80bc686af2298e80abef6ac69883f4a54e79712513
 DIST yansi-0.5.1.crate 16525 BLAKE2B 3b5a93b98293daae72f53bf3f13bfc05feba8d5b27921f79595f7448fbcb9a0dfa6cd70f467c5735b914c46b7d3592e6cce080c540a458a904308525eb3aa839 SHA512 7b33005a066cc612408a65df6533e8718d1de43efc0fd57416a19dc2b811497570e6e18f100fb26073565e395e711518c27de7d644ae64777713f1a102eb16d2
 DIST zerocopy-0.7.20.crate 121557 BLAKE2B 24e63690b03c5becade47aa7ed16ef7a3d482c4cc8d0dfcf470f01f7592e3a704e4c52f0ab361b6fca4af18f977e33ff2bb4feb64d13daa1fcb62af9f9731be5 SHA512 fc3f883e4cfa38d01443841242a64575e69fb2ce0cfcdd71a28dd4ccb95e383ea1839a199fb13a58f9faf7608720a38cb0537612d7d832c3582946ee638886a0
+DIST zerocopy-0.7.32.crate 151096 BLAKE2B 12c7c329ec0e0865467af08306ff4b55ce1e39fd77b094ee48ed9c6e266dfa807bda9ea72a3f7ea989916327f4d9e803d8868995728bfe2fb1c2dc1e5ecff78e SHA512 6729b05eb88029555b88c75feff4f8bc28ad9675edb02b07486381f775c8650c95e2e59612906bd9c34c5e390fd339857ca91573ee9f9ca7948572cff4171c82
 DIST zerocopy-derive-0.7.20.crate 528379 BLAKE2B 247ab986cb720903df383429a6785c7dec230f6888246a9a7539a1bc8061601b27cea8baf4db2fab491fb32842901466ac32cc80504b3eaf35c25cd1a27ec9e8 SHA512 3c76100c3c9c1a5aae39750448f8ed37069be8e65cc74d67cc983c7e69988581f98248183955294e7c8d044c7a968b6e6534b8f84d9969693cbe4c5f679d5818
+DIST zerocopy-derive-0.7.32.crate 37623 BLAKE2B 8b583d39d7bf9c3dbbba578120751c664f87363c5ba3fc45f6506a4059b9e599c43d9fc7bd498a257ff7c9d872af77d39bebdb0e65fb8009eaa2ae9903dece46 SHA512 3ce8528871fd18d6abe92b98503927451d25791c9c4af0ba39a3b6ba2006030bdc137084d080e9b1ac8b5ddf5f2121e0a3ef34bb2033a040f2c72c8149a9fc0d
diff --git a/app-misc/jaq/jaq-1.3.0.ebuild b/app-misc/jaq/jaq-1.3.0.ebuild
new file mode 100644
index 000000000000..6d694021e2fd
--- /dev/null
+++ b/app-misc/jaq/jaq-1.3.0.ebuild
@@ -0,0 +1,115 @@
+# Copyright 2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Autogenerated by pycargoebuild 0.13.1
+
+EAPI=8
+
+CRATES="
+	ahash@0.8.6
+	aho-corasick@1.1.2
+	allocator-api2@0.2.16
+	ariadne@0.4.0
+	atty@0.2.14
+	base64@0.21.5
+	bincode@1.3.3
+	bitflags@1.3.2
+	cc@1.0.79
+	cfg-if@1.0.0
+	chumsky@0.9.3
+	clap@4.0.22
+	clap_derive@4.0.21
+	clap_lex@0.3.2
+	colored_json@3.0.1
+	dyn-clone@1.0.11
+	env_logger@0.10.0
+	equivalent@1.0.0
+	fastrand@1.9.0
+	getrandom@0.2.10
+	hashbrown@0.14.2
+	heck@0.4.1
+	hermit-abi@0.1.19
+	hifijson@0.2.0
+	indexmap@2.1.0
+	instant@0.1.12
+	itoa@1.0.9
+	libc@0.2.147
+	libm@0.2.8
+	libmimalloc-sys@0.1.35
+	log@0.4.20
+	memchr@2.6.4
+	memmap2@0.9.0
+	mimalloc@0.1.39
+	once_cell@1.18.0
+	os_str_bytes@6.4.1
+	proc-macro-error-attr@1.0.4
+	proc-macro-error@1.0.4
+	proc-macro2@1.0.69
+	quote@1.0.29
+	redox_syscall@0.2.16
+	regex-automata@0.3.7
+	regex-syntax@0.7.5
+	regex@1.9.4
+	remove_dir_all@0.5.3
+	ryu@1.0.14
+	serde@1.0.190
+	serde_derive@1.0.190
+	serde_json@1.0.108
+	strsim@0.10.0
+	syn@1.0.109
+	syn@2.0.38
+	tempfile@3.3.0
+	termcolor@1.2.0
+	time-core@0.1.0
+	time-macros@0.2.8
+	time@0.3.20
+	unicode-ident@1.0.10
+	unicode-width@0.1.11
+	urlencoding@2.1.3
+	version_check@0.9.4
+	wasi@0.11.0+wasi-snapshot-preview1
+	winapi-i686-pc-windows-gnu@0.4.0
+	winapi-util@0.1.5
+	winapi-x86_64-pc-windows-gnu@0.4.0
+	winapi@0.3.9
+	yansi@0.5.1
+	zerocopy-derive@0.7.32
+	zerocopy@0.7.32
+"
+
+inherit cargo
+
+DESCRIPTION="Just another JSON query tool"
+HOMEPAGE="https://github.com/01mf02/jaq"
+SRC_URI="
+	https://github.com/01mf02/jaq/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz
+	${CARGO_CRATE_URIS}
+"
+
+LICENSE="MIT"
+# Dependent crate licenses
+LICENSE+="
+	BSD EPL-2.0 MIT Unicode-DFS-2016
+	|| ( Apache-2.0 Boost-1.0 )
+"
+SLOT="0"
+KEYWORDS="~amd64"
+
+BDEPEND="
+	>=virtual/rust-1.64
+"
+
+QA_FLAGS_IGNORED="usr/bin/jaq"
+QA_PRESTRIPPED="usr/bin/jaq"
+
+DOCS=(
+	README.md
+	examples/
+)
+
+src_install() {
+	pushd "${S}/jaq" >/dev/null || die
+	cargo_src_install
+	popd >/dev/null || die
+	default
+}
diff --git a/dev-libs/inih/inih-57-r1.ebuild b/dev-libs/inih/inih-57-r1.ebuild
index 24cf8b3e6eba..98e9528ea2d5 100644
--- a/dev-libs/inih/inih-57-r1.ebuild
+++ b/dev-libs/inih/inih-57-r1.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}"/inih-r${PV}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 DOCS=( README.md )
 
diff --git a/dev-python/GitPython/GitPython-3.1.41.ebuild b/dev-python/GitPython/GitPython-3.1.41.ebuild
index 82ec0f164d13..1f4830282fba 100644
--- a/dev-python/GitPython/GitPython-3.1.41.ebuild
+++ b/dev-python/GitPython/GitPython-3.1.41.ebuild
@@ -29,7 +29,7 @@ SRC_URI+="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~ppc ~riscv ~s390 ~sparc"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~riscv ~s390 ~sparc"
 
 RDEPEND="
 	dev-vcs/git
diff --git a/dev-python/sumtypes/sumtypes-0.1_alpha6.ebuild b/dev-python/sumtypes/sumtypes-0.1_alpha6.ebuild
index 142563ae1ccf..444b53775603 100644
--- a/dev-python/sumtypes/sumtypes-0.1_alpha6.ebuild
+++ b/dev-python/sumtypes/sumtypes-0.1_alpha6.ebuild
@@ -22,7 +22,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~loong ~ppc ~riscv ~s390 ~sparc"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~riscv ~s390 ~sparc"
 
 RDEPEND="
 	dev-python/attrs[${PYTHON_USEDEP}]
diff --git a/dev-util/itstool/itstool-2.0.7-r1.ebuild b/dev-util/itstool/itstool-2.0.7-r1.ebuild
index a2995ed08565..b6d14f098b49 100644
--- a/dev-util/itstool/itstool-2.0.7-r1.ebuild
+++ b/dev-util/itstool/itstool-2.0.7-r1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="http://files.itstool.org/itstool/${P}.tar.bz2"
 # files in /usr/share/itstool/its are under a special exception || GPL-3+
 LICENSE="GPL-3+"
 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 ~x64-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/games-strategy/knights-demo/knights-demo-1.32-r3.ebuild b/games-strategy/knights-demo/knights-demo-1.32-r4.ebuild
index 361d5eb8d117..e20308c14608 100644
--- a/games-strategy/knights-demo/knights-demo-1.32-r3.ebuild
+++ b/games-strategy/knights-demo/knights-demo-1.32-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2023 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -37,7 +37,7 @@ RDEPEND="
 	>=x11-libs/libXi-1.7.2[abi_x86_32(-)]
 	|| (
 		sys-libs/libxcrypt[compat]
-		sys-libs/glibc[crypt(+)]
+		sys-libs/glibc[crypt(-)]
 	)
 "
 
diff --git a/net-misc/nxplayer/nxplayer-7.6.2.4.ebuild b/net-misc/nxplayer/nxplayer-7.6.2.4-r1.ebuild
index 6c7c06277ceb..9ce1d6a5a12b 100644
--- a/net-misc/nxplayer/nxplayer-7.6.2.4.ebuild
+++ b/net-misc/nxplayer/nxplayer-7.6.2.4-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -18,7 +18,7 @@ KEYWORDS="-* ~amd64 ~x86"
 RDEPEND="
 	|| (
 		sys-libs/libxcrypt[compat]
-		sys-libs/glibc[crypt(+)]
+		sys-libs/glibc[crypt(-)]
 	)
 	dev-libs/glib:2
 	dev-libs/openssl:0
diff --git a/net-p2p/resilio-sync/resilio-sync-2.7.2.1375.ebuild b/net-p2p/resilio-sync/resilio-sync-2.7.2.1375-r1.ebuild
index 8fa9b94c65f9..e1eb3e20ec3f 100644
--- a/net-p2p/resilio-sync/resilio-sync-2.7.2.1375.ebuild
+++ b/net-p2p/resilio-sync/resilio-sync-2.7.2.1375-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -30,7 +30,7 @@ RDEPEND="
 	${DEPEND}
 	|| (
 		sys-libs/libxcrypt[compat]
-		sys-libs/glibc[crypt(+)]
+		sys-libs/glibc[crypt(-)]
 	)"
 
 DOC_CONTENTS="You may need to review /etc/resilio-sync/config.json\\n
diff --git a/profiles/package.deprecated b/profiles/package.deprecated
index 2bafcca9d4ac..961e9fda53bb 100644
--- a/profiles/package.deprecated
+++ b/profiles/package.deprecated
@@ -17,6 +17,11 @@
 
 #--- END OF EXAMPLES ---
 
+# Michał Górny <mgorny@gentoo.org> (2024-01-23)
+# Unmaintained, very hacky package.  Its replacement, berkeleydb,
+# was so bad that we've lastrited it.
+dev-python/bsddb3
+
 # Michał Górny <mgorny@gentoo.org> (2023-12-10)
 # Superseded by dev-python/psycopg:0 (version 3).
 dev-python/psycopg:2
diff --git a/sys-apps/portage/portage-3.0.61-r1.ebuild b/sys-apps/portage/portage-3.0.61-r1.ebuild
index 5007fdd1dd17..1d35f36c8fd4 100644
--- a/sys-apps/portage/portage-3.0.61-r1.ebuild
+++ b/sys-apps/portage/portage-3.0.61-r1.ebuild
@@ -20,7 +20,7 @@ if [[ ${PV} == 9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://gitweb.gentoo.org/proj/portage.git/snapshot/${P}.tar.bz2"
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86"
 fi
 
 LICENSE="GPL-2"
diff --git a/virtual/libcrypt/libcrypt-1-r1.ebuild b/virtual/libcrypt/libcrypt-1-r2.ebuild
index 65fd54f20072..d88ffbf8fc3c 100644
--- a/virtual/libcrypt/libcrypt-1-r1.ebuild
+++ b/virtual/libcrypt/libcrypt-1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020-2023 Gentoo Authors
+# Copyright 2020-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ IUSE="static-libs"
 
 RDEPEND="
 	!prefix-guest? (
-		elibc_glibc? ( sys-libs/glibc[crypt(+),static-libs(+)?] )
+		elibc_glibc? ( sys-libs/glibc[crypt(-),static-libs(+)?] )
 		elibc_musl? ( sys-libs/musl )
 	)
 "