gentoo auto-resync : 16:10:2023 - 22:04:19

4 files changed, 9 insertions, 85 deletions

diff --git a/sys-apps/cpu-x/Manifest b/sys-apps/cpu-x/Manifest
index 385932c4fc4f..10123306d857 100644
--- a/sys-apps/cpu-x/Manifest
+++ b/sys-apps/cpu-x/Manifest
@@ -1,7 +1,5 @@
-DIST cpu-x-4.5.1.tar.gz 1916681 BLAKE2B cf0e14050a884cbd763fb5bfe56a93db4c3e4bf0322f55304d6fe09d5b38210ee4139641654aee205761d3327f1b498d0dc88640c6432c4a9b0c62193c0671da SHA512 25b2d51ae093c5cb607aa77e05be0f62df3dc1d2022d96a2cfe935fedcbe2f5f85d9da16e1df05377a7e02280365c165ee93a2c22d1e4364d008bd669a69b2ec
-DIST cpu-x-4.5.2.tar.gz 1919087 BLAKE2B d4f1564496f2aded5b40f1cce0ca3e5213486b266b4375035294d5564b9a4a59a2cb3ff87fd27280b2f32a3fe233a2f5dcc09d9a1acbefd16d270c0ff871b96e SHA512 a1700293930d7030f5240296f98c40d0e3e7e228678ebb3f87eebaa1939eec9905171ea3716968cad117dc6e4f173ebabe66c5f175b55e45b42b3d373a6f30e5
 DIST cpu-x-4.5.3.tar.gz 1910854 BLAKE2B 98bb905e24d11ba4f599badd8f9de272fc0b8cd63cd000b7e0e09d7b98da7663d34abe62451aa8d617520fb62d43ae29cae049a14cdf840330be8b404ed7b61a SHA512 3f3e4f1d31e4e84bdeb68e448a1dabd2e22965caed1668300945a1d9150f77422b685a7a0bad997371ba08a3b0ac7fe3eab3aa1d0b485942347a72eb81d21b4f
-EBUILD cpu-x-4.5.1.ebuild 1670 BLAKE2B f4cd9e218fa3d4fd71e79e04069e423de89e3b2d8a96a523aef310a06485b9f45735dc5e4c6079b87504e874b9226b416cc5533e1a6393c0fa0375166323164b SHA512 b35c73b882a6b5bb28384fa6b7e71df8bc44571e630f1957f22d7e67a8a50acfb1d82df2a828dd08dd0e8fb5e9c4cd741c8463bc152af782b2263ec87c17f6a4
-EBUILD cpu-x-4.5.2.ebuild 1670 BLAKE2B f4cd9e218fa3d4fd71e79e04069e423de89e3b2d8a96a523aef310a06485b9f45735dc5e4c6079b87504e874b9226b416cc5533e1a6393c0fa0375166323164b SHA512 b35c73b882a6b5bb28384fa6b7e71df8bc44571e630f1957f22d7e67a8a50acfb1d82df2a828dd08dd0e8fb5e9c4cd741c8463bc152af782b2263ec87c17f6a4
-EBUILD cpu-x-4.5.3.ebuild 1745 BLAKE2B 13e76ce2dc3deb7fe8fd18c8a14199ebbdab30f2f3d717ca4a4eb0cd9c5862165d9a647ddbd554d20ee011fa4cc930d6c2714874ee8ec7a11549fbf8cdaa9ec3 SHA512 9b83036a9db89f518f1965c16ffbcbe5ecd12639273c78f4a80bcd5f8be8095013ed25e5eb7818b760429a58853aa30ed67a10009279d96f831a87d6df1121fc
+DIST cpu-x-5.0.0.tar.gz 1973209 BLAKE2B d34e99d899fe7a4c1d86b70af9059ad20a8edf7fc16864ad652ace8234aee86019c1359c46a19a230d759ed3a35636faee50df45613cc118ef683603eeeb54fc SHA512 c4fd7247c83987ab1c84586317a95327809510ed1289cd32cc16cd4d46c8d6af58f8496342e9172ad06cb8189d3e4c82a4826e9c8054fa2dc8cdd166ac29436d
+EBUILD cpu-x-4.5.3.ebuild 1767 BLAKE2B d8fbd0fee180e55fd2238e9985f629d1b866d95e7c0246055cb7587fb59f172da27a171bc63fab6b5795fef7b6f263e8890726d5983d7acc8221a51b7c42a21d SHA512 c0a98f444f3e07a3cd4d22ab893ba78336945cecdddbf714acfdca9f3d85f2a4b12f1d413b7ca7a4e45aa2186ddb23c51fbea2a6254cde912db3be973e5c220a
+EBUILD cpu-x-5.0.0.ebuild 1767 BLAKE2B d8fbd0fee180e55fd2238e9985f629d1b866d95e7c0246055cb7587fb59f172da27a171bc63fab6b5795fef7b6f263e8890726d5983d7acc8221a51b7c42a21d SHA512 c0a98f444f3e07a3cd4d22ab893ba78336945cecdddbf714acfdca9f3d85f2a4b12f1d413b7ca7a4e45aa2186ddb23c51fbea2a6254cde912db3be973e5c220a
 MISC metadata.xml 2509 BLAKE2B aeedc670e4097c94603eedbd8c2644c3e9d57441edbe9edba9fbff3695be48f352453dc0c9480975a3d9d058c38da18a5038346e6c3c34b610c7a1c639d3a2ee SHA512 6ae465a1bc12f3979caa2ed10577d4b3f969537594aa43a3ee8b806180b8b4db94908cc5db949055f3fff3c2efed562a5cdaa1fed1e17a3c177646a945729b3a
diff --git a/sys-apps/cpu-x/cpu-x-4.5.2.ebuild b/sys-apps/cpu-x/cpu-x-4.5.2.ebuild
deleted file mode 100644
index 10628d3fa7e2..000000000000
--- a/sys-apps/cpu-x/cpu-x-4.5.2.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 1999-2022 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"
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="-* ~amd64"
-IUSE="+cpu force-libstatgrab +gpu +gui +ncurses +nls opencl +pci test"
-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? ( >=x11-libs/gtk+-3.12:3 )
-	cpu? ( >=dev-libs/libcpuid-0.6.0:= )
-	gpu? ( >=media-libs/glfw-3.3
-		media-libs/libglvnd )
-	pci? ( sys-apps/pciutils )
-	ncurses? ( sys-libs/ncurses:=[tinfo] )
-	opencl? ( virtual/opencl )
-"
-
-DEPEND="
-	test? (
-		sys-apps/mawk
-		sys-apps/nawk
-	)
-
-	${COMMON_DEPEND}
-"
-
-BDEPEND="
-	dev-lang/nasm
-	nls? ( sys-devel/gettext )
-"
-
-RDEPEND="${COMMON_DEPEND}"
-
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-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)
-	)
-	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
-}
diff --git a/sys-apps/cpu-x/cpu-x-4.5.3.ebuild b/sys-apps/cpu-x/cpu-x-4.5.3.ebuild
index bcd8a36360ce..09a6bef8d7cb 100644
--- a/sys-apps/cpu-x/cpu-x-4.5.3.ebuild
+++ b/sys-apps/cpu-x/cpu-x-4.5.3.ebuild
@@ -35,6 +35,7 @@ COMMON_DEPEND="
 
 DEPEND="
 	test? (
+		sys-apps/grep[pcre]
 		sys-apps/mawk
 		sys-apps/nawk
 	)
diff --git a/sys-apps/cpu-x/cpu-x-4.5.1.ebuild b/sys-apps/cpu-x/cpu-x-5.0.0.ebuild
index 10628d3fa7e2..09a6bef8d7cb 100644
--- a/sys-apps/cpu-x/cpu-x-4.5.1.ebuild
+++ b/sys-apps/cpu-x/cpu-x-5.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/TheTumultuousUnicornOfDarkness/${MY_PN}/archive/v${P
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="-* ~amd64"
-IUSE="+cpu force-libstatgrab +gpu +gui +ncurses +nls opencl +pci test"
+IUSE="+cpu force-libstatgrab +gpu gui +ncurses +nls opencl +pci test vulkan"
 RESTRICT="!test? ( test )"
 
 COMMON_DEPEND="
@@ -30,10 +30,12 @@ COMMON_DEPEND="
 	pci? ( sys-apps/pciutils )
 	ncurses? ( sys-libs/ncurses:=[tinfo] )
 	opencl? ( virtual/opencl )
+	vulkan? ( media-libs/vulkan-loader )
 "
 
 DEPEND="
 	test? (
+		sys-apps/grep[pcre]
 		sys-apps/mawk
 		sys-apps/nawk
 	)
@@ -61,6 +63,7 @@ src_configure() {
 		-DWITH_LIBSTATGRAB=OFF
 		-DWITH_NCURSES=$(usex ncurses)
 		-DWITH_OPENCL=$(usex opencl)
+		-DWITH_VULKAN=$(usex vulkan)
 	)
 	use gui && mycmakeargs+=( -DGSETTINGS_COMPILE=OFF )