gentoo auto-resync : 19:12:2023 - 07:53:49

5 files changed, 50 insertions, 54 deletions

diff --git a/app-misc/fastfetch/Manifest b/app-misc/fastfetch/Manifest
index f7354f7b8760..291f12fbf586 100644
--- a/app-misc/fastfetch/Manifest
+++ b/app-misc/fastfetch/Manifest
@@ -1,10 +1,9 @@
-AUX fastfetch-2.0.0-dont-fetch-yyjson.patch 843 BLAKE2B dc37cb21096ea415fa806265081f33fc48e735fe29b7ff5b742368aac6218bc9345145a81394d2936ca23c0e7fee05dd50a32ca3feb7182c3e11b8a833a6017d SHA512 c3a41cd0ed3b33b9ebc3bc9876c7db6ae9c71b8dfac7e92259a09372d059fcb032c6a34c10791758583b810de0f6db21c1ba8426e3611ae67ee97836329109cf
-DIST fastfetch-1.12.2.tar.gz 538194 BLAKE2B bc6badbc7f690dacbe1408479286a0d42ec687526f776ff4d2ec7b0eb767032e5781cbbe37778f4dc03a5d386979a9ae2aab84c466be997b82d9a9a6c81ea78f SHA512 a82a7c7ae365335c20d659a82215cf320c4c6b07ff127c4dad322a0a01f7ec57e34d229f4953108daadcd0d243c84f8504a3b4367df5e255e5a06e685fd6739a
 DIST fastfetch-2.2.3.tar.gz 901203 BLAKE2B d6d097b72ce2f252e42b3e59cbd26b43a4f17ae974382f986270fbf91b457cf3c49e78a3c775e713d9302d536fb5a363e809005b9174d1a27622e6b6ed666709 SHA512 81e051b7555d56415c723606c0b6dfc3ad7ed91fb2c7b36c07465f4dfbdb91da5c8d216e46df36863888448de0a7bd63e28c6aa701995bf1165e0d7c33c4f724
 DIST fastfetch-2.3.4.tar.gz 909105 BLAKE2B 132f88681f9133cdeae8126c4dabf4e8805865fe506a005f938bcda487750a874ab59deebdf2fc348c2a469cf4771fe5916f594a5a408769c1e49fba417ab113 SHA512 fe1e6465380e513e4e75092bc737b23adca4c9dd42de8adb888bad1ce173f1fa9c93e9cbd7b2ca648058503b7cfb72c2ba1d70abf63b8f1497e94ce6eb349524
-EBUILD fastfetch-0.1.9999.ebuild 2964 BLAKE2B 273947170f50ecb9629efdf10027a7b6af5c98329470f97f7078e0082f8b128e9bf428c4d82b8df52a09d3b96fdc88d8c1bff79719838effaac43aacb32f7b00 SHA512 ead9d649523d9ec049bea90516a04f1fb2fc43618e4592f8faa8e0b309ac783e798baf0ccafc89ddd4a3cb23338f2544df65be4ca41f590048f53fc2d78d1028
-EBUILD fastfetch-0.2.9999.ebuild 2884 BLAKE2B cb3aba85dbd4ea7a8086d6bfd35ac053a6893f17cbbc8b916fa514f575c7407a0e68359b09d66243d52b4276d1d67f584eb41c46066542d5548610f4bc27b285 SHA512 40707f326072cff867587a0ba82f26ebd203920a3d2b4d9668f26ca9c0d4152a05555c2e6975fd1ecffa8ab8fea8a8cc4f975bf02a9113de781fd51969e3e5d8
-EBUILD fastfetch-1.12.2.ebuild 2838 BLAKE2B 1185a5c20a06bf6e6112f4cc8942eb10ff403f7db2a4edabc1264db19448cfd992da044619b767751bd3d25d1759a6e6a8440aa529e058226adfec8cbfc400b8 SHA512 47b8b945db6391ba18a7fd93c0a9c6d53ccf1d0ede37538dbcb5ed95975f3691bd3f87492860e5e61727aa020ba42acd18ef4e27ffa9b21dfaae10fea9e94752
+DIST fastfetch-2.4.0.tar.gz 913193 BLAKE2B 88df9a8cb641596855cbd539d0be7f9270cd234dc060612ee6c52f5d47b2deb0d95608bdc496c81ac5e0e74c0c403f373fdcf7c17303eebab1f3b32ee0a41270 SHA512 00130ad3825cff039dc9ab3efd9f3431b36357e0ae144148872ab761f8b07a8d95c2413450d000b0181e9424d490ad55e6af928d1b7b2efdc7d5842ead8ab028
+EBUILD fastfetch-0.1.9999.ebuild 3207 BLAKE2B cabd4260ab8a66ccf3885032006ff31fd1e99e13bc0fc1ef1e074d3e3d93b8e1864ed3132418a1cabe3bcb8c1a639e98e1f528cd638e9b4e5b9ddf7efba71dc4 SHA512 89ec6d13b8e35d86a2b396f6b1d4528d0a2565da80becb8cb41e09a5cf83882ec738577280ce6014a8229aec0ba9664b75f186800aa9bdf467be38ab807ed67a
+EBUILD fastfetch-0.2.9999.ebuild 3207 BLAKE2B cabd4260ab8a66ccf3885032006ff31fd1e99e13bc0fc1ef1e074d3e3d93b8e1864ed3132418a1cabe3bcb8c1a639e98e1f528cd638e9b4e5b9ddf7efba71dc4 SHA512 89ec6d13b8e35d86a2b396f6b1d4528d0a2565da80becb8cb41e09a5cf83882ec738577280ce6014a8229aec0ba9664b75f186800aa9bdf467be38ab807ed67a
 EBUILD fastfetch-2.2.3-r1.ebuild 3150 BLAKE2B 68ef835c0dcd463b19fa4ece4f7c64107af0ba3cbdf05f78e8ebf664d4db6ecd662a659899d4f5977d26801aea4d29be55476842186a917d39e4811dcbeb37cd SHA512 2493ed60298576479119a6bfae5ae6966fb0bd9fef92d48c3b60759dd3b8dddbd3f35a164f3d67b31f568386378def792361154d4ea71e8fd72f56e64b773fee
 EBUILD fastfetch-2.3.4.ebuild 3207 BLAKE2B cabd4260ab8a66ccf3885032006ff31fd1e99e13bc0fc1ef1e074d3e3d93b8e1864ed3132418a1cabe3bcb8c1a639e98e1f528cd638e9b4e5b9ddf7efba71dc4 SHA512 89ec6d13b8e35d86a2b396f6b1d4528d0a2565da80becb8cb41e09a5cf83882ec738577280ce6014a8229aec0ba9664b75f186800aa9bdf467be38ab807ed67a
+EBUILD fastfetch-2.4.0.ebuild 3207 BLAKE2B cabd4260ab8a66ccf3885032006ff31fd1e99e13bc0fc1ef1e074d3e3d93b8e1864ed3132418a1cabe3bcb8c1a639e98e1f528cd638e9b4e5b9ddf7efba71dc4 SHA512 89ec6d13b8e35d86a2b396f6b1d4528d0a2565da80becb8cb41e09a5cf83882ec738577280ce6014a8229aec0ba9664b75f186800aa9bdf467be38ab807ed67a
 MISC metadata.xml 1188 BLAKE2B 1eda2e0d51e6743207de52da82b322ccd1b007ab0f977bae0dd2deeb35b5beddfc835258380ae01d134c44bfdb552f0228d5cdc07d00e3c994e9e651ea64b49e SHA512 577afae25bcf6cf698018ff431d8600179e62746e67459d9e7999d901ededfac98d1aa4729c7bf044163c356e7ecff155b77794e4e4d9f1ff5e189a7f63aa880
diff --git a/app-misc/fastfetch/fastfetch-0.1.9999.ebuild b/app-misc/fastfetch/fastfetch-0.1.9999.ebuild
index 950efaa60c13..4af72e9b74c7 100644
--- a/app-misc/fastfetch/fastfetch-0.1.9999.ebuild
+++ b/app-misc/fastfetch/fastfetch-0.1.9999.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 inherit cmake flag-o-matic
 
-DESCRIPTION="Fast system information tool"
+DESCRIPTION="Fast neofetch-like system information tool"
 HOMEPAGE="https://github.com/fastfetch-cli/fastfetch"
 if [[ ${PV} == *9999 ]]; then
 	inherit git-r3
@@ -15,21 +15,24 @@ if [[ ${PV} == *9999 ]]; then
 	[[ "${EGIT_BRANCH}" == "" ]] && die "Please set a git branch"
 else
 	SRC_URI="https://github.com/fastfetch-cli/fastfetch/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64"
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
 fi
 
 LICENSE="MIT"
 SLOT="0"
-IUSE="X chafa dbus ddcutil gnome imagemagick networkmanager opencl opengl osmesa pci pulseaudio sqlite vulkan wayland xcb xfce xrandr"
+IUSE="X chafa dbus ddcutil drm gnome imagemagick networkmanager opencl opengl osmesa pci pulseaudio sqlite test vulkan wayland xcb xfce xrandr"
+RESTRICT="!test? ( test )"
 
 # note - qa-vdb will always report errors because fastfetch loads the libs dynamically
+# make sure to crank yyjson minimum version to match bundled version
 RDEPEND="
-	dev-libs/yyjson
+	>=dev-libs/yyjson-0.8.0:=
 	sys-libs/zlib
 	X? ( x11-libs/libX11 )
 	chafa? ( media-gfx/chafa )
 	dbus? ( sys-apps/dbus )
 	ddcutil? ( app-misc/ddcutil:= )
+	drm? ( x11-libs/libdrm )
 	gnome? (
 		dev-libs/glib
 		gnome-base/dconf
@@ -42,7 +45,10 @@ RDEPEND="
 	pci? ( sys-apps/pciutils )
 	pulseaudio? ( media-libs/libpulse )
 	sqlite? ( dev-db/sqlite:3 )
-	vulkan? ( media-libs/vulkan-loader )
+	vulkan? (
+		media-libs/vulkan-loader
+		sys-apps/pciutils
+	)
 	wayland? ( dev-libs/wayland )
 	xcb? ( x11-libs/libxcb )
 	xfce? ( xfce-base/xfconf )
@@ -56,8 +62,6 @@ REQUIRED_USE="
 	chafa? ( imagemagick )
 "
 
-PATCHES=( "${FILESDIR}"/${PN}-2.0.0-dont-fetch-yyjson.patch )
-
 src_configure() {
 	local fastfetch_enable_imagemagick7=no
 	local fastfetch_enable_imagemagick6=no
@@ -69,11 +73,13 @@ src_configure() {
 	local mycmakeargs=(
 		-DENABLE_RPM=no
 		-DENABLE_ZLIB=yes
+		-DENABLE_SYSTEM_YYJSON=yes
 
 		-DENABLE_CHAFA=$(usex chafa)
 		-DENABLE_DBUS=$(usex dbus)
-		-DENABLE_DDCUTIL=$(usex ddcutil)
 		-DENABLE_DCONF=$(usex gnome)
+		-DENABLE_DDCUTIL=$(usex ddcutil)
+		-DENABLE_DRM=$(usex drm)
 		-DENABLE_EGL=$(usex opengl)
 		-DENABLE_GIO=$(usex gnome)
 		-DENABLE_GLX=$(usex opengl)
@@ -92,6 +98,7 @@ src_configure() {
 		-DENABLE_XCB_RANDR=$(usex xcb)
 		-DENABLE_XFCONF=$(usex xfce)
 		-DENABLE_XRANDR=$(usex xrandr)
+		-DBUILD_TESTS=$(usex test)
 	)
 
 	append-cppflags -DNDEBUG
diff --git a/app-misc/fastfetch/fastfetch-0.2.9999.ebuild b/app-misc/fastfetch/fastfetch-0.2.9999.ebuild
index f7fd71b82868..4af72e9b74c7 100644
--- a/app-misc/fastfetch/fastfetch-0.2.9999.ebuild
+++ b/app-misc/fastfetch/fastfetch-0.2.9999.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 inherit cmake flag-o-matic
 
-DESCRIPTION="Fast system information tool"
+DESCRIPTION="Fast neofetch-like system information tool"
 HOMEPAGE="https://github.com/fastfetch-cli/fastfetch"
 if [[ ${PV} == *9999 ]]; then
 	inherit git-r3
@@ -15,20 +15,24 @@ if [[ ${PV} == *9999 ]]; then
 	[[ "${EGIT_BRANCH}" == "" ]] && die "Please set a git branch"
 else
 	SRC_URI="https://github.com/fastfetch-cli/fastfetch/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64"
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
 fi
 
 LICENSE="MIT"
 SLOT="0"
-IUSE="X chafa dbus ddcutil gnome imagemagick networkmanager opencl opengl osmesa pci pulseaudio sqlite vulkan wayland xcb xfce xrandr"
+IUSE="X chafa dbus ddcutil drm gnome imagemagick networkmanager opencl opengl osmesa pci pulseaudio sqlite test vulkan wayland xcb xfce xrandr"
+RESTRICT="!test? ( test )"
 
 # note - qa-vdb will always report errors because fastfetch loads the libs dynamically
+# make sure to crank yyjson minimum version to match bundled version
 RDEPEND="
+	>=dev-libs/yyjson-0.8.0:=
 	sys-libs/zlib
 	X? ( x11-libs/libX11 )
 	chafa? ( media-gfx/chafa )
 	dbus? ( sys-apps/dbus )
 	ddcutil? ( app-misc/ddcutil:= )
+	drm? ( x11-libs/libdrm )
 	gnome? (
 		dev-libs/glib
 		gnome-base/dconf
@@ -41,7 +45,10 @@ RDEPEND="
 	pci? ( sys-apps/pciutils )
 	pulseaudio? ( media-libs/libpulse )
 	sqlite? ( dev-db/sqlite:3 )
-	vulkan? ( media-libs/vulkan-loader )
+	vulkan? (
+		media-libs/vulkan-loader
+		sys-apps/pciutils
+	)
 	wayland? ( dev-libs/wayland )
 	xcb? ( x11-libs/libxcb )
 	xfce? ( xfce-base/xfconf )
@@ -66,11 +73,13 @@ src_configure() {
 	local mycmakeargs=(
 		-DENABLE_RPM=no
 		-DENABLE_ZLIB=yes
+		-DENABLE_SYSTEM_YYJSON=yes
 
 		-DENABLE_CHAFA=$(usex chafa)
 		-DENABLE_DBUS=$(usex dbus)
-		-DENABLE_DDCUTIL=$(usex ddcutil)
 		-DENABLE_DCONF=$(usex gnome)
+		-DENABLE_DDCUTIL=$(usex ddcutil)
+		-DENABLE_DRM=$(usex drm)
 		-DENABLE_EGL=$(usex opengl)
 		-DENABLE_GIO=$(usex gnome)
 		-DENABLE_GLX=$(usex opengl)
@@ -89,6 +98,7 @@ src_configure() {
 		-DENABLE_XCB_RANDR=$(usex xcb)
 		-DENABLE_XFCONF=$(usex xfce)
 		-DENABLE_XRANDR=$(usex xrandr)
+		-DBUILD_TESTS=$(usex test)
 	)
 
 	append-cppflags -DNDEBUG
diff --git a/app-misc/fastfetch/fastfetch-1.12.2.ebuild b/app-misc/fastfetch/fastfetch-2.4.0.ebuild
index 314070c56831..4af72e9b74c7 100644
--- a/app-misc/fastfetch/fastfetch-1.12.2.ebuild
+++ b/app-misc/fastfetch/fastfetch-2.4.0.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 inherit cmake flag-o-matic
 
-DESCRIPTION="Fast system information tool"
+DESCRIPTION="Fast neofetch-like system information tool"
 HOMEPAGE="https://github.com/fastfetch-cli/fastfetch"
 if [[ ${PV} == *9999 ]]; then
 	inherit git-r3
@@ -15,19 +15,24 @@ if [[ ${PV} == *9999 ]]; then
 	[[ "${EGIT_BRANCH}" == "" ]] && die "Please set a git branch"
 else
 	SRC_URI="https://github.com/fastfetch-cli/fastfetch/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~ppc64"
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
 fi
 
 LICENSE="MIT"
 SLOT="0"
-IUSE="X chafa dbus gnome imagemagick networkmanager opencl opengl osmesa pci pulseaudio sqlite vulkan wayland xcb xfce xrandr"
+IUSE="X chafa dbus ddcutil drm gnome imagemagick networkmanager opencl opengl osmesa pci pulseaudio sqlite test vulkan wayland xcb xfce xrandr"
+RESTRICT="!test? ( test )"
 
 # note - qa-vdb will always report errors because fastfetch loads the libs dynamically
+# make sure to crank yyjson minimum version to match bundled version
 RDEPEND="
+	>=dev-libs/yyjson-0.8.0:=
 	sys-libs/zlib
 	X? ( x11-libs/libX11 )
 	chafa? ( media-gfx/chafa )
 	dbus? ( sys-apps/dbus )
+	ddcutil? ( app-misc/ddcutil:= )
+	drm? ( x11-libs/libdrm )
 	gnome? (
 		dev-libs/glib
 		gnome-base/dconf
@@ -40,7 +45,10 @@ RDEPEND="
 	pci? ( sys-apps/pciutils )
 	pulseaudio? ( media-libs/libpulse )
 	sqlite? ( dev-db/sqlite:3 )
-	vulkan? ( media-libs/vulkan-loader )
+	vulkan? (
+		media-libs/vulkan-loader
+		sys-apps/pciutils
+	)
 	wayland? ( dev-libs/wayland )
 	xcb? ( x11-libs/libxcb )
 	xfce? ( xfce-base/xfconf )
@@ -63,13 +71,15 @@ src_configure() {
 	fi
 
 	local mycmakeargs=(
-		-DENABLE_LIBCJSON=no
 		-DENABLE_RPM=no
 		-DENABLE_ZLIB=yes
+		-DENABLE_SYSTEM_YYJSON=yes
 
 		-DENABLE_CHAFA=$(usex chafa)
 		-DENABLE_DBUS=$(usex dbus)
 		-DENABLE_DCONF=$(usex gnome)
+		-DENABLE_DDCUTIL=$(usex ddcutil)
+		-DENABLE_DRM=$(usex drm)
 		-DENABLE_EGL=$(usex opengl)
 		-DENABLE_GIO=$(usex gnome)
 		-DENABLE_GLX=$(usex opengl)
@@ -88,6 +98,7 @@ src_configure() {
 		-DENABLE_XCB_RANDR=$(usex xcb)
 		-DENABLE_XFCONF=$(usex xfce)
 		-DENABLE_XRANDR=$(usex xrandr)
+		-DBUILD_TESTS=$(usex test)
 	)
 
 	append-cppflags -DNDEBUG
diff --git a/app-misc/fastfetch/files/fastfetch-2.0.0-dont-fetch-yyjson.patch b/app-misc/fastfetch/files/fastfetch-2.0.0-dont-fetch-yyjson.patch
deleted file mode 100644
index e235cf3a6f00..000000000000
--- a/app-misc/fastfetch/files/fastfetch-2.0.0-dont-fetch-yyjson.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-fastfetch 2.0.0 tries to fetch yyjson at build time.
-
-This is not allowed in Gentoo.
-
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -36,24 +36,6 @@
- 
- include(CheckIncludeFile)
- 
--include(FetchContent)
--function(ff_fetch_dep package repo tag)
--    FetchContent_Declare(
--        "${package}"
--        GIT_REPOSITORY "${repo}"
--        GIT_TAG "${tag}"
--        GIT_PROGRESS TRUE
--    )
--    FetchContent_GetProperties("${package}")
--    if(NOT ${package}_POPULATED)
--        message("-- Fetching dependency ${package}@${tag} from ${repo}")
--        FetchContent_Populate(${package})
--        add_subdirectory(${${package}_SOURCE_DIR} ${${package}_BINARY_DIR} EXCLUDE_FROM_ALL)
--    endif()
--endfunction()
--
--ff_fetch_dep(yyjson "https://github.com/ibireme/yyjson" "0.7.0")
--
- #####################
- # Configure options #
- #####################