Merge updates from master

4 files changed, 122 insertions, 0 deletions

diff --git a/dev-libs/libcpuid/Manifest b/dev-libs/libcpuid/Manifest
index f83536124af8..fb78f925020a 100644
--- a/dev-libs/libcpuid/Manifest
+++ b/dev-libs/libcpuid/Manifest
@@ -1,3 +1,4 @@
 DIST libcpuid-0.6.4.tar.gz 338722 BLAKE2B ad23c13c48b0244f401a60d07fb569712f24b4d1f2bcd16f8d0240c6a39f8afae8944c9d3b4f486d3e1727157d642915c794fc89f9af315a2c4daf64625fdf25 SHA512 5396301d2a5485c6cf15a2fa8eab0ce28d967fe0dcf0776fec3618b963bc786499032150037f6b9123738e094d41583a331bcea25e502b5025ec6f03d318f77e
 DIST libcpuid-0.6.5.tar.gz 370297 BLAKE2B 56394c0f99ee514bad115e614a27e3771e3ab0a27c7e980ed50419f6b22c268461db97aed8c879a66894ea34c788ed7a154ea403ec07a552fb524e321aa931e0 SHA512 c38381e0f768a2cd2a5df601cbcc50d1cb93a276c477bc09e69ff61de01aef30c0b3163f4a0c8e7641caa3cf692d468410ebc90a3cad93e0476cddeb0c444d7b
 DIST libcpuid-0.7.0.tar.gz 442324 BLAKE2B fb3248227ac43fe536b66ee0b13dcb514aeb5be43d09b5a3ada5d944b869b9e6d311b4f1046869aa1f1b00c5c5a7254eeb8206094af1cd6487cefa2aafe78458 SHA512 26353763461cbbe664ddaa6933cbd9016e3b11d8a056bc8c2b92818dfe3a43fcda76a92270f716eeb00ae61b75288c7079add8d7ac2290a0a0d5c3bd7d898d44
+DIST libcpuid-0.7.1.tar.gz 451773 BLAKE2B 697aea4fd2cc614a84f00760c8a146288b91ffdcb1842b6c6033c5860e537210e9d0b5ea20a8e83eff35b800ee527462b81e19450a8727ff975f5df83d5680ef SHA512 124f4ad01e34d1494b549c62382e65bb3cea50785b59cd1f734a9a80bd099af96b84e32c70ed6326d6697977f58495e84973ff07a8648a5d7f6a58861f0ab6c1
diff --git a/dev-libs/libcpuid/libcpuid-0.7.1.ebuild b/dev-libs/libcpuid/libcpuid-0.7.1.ebuild
new file mode 100644
index 000000000000..a336c5daa7e3
--- /dev/null
+++ b/dev-libs/libcpuid/libcpuid-0.7.1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=(python3_{9..12})
+
+inherit autotools python-any-r1
+
+DESCRIPTION="A small C library for x86 (and x86_64) CPU detection and feature extraction"
+HOMEPAGE="http://libcpuid.sourceforge.net/"
+SRC_URI="https://github.com/anrieff/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+LICENSE="BSD-2"
+SLOT="0/17"
+KEYWORDS="~amd64"
+IUSE="static-libs test"
+RESTRICT="!test? ( test )"
+
+DEPEND="test? ( ${PYTHON_DEPS} )"
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	econf "$(use_enable static-libs static)"
+}
+
+src_install() {
+	default
+	find "${ED}" -name "*.la" -delete || die
+}
diff --git a/sys-apps/cpu-x/Manifest b/sys-apps/cpu-x/Manifest
index f2ff4ec53f45..07f730a5e25b 100644
--- a/sys-apps/cpu-x/Manifest
+++ b/sys-apps/cpu-x/Manifest
@@ -2,3 +2,4 @@ DIST cpu-x-5.0.2.tar.gz 1975214 BLAKE2B 2b4cccdf96cc789a6c7b8a9e8124b380de681ada
 DIST cpu-x-5.0.3.tar.gz 1988476 BLAKE2B f1f693d6c7df5f8f342ac8326539febcc95df1ccd154cb013b215ea50d9f8bec70e894d7cbf76f08d454c73a8a2e450296144e9c6af4ed92a07b95df6c705901 SHA512 d9a29a5303101a6c00d9145265d85acec865833f175246bde550ba2dff24a924c1b2de7579b3d8e20aa163092d269af9bbb24e073585d3e18a2c726e48d9be41
 DIST cpu-x-5.0.4.tar.gz 1995465 BLAKE2B 6e3982040400a2bbdb7fba0cac24f1b183792693fff13fd223d1194a5bc57acd9b0dde407016f4f0039705759f0e57da472dc634a237e9d89c7c7d23e9cfa6b9 SHA512 134f8a8fe6782279f7288d891a66b3d426b0e173de3d5445367c94029aa9d33348d037f5bca25690aff16f00d261777a71de6847991e564578099b03ff398453
 DIST cpu-x-5.1.0.tar.gz 2705947 BLAKE2B 8f5989170ebba7b943bc4bf5d3550ff2a7f9d527305d2ee4ad9ffa39cebcf089098b6ed0340c001d0926d0a093fd559273b3b61b404cc21ece3aea937097c1f5 SHA512 7f0ce6123cdd957663aa1012194cee12a09cdd3a44b0bcdfecad36315a3b1c1e5e6461ffa0d9613c0ff275332d4aae0499f8687d1acbcd921703971508819ed6
+DIST cpu-x-5.1.1.tar.gz 2721238 BLAKE2B bfd0f1e919e3ca3663b54b41f50dadc6c0ebc2329bad58253ef26f5af0c1f5b3ce713f7309be25c16990d056df415aa5ce76e5fb9bcb975675568a856290c45c SHA512 8601946feaed567e144350c69761a46a7f5ff1aa47c1d550afca11d6b3eb7546b125c56ecd4f266a33d5ee8a6ef09eba01f7c6570dde25c4f1989971eb6dbb27
diff --git a/sys-apps/cpu-x/cpu-x-5.1.1.ebuild b/sys-apps/cpu-x/cpu-x-5.1.1.ebuild
new file mode 100644
index 000000000000..34fdbb46bef2
--- /dev/null
+++ b/sys-apps/cpu-x/cpu-x-5.1.1.ebuild
@@ -0,0 +1,83 @@
+# Copyright 1999-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MY_PN="CPU-X"
+
+inherit cmake gnome2-utils xdg
+
+DESCRIPTION="A Free software that gathers information on CPU, motherboard and more"
+HOMEPAGE="https://thetumultuousunicornofdarkness.github.io/CPU-X/"
+SRC_URI="https://github.com/TheTumultuousUnicornOfDarkness/${MY_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="-* ~amd64"
+IUSE="+cpu force-libstatgrab +gpu gui +ncurses +nls opencl +pci test vulkan"
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="
+	dev-libs/glib:2
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf:2
+	x11-libs/pango
+	force-libstatgrab? ( sys-libs/libstatgrab )
+	!force-libstatgrab? ( sys-process/procps:= )
+	gui? ( dev-cpp/gtkmm:3.0
+		>=x11-libs/gtk+-3.12:3 )
+	cpu? ( >=dev-libs/libcpuid-0.7.0:= )
+	gpu? ( >=media-libs/glfw-3.3
+		media-libs/libglvnd )
+	pci? ( sys-apps/pciutils )
+	ncurses? ( sys-libs/ncurses:=[tinfo] )
+	opencl? ( virtual/opencl )
+	vulkan? ( media-libs/vulkan-loader
+		>=dev-util/vulkan-headers-1.3.151 )
+"
+
+DEPEND="
+	test? (
+		sys-apps/grep[pcre]
+		sys-apps/mawk
+		sys-apps/nawk
+	)
+
+	${COMMON_DEPEND}
+"
+
+BDEPEND="
+	dev-lang/nasm
+	nls? ( sys-devel/gettext )
+"
+
+RDEPEND="${COMMON_DEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DFORCE_LIBSTATGRAB=$(usex force-libstatgrab)
+		-DWITH_GETTEXT=$(usex nls)
+		-DWITH_GTK=$(usex gui)
+		-DWITH_LIBCPUID=$(usex cpu)
+		-DWITH_LIBGLFW=$(usex gpu)
+		-DWITH_LIBPCI=$(usex pci)
+		-DWITH_LIBSTATGRAB=OFF
+		-DWITH_NCURSES=$(usex ncurses)
+		-DWITH_OPENCL=$(usex opencl)
+		-DWITH_VULKAN=$(usex vulkan)
+	)
+	use gui && mycmakeargs+=( -DGSETTINGS_COMPILE=OFF )
+
+	cmake_src_configure
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}