gentoo auto-resync : 17:01:2024 - 20:06:58

6 files changed, 11 insertions, 118 deletions

diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index bc383d813442..262a9df22e39 100644
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
diff --git a/app-misc/fastfetch/Manifest b/app-misc/fastfetch/Manifest
index 909907d9d7fe..08e8a4c75a28 100644
--- a/app-misc/fastfetch/Manifest
+++ b/app-misc/fastfetch/Manifest
@@ -1,9 +1,7 @@
-AUX fastfetch-2.5.0-nvidia.patch 3351 BLAKE2B b2b2522a7d2da3225624ee4039a6a4f615d5127d2d95e3be0f4e117bb49a384c92954a2b1e0ec141809f718167aea40313c31038304c1c8612fd215afb403364 SHA512 0b5144a674b3ac20e0dbc1cc995fe088a4b80547f8d5f684306b1c1cdc7dc45a4f7c57b411b1d4f655cbec5199211b44ad37877f340e9139eef21e856c019ed4
-AUX fastfetch-2.5.0-nvidia2.patch 821 BLAKE2B a12c7a75bee30d3d1060e779d51d66200c945308a8d559a0f1cf984549e8e4e4a4e8b9902ee06819ce58f42107c3ac78ae229eb4fd937c1ccc796f66311ac0b0 SHA512 415123a2329fadfb73b4a52ab8ab26bbc82a3d25101b539db4f599cb625c3ca51270422ab3378d7d4fdaab3aead35a7a63dabb839d26a3488df4160b969b0f6a
 DIST fastfetch-2.2.3.tar.gz 901203 BLAKE2B d6d097b72ce2f252e42b3e59cbd26b43a4f17ae974382f986270fbf91b457cf3c49e78a3c775e713d9302d536fb5a363e809005b9174d1a27622e6b6ed666709 SHA512 81e051b7555d56415c723606c0b6dfc3ad7ed91fb2c7b36c07465f4dfbdb91da5c8d216e46df36863888448de0a7bd63e28c6aa701995bf1165e0d7c33c4f724
-DIST fastfetch-2.5.0.tar.gz 984182 BLAKE2B 5185cce0e5933524835093a2f730cac8a9262cb6ec2c422fff60a4c6daec4f2a8ba11eab4323f00eaeebf2d946da9767f125b265e87cda6714d50e1c5e1383de SHA512 a69f4e839acf8897a9cd8f6c017a4d7657a8dc0b3c58e645c88fc8e47e0a7bd3411d1a3e1e916628a948cb7e1688a200f7ac1eabd090f5eb42ce4b0030e342b4
-EBUILD fastfetch-0.1.9999.ebuild 3207 BLAKE2B cabd4260ab8a66ccf3885032006ff31fd1e99e13bc0fc1ef1e074d3e3d93b8e1864ed3132418a1cabe3bcb8c1a639e98e1f528cd638e9b4e5b9ddf7efba71dc4 SHA512 89ec6d13b8e35d86a2b396f6b1d4528d0a2565da80becb8cb41e09a5cf83882ec738577280ce6014a8229aec0ba9664b75f186800aa9bdf467be38ab807ed67a
+DIST fastfetch-2.6.0.tar.gz 992987 BLAKE2B 07f33a1e0c272350128e5d0fdf69200af773260c3c83f08028289b6b0f9bd460b2916108818915e2cc7c226ce584e7096d297b53551a5354e7b8b8ea787baf7e SHA512 9a09d6f85948778413f5a82f44b42b925c7c5ce0920f99248003d3be8697d1ec934d1e2c21375bf3a99ce874c1cc25d01055e56ad5e3f1af70f8f93beebda702
+EBUILD fastfetch-0.1.9999.ebuild 3286 BLAKE2B 1053ae09434fc4607b709b00d07d46327e098985021925956e84ed69378925859afc0d84a970dba5a11bbbf2ebe76b0db89ba08ab155d2633583fdc8bbfc8216 SHA512 1072af3c2abd7241af57471b3e9df0add0029df2e3f43c26fbb31d05e71a3d2c221db3d65f160fb4aa934d74385c0b65d83d4ac7c1a0f690fccf32567c901d90
 EBUILD fastfetch-0.2.9999.ebuild 3343 BLAKE2B 1b3c20d502d08eac2f2e63df6f755878b94a103e6d54a03171b8f8482c77dac3fd28d4eea9dd0b01e1d25c6259e2a3eb1ae6edfa33e8537f8598e8f7dc2934a3 SHA512 593e23e2363cc8a5cde69108e711b55f45a8541b1317ca5b12bf9b55fd8faea1c7d69902aef04eaf0030aacf3abd16391aabb0a07b1c9066581301d72b783d83
 EBUILD fastfetch-2.2.3-r1.ebuild 3190 BLAKE2B f98df2430184abc34138f6fdb0be1efc43ab2805bc8cb78ced628cb52d33ca24c726312a4e5ce8e9439cd98b188028feab88850f58aa1e37cfca0bdf09740b50 SHA512 646f925ff00be6c2a248663d2c2a5cd758568f3e5c622a7553d1c94bd6c5fea471dccba24b9ebbfa98ef5826c50335cb13cbc775c5c8771dff230031a3e0880d
-EBUILD fastfetch-2.5.0.ebuild 3407 BLAKE2B 9d313c4815430ebfa56d793dcaa0263d3bef50de627a54b5052b128b8e2dea848b22d5668f976e7c8d67a48839da66b69bbb9533e36201890e6e44779c1dcffb SHA512 7816d2fbe861746962f567ab548623e8fc06e54c8b4560f14201ea652a84cf81c2c7463e4b16a3e77551cd911a56900362bfe0a2a4fbc9e3d2c924d4ebe84fba
+EBUILD fastfetch-2.6.0.ebuild 3343 BLAKE2B 1b3c20d502d08eac2f2e63df6f755878b94a103e6d54a03171b8f8482c77dac3fd28d4eea9dd0b01e1d25c6259e2a3eb1ae6edfa33e8537f8598e8f7dc2934a3 SHA512 593e23e2363cc8a5cde69108e711b55f45a8541b1317ca5b12bf9b55fd8faea1c7d69902aef04eaf0030aacf3abd16391aabb0a07b1c9066581301d72b783d83
 MISC metadata.xml 1257 BLAKE2B 521e87300ee660b7285c28ed7987a4cc52565e1c6fec3a10e37509822f829f808d468bd119ace4bea96d441b82d2cdce598d9d3cd25bacda5fae05920818a4bb SHA512 461c8f2f48789fe2635bb419f7655389a190b5684b9e1367dfb8faa7b6650984b001c8ac76051c39040526d51c71ac2faf566f0fd5a2f2e75c0702885eefa32a
diff --git a/app-misc/fastfetch/fastfetch-0.1.9999.ebuild b/app-misc/fastfetch/fastfetch-0.1.9999.ebuild
index 4af72e9b74c7..ebc7711c47c3 100644
--- a/app-misc/fastfetch/fastfetch-0.1.9999.ebuild
+++ b/app-misc/fastfetch/fastfetch-0.1.9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2022-2023 Gentoo Authors
+# Copyright 2022-2024 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -18,9 +18,9 @@ else
 	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
 fi
 
-LICENSE="MIT"
+LICENSE="MIT nvidia-gpu? ( NVIDIA-NVLM )"
 SLOT="0"
-IUSE="X chafa dbus ddcutil drm gnome imagemagick networkmanager opencl opengl osmesa pci pulseaudio sqlite test vulkan wayland xcb xfce xrandr"
+IUSE="X chafa dbus ddcutil drm gnome imagemagick networkmanager nvidia-gpu 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
@@ -54,7 +54,10 @@ RDEPEND="
 	xfce? ( xfce-base/xfconf )
 	xrandr? ( x11-libs/libXrandr )
 "
-DEPEND="${RDEPEND}"
+DEPEND="
+	${RDEPEND}
+	vulkan? ( dev-util/vulkan-headers )
+"
 BDEPEND="virtual/pkgconfig"
 
 REQUIRED_USE="
diff --git a/app-misc/fastfetch/fastfetch-2.5.0.ebuild b/app-misc/fastfetch/fastfetch-2.6.0.ebuild
index 2cdbae60debd..ff81f55971fe 100644
--- a/app-misc/fastfetch/fastfetch-2.5.0.ebuild
+++ b/app-misc/fastfetch/fastfetch-2.6.0.ebuild
@@ -65,11 +65,6 @@ REQUIRED_USE="
 	chafa? ( imagemagick )
 "
 
-PATCHES=(
-	"${FILESDIR}"/${P}-nvidia.patch
-	"${FILESDIR}"/${P}-nvidia2.patch
-)
-
 src_configure() {
 	local fastfetch_enable_imagemagick7=no
 	local fastfetch_enable_imagemagick6=no
@@ -95,7 +90,7 @@ src_configure() {
 		-DENABLE_IMAGEMAGICK7=${fastfetch_enable_imagemagick7}
 		-DENABLE_LIBNM=$(usex networkmanager)
 		-DENABLE_LIBPCI=$(usex pci)
-		-DENABLE_NVIDIA_GPU=$(usex nvidia-gpu)
+		-DENABLE_PROPRIETARY_GPU_DRIVER_API=$(usex nvidia-gpu)
 		-DENABLE_OPENCL=$(usex opencl)
 		-DENABLE_OSMESA=$(usex osmesa)
 		-DENABLE_PULSE=$(usex pulseaudio)
diff --git a/app-misc/fastfetch/files/fastfetch-2.5.0-nvidia.patch b/app-misc/fastfetch/files/fastfetch-2.5.0-nvidia.patch
deleted file mode 100644
index 263604bdf2fb..000000000000
--- a/app-misc/fastfetch/files/fastfetch-2.5.0-nvidia.patch
+++ /dev/null
@@ -1,83 +0,0 @@
-https://github.com/fastfetch-cli/fastfetch/commit/0a1de91a29b802962e123966e370befd3894cb6d.patch
-
-Option to opt out of Nvidia GPU support.
-
-From: Viorel <ceamac.paragon@gmail.com>
-Date: Mon, 1 Jan 2024 12:38:06 +0200
-Subject: [PATCH] Add option for NVIDIA GPU support
-
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -76,6 +76,7 @@ option(ENABLE_SYSTEM_YYJSON "Use system provided (instead of fastfetch embedded)
- option(ENABLE_ASAN "Build fastfetch with ASAN (address sanitizer)" OFF)
- option(BUILD_TESTS "Build tests" OFF) # Also create test executables
- option(SET_TWEAK "Add tweak to project version" ON) # This is set to off by github actions for release builds
-+option(ENABLE_NVIDIA_GPU "Enable Nvidia NVML" ON)
- 
- ####################
- # Compiler options #
-@@ -405,7 +406,6 @@ if(LINUX)
-         src/detection/displayserver/linux/xlib.c
-         src/detection/font/font_linux.c
-         src/detection/gpu/gpu_linux.c
--        src/detection/gpu/gpu_nvidia.c
-         src/detection/gtk_qt/gtk.c
-         src/detection/host/host_linux.c
-         src/detection/icons/icons_linux.c
-@@ -519,7 +519,6 @@ elseif(BSD)
-         src/detection/displayserver/linux/xlib.c
-         src/detection/font/font_linux.c
-         src/detection/gpu/gpu_linux.c
--        src/detection/gpu/gpu_nvidia.c
-         src/detection/gtk_qt/gtk.c
-         src/detection/host/host_bsd.c
-         src/detection/lm/lm_linux.c
-@@ -630,7 +629,6 @@ elseif(WIN32)
-         src/detection/displayserver/displayserver_windows.c
-         src/detection/font/font_windows.c
-         src/detection/gpu/gpu_windows.c
--        src/detection/gpu/gpu_nvidia.c
-         src/detection/gpu/gpu_intel.c
-         src/detection/gpu/gpu_amd.c
-         src/detection/host/host_windows.c
-@@ -676,6 +674,11 @@ if(ENABLE_DIRECTX_HEADERS)
-     list(APPEND LIBFASTFETCH_SRC src/detection/gpu/gpu_wsl.cpp)
- endif()
- 
-+if(ENABLE_NVIDIA_GPU AND (LINUX OR BSD OR WIN32))
-+    message(STATUS "Enabling Nvidia NVML")
-+    list(APPEND LIBFASTFETCH_SRC src/detection/gpu/gpu_nvidia.c)
-+endif()
-+
- include(CheckFunctionExists)
- check_function_exists(wcwidth HAVE_WCWIDTH)
- if(NOT HAVE_WCWIDTH)
-@@ -699,6 +702,10 @@ add_library(libfastfetch OBJECT
-     ${LIBFASTFETCH_SRC}
- )
- 
-+if(ENABLE_NVIDIA_GPU AND (LINUX OR BSD OR WIN32))
-+    target_compile_definitions(libfastfetch PRIVATE FF_HAVE_NVIDIA_GPU=1)
-+endif()
-+
- if(yyjson_FOUND)
-     target_compile_definitions(libfastfetch PRIVATE FF_USE_SYSTEM_YYJSON)
-     target_link_libraries(libfastfetch PRIVATE yyjson)
---- a/src/detection/gpu/gpu_linux.c
-+++ b/src/detection/gpu/gpu_linux.c
-@@ -245,6 +245,7 @@ static void pciHandleDevice(FF_MAYBE_UNUSED const FFGPUOptions* options, FFlist*
-     gpu->temperature = FF_GPU_TEMP_UNSET;
-     gpu->frequency = FF_GPU_FREQUENCY_UNSET;
- 
-+    #ifdef FF_HAVE_NVIDIA_GPU
-     if (gpu->vendor.chars == FF_GPU_VENDOR_NAME_NVIDIA && (options->temp || options->driverSpecific))
-     {
-         ffDetectNvidiaGpuInfo(&(FFGpuDriverCondition) {
-@@ -266,6 +267,7 @@ static void pciHandleDevice(FF_MAYBE_UNUSED const FFGPUOptions* options, FFlist*
-         if (gpu->dedicated.total != FF_GPU_VMEM_SIZE_UNSET)
-             gpu->type = gpu->dedicated.total > (uint64_t)1024 * 1024 * 1024 ? FF_GPU_TYPE_DISCRETE : FF_GPU_TYPE_INTEGRATED;
-     }
-+    #endif
- 
-     #ifdef __linux__
-     if(options->temp && gpu->temperature != gpu->temperature)
diff --git a/app-misc/fastfetch/files/fastfetch-2.5.0-nvidia2.patch b/app-misc/fastfetch/files/fastfetch-2.5.0-nvidia2.patch
deleted file mode 100644
index 5f256a61a34d..000000000000
--- a/app-misc/fastfetch/files/fastfetch-2.5.0-nvidia2.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-https://bugs.gentoo.org/921175
-
---- a/src/detection/gpu/gpu_wsl.cpp
-+++ b/src/detection/gpu/gpu_wsl.cpp
-@@ -98,6 +98,7 @@ const char* ffGPUDetectByDirectX(FF_MAYBE_UNUSED const FFGPUOptions* options, FF
-             const char* vendorStr = ffGetGPUVendorString((unsigned) hardwareId.vendorID);
-             ffStrbufSetStatic(&gpu->vendor, vendorStr);
- 
-+            #ifdef FF_HAVE_NVIDIA_GPU
-             if (vendorStr == FF_GPU_VENDOR_NAME_NVIDIA && (options->driverSpecific || options->temp))
-             {
-                 FFGpuDriverCondition cond = {
-@@ -117,6 +118,7 @@ const char* ffGPUDetectByDirectX(FF_MAYBE_UNUSED const FFGPUOptions* options, FF
-                     .frequency = &gpu->frequency,
-                 }, "/usr/lib/wsl/lib/libnvidia-ml.so");
-             }
-+            #endif
-         }
-     }
-