Merge updates from master

9 files changed, 369 insertions, 104 deletions

diff --git a/dev-db/influxdb/Manifest b/dev-db/influxdb/Manifest
index 747e0c19b0f5..11b7a47c667e 100644
--- a/dev-db/influxdb/Manifest
+++ b/dev-db/influxdb/Manifest
@@ -66,6 +66,9 @@ DIST influxdb-1.8.10.tar.gz 12082933 BLAKE2B 511202025bd0c2305b8fa3b8be439f6e294
 DIST influxdb-2.7.3-assets.tar.gz 19829786 BLAKE2B 1ca0fe1a6265329b226eb4de0d1310e71b766bcd8d05f636e3ee0c75c2b9f50c90b8c7f38225c0380b3074f84eb07805a7d42cf06cfbdac3b8b1ffad3befb8e5 SHA512 85f49e3e5a262fcecb801b3ba91157557fa30933a9cc210f2ad7395d3165225fba2f50190e452f76b2567adb765aba297dbcb425d388851f742edd55375da135
 DIST influxdb-2.7.3-deps.tar.xz 421383868 BLAKE2B 0590a5023de66cb01772ed2d18f993f8e706e1dfd8fb1a7f191bfe0244baa16610537f87b20fd16b840b04afc7b5f97cc751a8ba1bc9f179f31bada73b51052e SHA512 f0130c57db60fa3ff622cf646d234f1bc47eccded070ad959df541f8c0ce3a9feefeb86f9bf1b7fbdf562347d40e8eabd42ad65b5a415dec9e74b9542ca31a6e
 DIST influxdb-2.7.3.tar.gz 14249851 BLAKE2B d859330ece0aa0dc0eb2ce7246d0ee7a1f25796dd436d102b402255a4c463a93e0369287228b4f840ee333aa3509882aaadddfae901e9e2842cfed6d582032c4 SHA512 4d9f2faa742fda0366d3386487461d6dd06f6ad27589db3b87ce37242ee9b335e96028d6685683d2691cd2424a1a8d2fff535056eb290af0a1152883767f02b5
+DIST influxdb-2.7.5-assets.tar.gz 19829786 BLAKE2B 1ca0fe1a6265329b226eb4de0d1310e71b766bcd8d05f636e3ee0c75c2b9f50c90b8c7f38225c0380b3074f84eb07805a7d42cf06cfbdac3b8b1ffad3befb8e5 SHA512 85f49e3e5a262fcecb801b3ba91157557fa30933a9cc210f2ad7395d3165225fba2f50190e452f76b2567adb765aba297dbcb425d388851f742edd55375da135
+DIST influxdb-2.7.5-deps.tar.xz 459263596 BLAKE2B 13c6a2e3539960ec01b2d9132c54e47e4f178e66fa5eba07b63969c657fb4a69fa700a59d90201b768d52b57b449fbf330ae91463e22b818a5f7bf3918937d91 SHA512 cfc4bef0e33e29c54c529a20711753ac5da3c8a89af3a81bcb9612e745254fca9850751f69eec05f7c22959f8a7b240fc52d96b1dba7ed36c907d6c9206618b9
+DIST influxdb-2.7.5.tar.gz 14259860 BLAKE2B edcb6228bcc1267bdeb93bb0e34e65d4e97873f10a6e45a919e21e3aa82b2f8ddc02d77c05ea37ec5b5e04222b34e5e74af99dbe85af63fa78dff841316024fc SHA512 895dfc031a18551822dd6ba17a4bdf5e6cef2bd67aa373188b8263a6ab389bd7b6c001ebe47bb945307cf71de2b03a9fa48d2bcc60cda8cbf1b569a09572395e
 DIST instant-0.1.12.crate 6128 BLAKE2B 728923f757c1ee4e4a7afb90e460eed81392068961240a538e5c6468e15a0b6491f590fb5f6cc46e6d78901ca232351f65abb9f2f230d8f4983c5e58c4011902 SHA512 fae494c00111c51c840f9dd6a10febe403e27ebb933dd16633a213e9c20f2bc11adeb431c71f8a6713bf88f270a010941e15d83df294e658791934f83a5d2407
 DIST io-lifetimes-1.0.10.crate 37294 BLAKE2B 9b8836c4bf30e6d102fd9973ac66f067c3ff8bc2806e55f26368ebdc9854f2e9cc6eecc8014f9a0b22a968a6eea8be243fcb7a641d2d0dfc747ee08a6a1450bb SHA512 4b2cde9522780a408c5d4e6406286bc5dd3a0de1a99675129e9856e5d889498a127fd5dd7c937a7542135abc2213b60bfb6258b7871b8709dcdd79d60455bea9
 DIST itertools-0.10.5.crate 115354 BLAKE2B f24734bdfedf1dba48554e39b43669efcd4a43656eeb2c511096060daeaf049e1ad3eab232e757057750ce94aabad9fc8a0cf29a997edc6c4b167301c3443391 SHA512 d03c3cfba9841776913bbb6daad0c8945830c155f32ae4b48872e0f937c75a443f0ac9a0355f43b359ff75232f38b15f4f6d446b4be30b00b4209cf66ef770c3
diff --git a/dev-db/influxdb/influxdb-2.7.5.ebuild b/dev-db/influxdb/influxdb-2.7.5.ebuild
new file mode 100644
index 000000000000..32422fb6df90
--- /dev/null
+++ b/dev-db/influxdb/influxdb-2.7.5.ebuild
@@ -0,0 +1,284 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CRATES="
+	adler32@1.2.0
+	ahash@0.7.6
+	aho-corasick@0.7.20
+	android_system_properties@0.1.5
+	ansi_term@0.12.1
+	anyhow@1.0.70
+	arrayvec@0.5.2
+	atty@0.2.14
+	autocfg@1.1.0
+	bitflags@1.3.2
+	bitflags@2.0.2
+	bumpalo@3.12.0
+	cast@0.3.0
+	cc@1.0.79
+	cfg-if@1.0.0
+	chrono@0.4.24
+	clap@2.34.0
+	codespan-reporting@0.11.1
+	colored@2.0.0
+	core-foundation-sys@0.8.4
+	crc32fast@1.3.2
+	criterion-plot@0.4.5
+	criterion@0.3.6
+	crossbeam-channel@0.5.7
+	crossbeam-deque@0.8.3
+	crossbeam-epoch@0.9.14
+	crossbeam-utils@0.8.15
+	csv-core@0.1.10
+	csv@1.2.1
+	ctor@0.1.26
+	cxx-build@1.0.94
+	cxx@1.0.94
+	cxxbridge-flags@1.0.94
+	cxxbridge-macro@1.0.94
+	derivative@2.2.0
+	derive_more@0.99.17
+	diff@0.1.13
+	dissimilar@1.0.6
+	either@1.8.1
+	ena@0.14.2
+	env_logger@0.9.3
+	errno-dragonfly@0.1.2
+	errno@0.3.0
+	expect-test@1.4.1
+	fallible-iterator@0.2.0
+	fallible-streaming-iterator@0.1.9
+	fastrand@1.9.0
+	flatbuffers@22.12.6
+	fnv@1.0.7
+	form_urlencoded@1.1.0
+	getrandom@0.2.8
+	half@1.8.2
+	hashbrown@0.12.3
+	hashlink@0.8.1
+	heck@0.3.3
+	hermit-abi@0.1.19
+	hermit-abi@0.2.6
+	hermit-abi@0.3.1
+	humantime@2.1.0
+	iana-time-zone-haiku@0.1.1
+	iana-time-zone@0.1.56
+	idna@0.3.0
+	indexmap@1.9.3
+	instant@0.1.12
+	io-lifetimes@1.0.10
+	itertools@0.10.5
+	itoa@1.0.6
+	js-sys@0.3.61
+	lazy_static@1.4.0
+	libc@0.2.141
+	libflate@1.3.0
+	libflate_lz77@1.2.0
+	libsqlite3-sys@0.26.0
+	link-cplusplus@1.0.8
+	linux-raw-sys@0.3.1
+	lock_api@0.4.9
+	log@0.4.17
+	lsp-types@0.91.1
+	maplit@1.0.2
+	memchr@2.5.0
+	memoffset@0.8.0
+	num-integer@0.1.45
+	num-traits@0.2.15
+	num_cpus@1.15.0
+	once_cell@1.17.1
+	oorandom@11.1.3
+	ordered-float@3.6.0
+	output_vt100@0.1.3
+	pad@0.1.6
+	parking_lot@0.11.2
+	parking_lot_core@0.8.6
+	percent-encoding@2.2.0
+	pkg-config@0.3.26
+	plotters-backend@0.3.4
+	plotters-svg@0.3.3
+	plotters@0.3.4
+	pretty@0.11.3
+	pretty_assertions@1.3.0
+	proc-macro-error-attr@1.0.4
+	proc-macro-error@1.0.4
+	proc-macro2@1.0.56
+	pulldown-cmark@0.9.2
+	quote@1.0.26
+	rayon-core@1.11.0
+	rayon@1.7.0
+	redox_syscall@0.2.16
+	redox_syscall@0.3.5
+	regex-syntax@0.6.29
+	regex@1.7.3
+	rle-decode-fast@1.0.3
+	rusqlite@0.29.0
+	rustc-hash@1.1.0
+	rustc_version@0.4.0
+	rustix@0.37.7
+	ryu@1.0.13
+	salsa-macros@0.17.0-pre.2
+	salsa@0.17.0-pre.2
+	same-file@1.0.6
+	scopeguard@1.1.0
+	scratch@1.0.5
+	semver@1.0.17
+	serde@1.0.159
+	serde_cbor@0.11.2
+	serde_derive@1.0.159
+	serde_json@1.0.95
+	serde_repr@0.1.12
+	smallvec@1.10.0
+	strsim@0.8.0
+	structopt-derive@0.4.18
+	structopt@0.3.26
+	syn@1.0.109
+	syn@2.0.13
+	tempfile@3.5.0
+	termcolor@1.2.0
+	textwrap@0.11.0
+	thiserror-impl@1.0.40
+	thiserror@1.0.40
+	tinytemplate@1.2.1
+	tinyvec@1.6.0
+	tinyvec_macros@0.1.1
+	typed-arena@2.0.2
+	unicase@2.6.0
+	unicode-bidi@0.3.13
+	unicode-ident@1.0.8
+	unicode-normalization@0.1.22
+	unicode-segmentation@1.10.1
+	unicode-width@0.1.10
+	url@2.3.1
+	vcpkg@0.2.15
+	vec_map@0.8.2
+	version_check@0.9.4
+	walkdir@2.3.3
+	wasi@0.11.0+wasi-snapshot-preview1
+	wasm-bindgen-backend@0.2.84
+	wasm-bindgen-macro-support@0.2.84
+	wasm-bindgen-macro@0.2.84
+	wasm-bindgen-shared@0.2.84
+	wasm-bindgen@0.2.84
+	web-sys@0.3.61
+	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
+	windows-sys@0.45.0
+	windows-sys@0.48.0
+	windows-targets@0.42.2
+	windows-targets@0.48.0
+	windows@0.48.0
+	windows_aarch64_gnullvm@0.42.2
+	windows_aarch64_gnullvm@0.48.0
+	windows_aarch64_msvc@0.42.2
+	windows_aarch64_msvc@0.48.0
+	windows_i686_gnu@0.42.2
+	windows_i686_gnu@0.48.0
+	windows_i686_msvc@0.42.2
+	windows_i686_msvc@0.48.0
+	windows_x86_64_gnu@0.42.2
+	windows_x86_64_gnu@0.48.0
+	windows_x86_64_gnullvm@0.42.2
+	windows_x86_64_gnullvm@0.48.0
+	windows_x86_64_msvc@0.42.2
+	windows_x86_64_msvc@0.48.0
+	yansi@0.5.1
+"
+
+inherit cargo go-module systemd
+
+DESCRIPTION="Scalable datastore for metrics, events, and real-time analytics"
+HOMEPAGE="https://www.influxdata.com"
+
+FLUX_PV="0.194.5"
+
+SRC_URI="https://github.com/influxdata/influxdb/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI+=" https://github.com/influxdata/ui/releases/download/OSS-v2.7.1/build.tar.gz -> ${P}-assets.tar.gz"
+SRC_URI+=" https://gentoo.kropotkin.rocks/go-pkgs/${P}-deps.tar.xz"
+SRC_URI+=" ${CARGO_CRATE_URIS}"
+
+LICENSE="Apache-2.0 BSD BSD-2 EPL-2.0 ISC MIT MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="virtual/pkgconfig"
+
+DEPEND="
+	acct-group/influxdb
+	acct-user/influxdb
+"
+RDEPEND="${DEPEND}"
+
+src_unpack() {
+	cargo_src_unpack
+}
+
+src_prepare() {
+	default
+
+	local data_dir
+	data_dir="${S}/static/data"
+	mkdir "${data_dir}" || die
+	mv "${WORKDIR}/build" "${data_dir}" || die
+}
+
+src_compile() {
+	mv "${WORKDIR}/go-mod" "${WORKDIR}/go-mod-tmp" || die
+	mv "${WORKDIR}/go-mod-tmp/github.com/influxdata/pkg-config@v0.2.11/go-mod" "${WORKDIR}/go-mod" || die
+	cd "${WORKDIR}"/go-mod-tmp/github.com/influxdata/pkg-config* || die
+	ego build .
+	mv "${WORKDIR}/go-mod" "${WORKDIR}/go-mod-tmp/github.com/influxdata/pkg-config@v0.2.11" || die
+	mv "${WORKDIR}/go-mod-tmp" "${WORKDIR}/go-mod" || die
+
+	cd "${WORKDIR}/go-mod/github.com/influxdata/flux@v${FLUX_PV}/libflux" || die
+	cargo_src_compile
+
+	cd "${S}" || die
+
+	export PKG_CONFIG="${WORKDIR}/go-mod/github.com/influxdata/pkg-config@v0.2.11/pkg-config"
+	ego generate ./static
+	GOBIN="${S}/bin" \
+		ego install \
+			-tags 'assets,noasm,sqlite_json,sqlite_foreign_keys' \
+			-ldflags="-X main.version=${PV}" \
+		./...
+}
+
+src_test() {
+	ego test ./tests
+}
+
+src_install() {
+	dobin bin/influx*
+	dodoc *.md
+	cd .circleci/scripts/package/influxdb2/fs || die
+	systemd_dounit usr/lib/influxdb/scripts/influxdb.service
+	exeinto /usr/lib/influxdb/scripts
+	doexe usr/lib/influxdb/scripts/influxd-systemd-start.sh
+	exeinto /usr/share/influxdb
+	doexe usr/share/influxdb/influxdb2-upgrade.sh
+	newconfd "${FILESDIR}"/influxdb.confd-r1 influxdb
+	newinitd "${FILESDIR}"/influxdb.initd-r1 influxdb
+	keepdir /var/log/influxdb
+	fowners influxdb:influxdb /var/log/influxdb
+
+	newenvd - "99${PN}" <<-_EOF_
+		INFLUXD_CONFIG_PATH="/etc/influxdb"
+	_EOF_
+}
+
+pkg_postinst() {
+	elog "Upgrading from InfluxDB1.x requires migration of time series data."
+	elog "See https://docs.influxdata.com/influxdb/v2.7/upgrade/v1-to-v2/"
+	elog "Keep in mind that some applications not compatible with InfluxDB 2.x"
+	elog "may stop working."
+
+	ewarn "The InfluxDB command line client has been moved to dev-db/influx-cli"
+	ewarn "You will need to install it separately"
+}
diff --git a/media-libs/libbluray/Manifest b/media-libs/libbluray/Manifest
index 95fa461b1eb6..a8d18cda4a57 100644
--- a/media-libs/libbluray/Manifest
+++ b/media-libs/libbluray/Manifest
@@ -1,2 +1 @@
-DIST libbluray-1.3.3.tar.bz2 761335 BLAKE2B 3d17e686e363b0692b7d75596089ed12dbe46006738ea23f274b2992a541e6f1b0384ac2afc785359d94f652017284668c3a044db24ef6de5625575fca956bce SHA512 fc36b4eea43f430f5f774129bd5cf075ed0128433779ad0146d59cc87e9625f4b6c31098fed1f5754b84fd08d9c8044d8d43d78c5b9c07937878cf15f517ba6f
 DIST libbluray-1.3.4.tar.bz2 756323 BLAKE2B a53b10fca6f8c049b2771c137e8900c34127554e1ebdeeec825de470b751182163cb1ff79f6dae20d772ba15c9d6c70fe332080ab93f1a47cc5f863922d22723 SHA512 94dbf3b68d1c23fe4648c153cc2f0c251886fac0a6b6bbe3a77caabaa5322682f712afe4a7b6b16ca3f06744fbc0e1ca872209a32898dcf0ae182055d335aec1
diff --git a/media-libs/libbluray/files/libbluray-1.3.4-min-java.patch b/media-libs/libbluray/files/libbluray-1.3.4-min-java.patch
new file mode 100644
index 000000000000..2005cb29ca89
--- /dev/null
+++ b/media-libs/libbluray/files/libbluray-1.3.4-min-java.patch
@@ -0,0 +1,18 @@
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -242,12 +242,12 @@ pkginclude_HEADERS = \
+ if USING_BDJAVA_BUILD_JAR
+ 
+ if USING_JAVAC_12
+-java_versions = -Djava_version_asm=1.7 -Djava_version_bdj=1.7
++java_versions = -Djava_version_asm=1.8 -Djava_version_bdj=1.8
+ else
+ if USING_JAVAC_9
+-java_versions = -Djava_version_asm=1.6 -Djava_version_bdj=1.6
++java_versions = -Djava_version_asm=1.8 -Djava_version_bdj=1.8
+ else
+-java_versions = -Djava_version_asm=1.5 -Djava_version_bdj=1.4
++java_versions = -Djava_version_asm=1.8 -Djava_version_bdj=1.8
+ endif
+ endif
+ 
diff --git a/media-libs/libbluray/libbluray-1.3.3.ebuild b/media-libs/libbluray/libbluray-1.3.3.ebuild
deleted file mode 100644
index 264c8099faf5..000000000000
--- a/media-libs/libbluray/libbluray-1.3.3.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-if [[ ${PV#9999} != ${PV} ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://code.videolan.org/videolan/libbluray.git"
-else
-	SRC_URI="https://downloads.videolan.org/pub/videolan/libbluray/${PV}/${P}.tar.bz2"
-	KEYWORDS="amd64 arm arm64 ~loong ~mips ppc ppc64 ~riscv sparc x86"
-fi
-
-inherit autotools java-pkg-opt-2 multilib-minimal
-
-DESCRIPTION="Blu-ray playback libraries"
-HOMEPAGE="https://www.videolan.org/developers/libbluray.html"
-
-LICENSE="LGPL-2.1"
-SLOT="0/2"
-IUSE="aacs bdplus +fontconfig java +truetype utils +xml"
-
-RDEPEND="
-	dev-libs/libudfread[${MULTILIB_USEDEP}]
-	aacs? ( >=media-libs/libaacs-0.6.0[${MULTILIB_USEDEP}] )
-	bdplus? ( media-libs/libbdplus[${MULTILIB_USEDEP}] )
-	fontconfig? ( >=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}] )
-	java? ( >=virtual/jre-1.8:* )
-	truetype? ( >=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}] )
-	xml? ( >=dev-libs/libxml2-2.9.1-r4[${MULTILIB_USEDEP}] )
-"
-DEPEND="
-	${RDEPEND}
-	java? ( >=virtual/jdk-1.8:* )
-"
-BDEPEND="
-	virtual/pkgconfig
-	java? (
-		dev-java/ant-core
-		>=virtual/jdk-1.8:*
-	)
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-jars.patch
-)
-
-DOCS=( ChangeLog README.md )
-
-src_prepare() {
-	default
-
-	eautoreconf
-}
-
-multilib_src_configure() {
-	# bug #621992
-	use java || unset JDK_HOME
-
-	ECONF_SOURCE="${S}" econf \
-		--disable-optimizations \
-		$(multilib_native_use_enable utils examples) \
-		$(multilib_native_use_enable java bdjava-jar) \
-		$(use_with fontconfig) \
-		$(use_with truetype freetype) \
-		$(use_with xml libxml2)
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" install
-
-	multilib_is_native_abi || return
-
-	use utils &&
-		find .libs/ -type f -executable ! -name "${PN}.*" \
-			 $(use java || echo '! -name bdj_test') -exec dobin {} +
-
-	use java && java-pkg_regjar "${ED}"/usr/share/${PN}/lib/*.jar
-}
-
-multilib_src_install_all() {
-	einstalldocs
-
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/media-libs/libbluray/libbluray-1.3.4.ebuild b/media-libs/libbluray/libbluray-1.3.4-r1.ebuild
index 72bb75b8a06a..f087cc50c5a3 100644
--- a/media-libs/libbluray/libbluray-1.3.4.ebuild
+++ b/media-libs/libbluray/libbluray-1.3.4-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
@@ -20,28 +20,31 @@ LICENSE="LGPL-2.1"
 SLOT="0/2"
 IUSE="aacs bdplus +fontconfig java +truetype utils +xml"
 
-RDEPEND="
+COMMON_DEPEND="
 	>=dev-libs/libudfread-1.1.0[${MULTILIB_USEDEP}]
 	aacs? ( >=media-libs/libaacs-0.6.0[${MULTILIB_USEDEP}] )
 	bdplus? ( media-libs/libbdplus[${MULTILIB_USEDEP}] )
 	fontconfig? ( >=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}] )
-	java? ( >=virtual/jre-1.8:* )
 	truetype? ( >=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}] )
 	xml? ( >=dev-libs/libxml2-2.9.1-r4[${MULTILIB_USEDEP}] )
 "
 DEPEND="
-	${RDEPEND}
-	java? ( >=virtual/jdk-1.8:* )
-"
-BDEPEND="
-	virtual/pkgconfig
+	${COMMON_DEPEND}
 	java? (
-		dev-java/ant-core
+		>=dev-java/ant-1.10.14-r3:0
 		>=virtual/jdk-1.8:*
 	)
 "
+RDEPEND="
+	${COMMON_DEPEND}
+	java? ( >=virtual/jre-1.8:* )
+"
+BDEPEND="
+	virtual/pkgconfig
+"
 
 PATCHES=(
+	"${FILESDIR}/libbluray-1.3.4-min-java.patch"
 	"${FILESDIR}"/${PN}-jars.patch
 	"${FILESDIR}"/${PN}-1.3.4-fix-libudfread-option.patch
 )
@@ -51,6 +54,11 @@ DOCS=( ChangeLog README.md )
 src_prepare() {
 	default
 
+	cat > src/libbluray/bdj/build.properties <<-EOF
+		java_version_asm=1.8
+		java_version_bdj=1.8
+	EOF
+
 	eautoreconf
 }
 
diff --git a/media-libs/libbluray/libbluray-9999.ebuild b/media-libs/libbluray/libbluray-9999.ebuild
index 6445acaac890..2369aabc99a1 100644
--- a/media-libs/libbluray/libbluray-9999.ebuild
+++ b/media-libs/libbluray/libbluray-9999.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
@@ -20,26 +20,28 @@ LICENSE="LGPL-2.1"
 SLOT="0/2"
 IUSE="aacs bdplus +fontconfig java +truetype utils +xml"
 
-RDEPEND="
+COMMON_DEPEND="
 	>=dev-libs/libudfread-1.1.0[${MULTILIB_USEDEP}]
 	aacs? ( >=media-libs/libaacs-0.6.0[${MULTILIB_USEDEP}] )
 	bdplus? ( media-libs/libbdplus[${MULTILIB_USEDEP}] )
 	fontconfig? ( >=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}] )
-	java? ( >=virtual/jre-1.8:* )
 	truetype? ( >=media-libs/freetype-2.5.0.1:2[${MULTILIB_USEDEP}] )
 	xml? ( >=dev-libs/libxml2-2.9.1-r4[${MULTILIB_USEDEP}] )
 "
 DEPEND="
-	${RDEPEND}
-	java? ( >=virtual/jdk-1.8:* )
-"
-BDEPEND="
-	virtual/pkgconfig
+	${COMMON_DEPEND}
 	java? (
-		dev-java/ant-core
+		>=dev-java/ant-1.10.14-r3:0
 		>=virtual/jdk-1.8:*
 	)
 "
+RDEPEND="
+	${COMMON_DEPEND}
+	java? ( >=virtual/jre-1.8:* )
+"
+BDEPEND="
+	virtual/pkgconfig
+"
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-jars.patch
diff --git a/sys-apps/cpuid/Manifest b/sys-apps/cpuid/Manifest
index e438bca2dc92..197444b74fb9 100644
--- a/sys-apps/cpuid/Manifest
+++ b/sys-apps/cpuid/Manifest
@@ -1 +1,2 @@
 DIST cpuid-20230614.src.tar.gz 149777 BLAKE2B 5ebfd7d055f2b67cd158dd6eaa5467a5776170a879a4323e2dc103e8b84f4cf72523d5ae5272d2f89ae6555f597d903bdf149f279f9565bf88a1e26b0e574606 SHA512 46698e5565d1c558e50b9526154489d82ada64ea5dbcebc01e3cd34b79b2b646f324deaf7d63678cd477d227e902437c3ff6c7998b4385ddd373aa1fc76ff70c
+DIST cpuid-20240330.src.tar.gz 154968 BLAKE2B c859b2e66044ce622daf695e951666fbeaad4e529cf764cb86dd7e43837327dc21aaaae98cfd915663560f5b33af1497ee9af9e1e02dba7345456e9aa6948c4a SHA512 a35bcf730a9945df029159f5f851b212fd3c07ab94dfb680d4ebdd541dfbc5fdee1cd269fe0d1f14e9678f78c41c47f2c54621cfe81a93e3b4c5c1194f9be9ee
diff --git a/sys-apps/cpuid/cpuid-20240330.ebuild b/sys-apps/cpuid/cpuid-20240330.ebuild
new file mode 100644
index 000000000000..d1563143acef
--- /dev/null
+++ b/sys-apps/cpuid/cpuid-20240330.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit toolchain-funcs
+
+DESCRIPTION="Linux tool to dump x86 CPUID information about the CPUs"
+HOMEPAGE="http://www.etallen.com/cpuid.html"
+SRC_URI="http://www.etallen.com/${PN}/${P}.src.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+
+BDEPEND="
+	app-arch/gzip
+	dev-lang/perl
+"
+
+DOCS=( "ChangeLog" "FUTURE" )
+
+PATCHES=( "${FILESDIR}/${PN}-20220620-makefile.patch" )
+
+src_prepare() {
+	default
+
+	tc-export CC
+}
+
+src_install() {
+	emake BUILDROOT="${ED}" install
+
+	einstalldocs
+}