From 721e451ec418e1712f6962404e111f0ebd487389 Mon Sep 17 00:00:00 2001
From: V3n3RiX <venerix@koprulu.sector>
Date: Fri, 27 Dec 2024 06:30:35 +0000
Subject: gentoo auto-resync : 27:12:2024 - 06:30:34

---
 app-misc/fastfetch/Manifest                  |  12 +--
 app-misc/fastfetch/fastfetch-0.1.9999.ebuild |  27 ++++--
 app-misc/fastfetch/fastfetch-0.2.9999.ebuild |  27 ++++--
 app-misc/fastfetch/fastfetch-2.28.0.ebuild   | 111 -----------------------
 app-misc/fastfetch/fastfetch-2.31.0.ebuild   | 125 --------------------------
 app-misc/fastfetch/fastfetch-2.32.1.ebuild   | 125 --------------------------
 app-misc/fastfetch/fastfetch-2.33.0.ebuild   | 126 +++++++++++++++++++++++++++
 7 files changed, 172 insertions(+), 381 deletions(-)
 delete mode 100644 app-misc/fastfetch/fastfetch-2.28.0.ebuild
 delete mode 100644 app-misc/fastfetch/fastfetch-2.31.0.ebuild
 delete mode 100644 app-misc/fastfetch/fastfetch-2.32.1.ebuild
 create mode 100644 app-misc/fastfetch/fastfetch-2.33.0.ebuild

(limited to 'app-misc/fastfetch')

diff --git a/app-misc/fastfetch/Manifest b/app-misc/fastfetch/Manifest
index f2f3f3bd6b01..9f84d14cf088 100644
--- a/app-misc/fastfetch/Manifest
+++ b/app-misc/fastfetch/Manifest
@@ -1,13 +1,9 @@
-DIST fastfetch-2.28.0.tar.gz 1131275 BLAKE2B dc119a91b61b6a868140cf7dad8854f998b05b04ed0b8d3c36597fb5f39594f46acda7f26f6aa43392015f36af40a45e2773524440295a944a17198f19d9ea00 SHA512 9a08da7328234caa9bd77ac2393e8c0f8006dc1e9d97f7ceec4d1b737899e0b10ae8b726485bdac70da49f985c5386a341806555c27dfb73fb35a513704352ee
 DIST fastfetch-2.29.0.tar.gz 1136647 BLAKE2B 34e3d6d95bd19bb5d9bbfbc2c6f08af79dbe7175b2149c16684e9a7d8a9131efe27875eb08fad82e7dae320b5d75ebad4554f73f25f6bf8e63352059c71a0144 SHA512 75e483c0ca2ad5455f64074ed922865298a889455af0ff5197fc82d77df71da6a3e1dac061f24fcce010dae00a02ee037777f09a9320b2a93d71b275d5475af8
 DIST fastfetch-2.30.1.tar.gz 1144835 BLAKE2B f44e0d8b74f124a1978403c0af61450eae4f668c0ed8e3d56505ede715366c90ad8099ae652a9afbb1c57ed2af01a930834a53ca6e871d6ad8078ce0179970f0 SHA512 626eaea5cb4ea3c61b44d24acf836734e7a04e8a3cf78bd0c8c3d4dcaf28bc165501906f97cc1423aadf8d822539e82251b65f3089780232dc214d07ce6aba7a
-DIST fastfetch-2.31.0.tar.gz 1149745 BLAKE2B 591fb659049e18366bb0d202a448f56b6a179f54a0b9d1eab8d096eb7b4025e5d91b99a93bd4d699e40217103b85cd75c9a52a93a6ef065ea88c096f11056e32 SHA512 636912c1cadfd95518b84f10d30413cf981e0e7d99c132cbaeaa60fe426ac58aa456150469238a401a83b763525117a94f2382f94df4692e9a236ed18981279e
-DIST fastfetch-2.32.1.tar.gz 1158012 BLAKE2B 218df83a00bfc70dfea066d9ca647f1b9a768ac6f76be74533646185a9bddd10936a55bc9404518a9a4b21434a113199dc7fa5de866980b7fe10062cd8af193e SHA512 4fb6f75c8db6f1dbcf377d1df53a4c1d760940a8665db157c510e814b26e23f09cd308700549c965b65f5f973d520f1334a04f0ffe6efa9ae73da7d0d5c1048c
-EBUILD fastfetch-0.1.9999.ebuild 3140 BLAKE2B 590305770bf5609261c4f9650515fe09f901175753535457bf6aa233e37c8a1a17024646774c1305ecda4f179fb3c21779bc9618d601bd41f4df803e2606aea0 SHA512 6e31411e743d366098d2a2c548f3b02a64cace516a84156246b50cf076721e5a4093214e91219cbcbbb2baf7f84024b6f04fcb692af4a5d963cd3ba7d53f685d
-EBUILD fastfetch-0.2.9999.ebuild 3140 BLAKE2B 590305770bf5609261c4f9650515fe09f901175753535457bf6aa233e37c8a1a17024646774c1305ecda4f179fb3c21779bc9618d601bd41f4df803e2606aea0 SHA512 6e31411e743d366098d2a2c548f3b02a64cace516a84156246b50cf076721e5a4093214e91219cbcbbb2baf7f84024b6f04fcb692af4a5d963cd3ba7d53f685d
-EBUILD fastfetch-2.28.0.ebuild 3137 BLAKE2B 2ef89b3171766797ac6d0e6adc2ccfe382fa94b37ed9e60df81ab37ee316aab370a53fd69038c6f3c561d2b4c20dc9a29b511afb9e9e7065bde92a4c1b253299 SHA512 087bae54243297c377be64ee38c30efd118243b83bc0686ec165c65eb8a869ee83e7d1f61ee88a732e04288e542b2443dad9d0a9a53030d503b9419410b3a6ae
+DIST fastfetch-2.33.0.tar.gz 1161845 BLAKE2B 1a31aa0b7651c27ecff34067360c136ad5c0dddac60e5bc2c4ae749194d63c49df3bc92de91e5a3249b8bcd1f640b62025a01d7f6b89b96991ad1623ca079bb5 SHA512 f9d824f908e36e3dc1b7784f2da818d764be6bbc6baa77d6b26ea6776acb5f101c4c39267fa42d1c9ae735c9889badc7b3a65170d81308de852a178e50140154
+EBUILD fastfetch-0.1.9999.ebuild 3443 BLAKE2B 278037dd445b5d4c04ebb6c0b352f99d0d26f7211745545fb350f440a5b9e640aec786f7ecae0c416bf7d1630b971b9d73121ad0a1a69856abecc88be52a02b2 SHA512 473c0698310206dc7bec63b99828c512d25be4cbf6ebaa78bf40f112abf8f97795ab2531a2a2b331f795a70ff5ebe735b6eabd1e23971ca7eb244f93d24c5ac4
+EBUILD fastfetch-0.2.9999.ebuild 3443 BLAKE2B 278037dd445b5d4c04ebb6c0b352f99d0d26f7211745545fb350f440a5b9e640aec786f7ecae0c416bf7d1630b971b9d73121ad0a1a69856abecc88be52a02b2 SHA512 473c0698310206dc7bec63b99828c512d25be4cbf6ebaa78bf40f112abf8f97795ab2531a2a2b331f795a70ff5ebe735b6eabd1e23971ca7eb244f93d24c5ac4
 EBUILD fastfetch-2.29.0.ebuild 3137 BLAKE2B 2ef89b3171766797ac6d0e6adc2ccfe382fa94b37ed9e60df81ab37ee316aab370a53fd69038c6f3c561d2b4c20dc9a29b511afb9e9e7065bde92a4c1b253299 SHA512 087bae54243297c377be64ee38c30efd118243b83bc0686ec165c65eb8a869ee83e7d1f61ee88a732e04288e542b2443dad9d0a9a53030d503b9419410b3a6ae
 EBUILD fastfetch-2.30.1.ebuild 3137 BLAKE2B 2ef89b3171766797ac6d0e6adc2ccfe382fa94b37ed9e60df81ab37ee316aab370a53fd69038c6f3c561d2b4c20dc9a29b511afb9e9e7065bde92a4c1b253299 SHA512 087bae54243297c377be64ee38c30efd118243b83bc0686ec165c65eb8a869ee83e7d1f61ee88a732e04288e542b2443dad9d0a9a53030d503b9419410b3a6ae
-EBUILD fastfetch-2.31.0.ebuild 3419 BLAKE2B 1281440d2d4a99b0d10788f354ba25c5c33c4d1df8d60d6592780e4ffab13834388c8267f755b597ac5b3369b5ed500055ee0e75b9397b71778a423020ce5e52 SHA512 4ccbb8cf7210499ae646306257964afca97f507521faab999e398ec9d965fb64312566b68da184703dea9f8c0e20c5ca70220ca62751a3079d57fa75df7df7bb
-EBUILD fastfetch-2.32.1.ebuild 3419 BLAKE2B 1281440d2d4a99b0d10788f354ba25c5c33c4d1df8d60d6592780e4ffab13834388c8267f755b597ac5b3369b5ed500055ee0e75b9397b71778a423020ce5e52 SHA512 4ccbb8cf7210499ae646306257964afca97f507521faab999e398ec9d965fb64312566b68da184703dea9f8c0e20c5ca70220ca62751a3079d57fa75df7df7bb
+EBUILD fastfetch-2.33.0.ebuild 3443 BLAKE2B 278037dd445b5d4c04ebb6c0b352f99d0d26f7211745545fb350f440a5b9e640aec786f7ecae0c416bf7d1630b971b9d73121ad0a1a69856abecc88be52a02b2 SHA512 473c0698310206dc7bec63b99828c512d25be4cbf6ebaa78bf40f112abf8f97795ab2531a2a2b331f795a70ff5ebe735b6eabd1e23971ca7eb244f93d24c5ac4
 MISC metadata.xml 1398 BLAKE2B bba6a400cbf5e68dc779b4f15cf30b477a4837cd57e09fb17cf4c2ca06e05b19d89c9cd3c1063b078b3411a27c5b265e78e21e15e9cb32b1c681bd9a4bab3545 SHA512 018c51650911637fad242e431a2a9bdb017210b9082c0c49ed29e744fc2cba7733617d49721dd9d2519ee24ea61076608154d63e1f67c3ada4a1ef4774be2432
diff --git a/app-misc/fastfetch/fastfetch-0.1.9999.ebuild b/app-misc/fastfetch/fastfetch-0.1.9999.ebuild
index 6186f29ea3dc..3a36d05b4aad 100644
--- a/app-misc/fastfetch/fastfetch-0.1.9999.ebuild
+++ b/app-misc/fastfetch/fastfetch-0.1.9999.ebuild
@@ -29,7 +29,6 @@ RDEPEND="
 	>=dev-libs/yyjson-0.10.0
 	sys-apps/hwdata
 	sys-libs/zlib
-	X? ( x11-libs/libX11 )
 	chafa? ( media-gfx/chafa )
 	dbus? ( sys-apps/dbus )
 	ddcutil? ( app-misc/ddcutil:= )
@@ -41,7 +40,10 @@ RDEPEND="
 	)
 	imagemagick? ( media-gfx/imagemagick:= )
 	opencl? ( virtual/opencl )
-	opengl? ( media-libs/libglvnd[X] )
+	opengl? (
+		media-libs/libglvnd[X?]
+		X? ( x11-libs/libX11 )
+	)
 	osmesa? ( media-libs/mesa[osmesa] )
 	pulseaudio? ( media-libs/libpulse )
 	sqlite? ( dev-db/sqlite:3 )
@@ -56,15 +58,24 @@ RDEPEND="
 "
 DEPEND="
 	${RDEPEND}
+	opengl? ( X? ( x11-base/xorg-proto ) )
+	xcb? ( x11-base/xorg-proto )
+	xrandr? ( x11-base/xorg-proto )
 	vulkan? ( dev-util/vulkan-headers )
 "
 BDEPEND="virtual/pkgconfig"
 
 REQUIRED_USE="
-	xrandr? ( X )
 	chafa? ( imagemagick )
 "
 
+pkg_pretend() {
+	if use X && ! use opengl; then
+		einfo 'USE="X" adds GLX support for USE="opengl"'
+		einfo 'This build with USE="X -opengl" will not include any extra X support.'
+	fi
+}
+
 src_configure() {
 	local fastfetch_enable_imagemagick7=no
 	local fastfetch_enable_imagemagick6=no
@@ -73,12 +84,18 @@ src_configure() {
 		fastfetch_enable_imagemagick6=$(has_version '<media-gfx/imagemagick-7.0.0' && echo yes || echo no)
 	fi
 
+	local glx=no
+	if use opengl && use X; then
+		glx=yes
+	fi
+
 	local mycmakeargs=(
 		-DENABLE_RPM=no
 		-DENABLE_ZLIB=yes
 		-DENABLE_SYSTEM_YYJSON=yes
 		-DIS_MUSL=$(usex elibc_musl)
 		-DINSTALL_LICENSE=no
+		-DBUILD_FLASHFETCH=no
 
 		-DENABLE_CHAFA=$(usex chafa)
 		-DENABLE_DBUS=$(usex dbus)
@@ -88,7 +105,7 @@ src_configure() {
 		-DENABLE_ELF=$(usex elf)
 		-DENABLE_EGL=$(usex opengl)
 		-DENABLE_GIO=$(usex gnome)
-		-DENABLE_GLX=$(usex opengl)
+		-DENABLE_GLX=${glx}
 		-DENABLE_IMAGEMAGICK6=${fastfetch_enable_imagemagick6}
 		-DENABLE_IMAGEMAGICK7=${fastfetch_enable_imagemagick7}
 		-DENABLE_OPENCL=$(usex opencl)
@@ -97,8 +114,6 @@ src_configure() {
 		-DENABLE_SQLITE3=$(usex sqlite)
 		-DENABLE_VULKAN=$(usex vulkan)
 		-DENABLE_WAYLAND=$(usex wayland)
-		-DENABLE_X11=$(usex X)
-		-DENABLE_XCB=$(usex xcb)
 		-DENABLE_XCB_RANDR=$(usex xcb)
 		-DENABLE_XFCONF=$(usex xfce)
 		-DENABLE_XRANDR=$(usex xrandr)
diff --git a/app-misc/fastfetch/fastfetch-0.2.9999.ebuild b/app-misc/fastfetch/fastfetch-0.2.9999.ebuild
index 6186f29ea3dc..3a36d05b4aad 100644
--- a/app-misc/fastfetch/fastfetch-0.2.9999.ebuild
+++ b/app-misc/fastfetch/fastfetch-0.2.9999.ebuild
@@ -29,7 +29,6 @@ RDEPEND="
 	>=dev-libs/yyjson-0.10.0
 	sys-apps/hwdata
 	sys-libs/zlib
-	X? ( x11-libs/libX11 )
 	chafa? ( media-gfx/chafa )
 	dbus? ( sys-apps/dbus )
 	ddcutil? ( app-misc/ddcutil:= )
@@ -41,7 +40,10 @@ RDEPEND="
 	)
 	imagemagick? ( media-gfx/imagemagick:= )
 	opencl? ( virtual/opencl )
-	opengl? ( media-libs/libglvnd[X] )
+	opengl? (
+		media-libs/libglvnd[X?]
+		X? ( x11-libs/libX11 )
+	)
 	osmesa? ( media-libs/mesa[osmesa] )
 	pulseaudio? ( media-libs/libpulse )
 	sqlite? ( dev-db/sqlite:3 )
@@ -56,15 +58,24 @@ RDEPEND="
 "
 DEPEND="
 	${RDEPEND}
+	opengl? ( X? ( x11-base/xorg-proto ) )
+	xcb? ( x11-base/xorg-proto )
+	xrandr? ( x11-base/xorg-proto )
 	vulkan? ( dev-util/vulkan-headers )
 "
 BDEPEND="virtual/pkgconfig"
 
 REQUIRED_USE="
-	xrandr? ( X )
 	chafa? ( imagemagick )
 "
 
+pkg_pretend() {
+	if use X && ! use opengl; then
+		einfo 'USE="X" adds GLX support for USE="opengl"'
+		einfo 'This build with USE="X -opengl" will not include any extra X support.'
+	fi
+}
+
 src_configure() {
 	local fastfetch_enable_imagemagick7=no
 	local fastfetch_enable_imagemagick6=no
@@ -73,12 +84,18 @@ src_configure() {
 		fastfetch_enable_imagemagick6=$(has_version '<media-gfx/imagemagick-7.0.0' && echo yes || echo no)
 	fi
 
+	local glx=no
+	if use opengl && use X; then
+		glx=yes
+	fi
+
 	local mycmakeargs=(
 		-DENABLE_RPM=no
 		-DENABLE_ZLIB=yes
 		-DENABLE_SYSTEM_YYJSON=yes
 		-DIS_MUSL=$(usex elibc_musl)
 		-DINSTALL_LICENSE=no
+		-DBUILD_FLASHFETCH=no
 
 		-DENABLE_CHAFA=$(usex chafa)
 		-DENABLE_DBUS=$(usex dbus)
@@ -88,7 +105,7 @@ src_configure() {
 		-DENABLE_ELF=$(usex elf)
 		-DENABLE_EGL=$(usex opengl)
 		-DENABLE_GIO=$(usex gnome)
-		-DENABLE_GLX=$(usex opengl)
+		-DENABLE_GLX=${glx}
 		-DENABLE_IMAGEMAGICK6=${fastfetch_enable_imagemagick6}
 		-DENABLE_IMAGEMAGICK7=${fastfetch_enable_imagemagick7}
 		-DENABLE_OPENCL=$(usex opencl)
@@ -97,8 +114,6 @@ src_configure() {
 		-DENABLE_SQLITE3=$(usex sqlite)
 		-DENABLE_VULKAN=$(usex vulkan)
 		-DENABLE_WAYLAND=$(usex wayland)
-		-DENABLE_X11=$(usex X)
-		-DENABLE_XCB=$(usex xcb)
 		-DENABLE_XCB_RANDR=$(usex xcb)
 		-DENABLE_XFCONF=$(usex xfce)
 		-DENABLE_XRANDR=$(usex xrandr)
diff --git a/app-misc/fastfetch/fastfetch-2.28.0.ebuild b/app-misc/fastfetch/fastfetch-2.28.0.ebuild
deleted file mode 100644
index 3d81543b4ade..000000000000
--- a/app-misc/fastfetch/fastfetch-2.28.0.ebuild
+++ /dev/null
@@ -1,111 +0,0 @@
-# Copyright 2022-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake flag-o-matic
-
-DESCRIPTION="Fast neofetch-like system information tool"
-HOMEPAGE="https://github.com/fastfetch-cli/fastfetch"
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/fastfetch-cli/fastfetch.git"
-	[[ ${PV} == *0.1.9999 ]] && EGIT_BRANCH=master
-	[[ ${PV} == *0.2.9999 ]] && EGIT_BRANCH=dev
-	[[ "${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 ~arm arm64 ~loong ~ppc ppc64 ~riscv ~sparc ~x86"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="X chafa dbus ddcutil drm elf gnome imagemagick opencl opengl osmesa 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.10.0
-	sys-apps/hwdata
-	sys-libs/zlib
-	X? ( x11-libs/libX11 )
-	chafa? ( media-gfx/chafa )
-	dbus? ( sys-apps/dbus )
-	ddcutil? ( app-misc/ddcutil:= )
-	drm? ( x11-libs/libdrm )
-	elf? ( virtual/libelf:= )
-	gnome? (
-		dev-libs/glib
-		gnome-base/dconf
-	)
-	imagemagick? ( media-gfx/imagemagick:= )
-	opencl? ( virtual/opencl )
-	opengl? ( media-libs/libglvnd[X] )
-	osmesa? ( media-libs/mesa[osmesa] )
-	pulseaudio? ( media-libs/libpulse )
-	sqlite? ( dev-db/sqlite:3 )
-	vulkan? (
-		media-libs/vulkan-loader
-		sys-apps/pciutils
-	)
-	wayland? ( dev-libs/wayland )
-	xcb? ( x11-libs/libxcb )
-	xfce? ( xfce-base/xfconf )
-	xrandr? ( x11-libs/libXrandr )
-"
-DEPEND="
-	${RDEPEND}
-	vulkan? ( dev-util/vulkan-headers )
-"
-BDEPEND="virtual/pkgconfig"
-
-REQUIRED_USE="
-	xrandr? ( X )
-	chafa? ( imagemagick )
-"
-
-src_configure() {
-	local fastfetch_enable_imagemagick7=no
-	local fastfetch_enable_imagemagick6=no
-	if use imagemagick; then
-		fastfetch_enable_imagemagick7=$(has_version '>=media-gfx/imagemagick-7.0.0' && echo yes || echo no)
-		fastfetch_enable_imagemagick6=$(has_version '<media-gfx/imagemagick-7.0.0' && echo yes || echo no)
-	fi
-
-	local mycmakeargs=(
-		-DENABLE_RPM=no
-		-DENABLE_ZLIB=yes
-		-DENABLE_SYSTEM_YYJSON=yes
-		-DIS_MUSL=$(usex elibc_musl)
-		-DINSTALL_LICENSE=no
-
-		-DENABLE_CHAFA=$(usex chafa)
-		-DENABLE_DBUS=$(usex dbus)
-		-DENABLE_DCONF=$(usex gnome)
-		-DENABLE_DDCUTIL=$(usex ddcutil)
-		-DENABLE_DRM=$(usex drm)
-		-DENABLE_ELF=$(usex elf)
-		-DENABLE_EGL=$(usex opengl)
-		-DENABLE_GIO=$(usex gnome)
-		-DENABLE_GLX=$(usex opengl)
-		-DENABLE_IMAGEMAGICK6=${fastfetch_enable_imagemagick6}
-		-DENABLE_IMAGEMAGICK7=${fastfetch_enable_imagemagick7}
-		-DENABLE_OPENCL=$(usex opencl)
-		-DENABLE_OSMESA=$(usex osmesa)
-		-DENABLE_PULSE=$(usex pulseaudio)
-		-DENABLE_SQLITE3=$(usex sqlite)
-		-DENABLE_VULKAN=$(usex vulkan)
-		-DENABLE_WAYLAND=$(usex wayland)
-		-DENABLE_X11=$(usex X)
-		-DENABLE_XCB=$(usex xcb)
-		-DENABLE_XCB_RANDR=$(usex xcb)
-		-DENABLE_XFCONF=$(usex xfce)
-		-DENABLE_XRANDR=$(usex xrandr)
-		-DBUILD_TESTS=$(usex test)
-	)
-
-	append-cppflags -DNDEBUG
-
-	cmake_src_configure
-}
diff --git a/app-misc/fastfetch/fastfetch-2.31.0.ebuild b/app-misc/fastfetch/fastfetch-2.31.0.ebuild
deleted file mode 100644
index 07ca45b47c22..000000000000
--- a/app-misc/fastfetch/fastfetch-2.31.0.ebuild
+++ /dev/null
@@ -1,125 +0,0 @@
-# Copyright 2022-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake flag-o-matic
-
-DESCRIPTION="Fast neofetch-like system information tool"
-HOMEPAGE="https://github.com/fastfetch-cli/fastfetch"
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/fastfetch-cli/fastfetch.git"
-	[[ ${PV} == *0.1.9999 ]] && EGIT_BRANCH=master
-	[[ ${PV} == *0.2.9999 ]] && EGIT_BRANCH=dev
-	[[ "${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 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="X chafa dbus ddcutil drm elf gnome imagemagick opencl opengl osmesa 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.10.0
-	sys-apps/hwdata
-	sys-libs/zlib
-	chafa? ( media-gfx/chafa )
-	dbus? ( sys-apps/dbus )
-	ddcutil? ( app-misc/ddcutil:= )
-	drm? ( x11-libs/libdrm )
-	elf? ( virtual/libelf:= )
-	gnome? (
-		dev-libs/glib
-		gnome-base/dconf
-	)
-	imagemagick? ( media-gfx/imagemagick:= )
-	opencl? ( virtual/opencl )
-	opengl? (
-		media-libs/libglvnd[X?]
-		X? ( x11-libs/libX11 )
-	)
-	osmesa? ( media-libs/mesa[osmesa] )
-	pulseaudio? ( media-libs/libpulse )
-	sqlite? ( dev-db/sqlite:3 )
-	vulkan? (
-		media-libs/vulkan-loader
-		sys-apps/pciutils
-	)
-	wayland? ( dev-libs/wayland )
-	xcb? ( x11-libs/libxcb )
-	xfce? ( xfce-base/xfconf )
-	xrandr? ( x11-libs/libXrandr )
-"
-DEPEND="
-	${RDEPEND}
-	opengl? ( X? ( x11-base/xorg-proto ) )
-	xcb? ( x11-base/xorg-proto )
-	xrandr? ( x11-base/xorg-proto )
-	vulkan? ( dev-util/vulkan-headers )
-"
-BDEPEND="virtual/pkgconfig"
-
-REQUIRED_USE="
-	chafa? ( imagemagick )
-"
-
-pkg_pretend() {
-	if use X && ! use opengl; then
-		einfo 'USE="X" adds GLX support for USE="opengl"'
-		einfo 'This build with USE="X -opengl" will not include any extra X support.'
-	fi
-}
-
-src_configure() {
-	local fastfetch_enable_imagemagick7=no
-	local fastfetch_enable_imagemagick6=no
-	if use imagemagick; then
-		fastfetch_enable_imagemagick7=$(has_version '>=media-gfx/imagemagick-7.0.0' && echo yes || echo no)
-		fastfetch_enable_imagemagick6=$(has_version '<media-gfx/imagemagick-7.0.0' && echo yes || echo no)
-	fi
-
-	local glx=no
-	if use opengl && use X; then
-		glx=yes
-	fi
-
-	local mycmakeargs=(
-		-DENABLE_RPM=no
-		-DENABLE_ZLIB=yes
-		-DENABLE_SYSTEM_YYJSON=yes
-		-DIS_MUSL=$(usex elibc_musl)
-		-DINSTALL_LICENSE=no
-
-		-DENABLE_CHAFA=$(usex chafa)
-		-DENABLE_DBUS=$(usex dbus)
-		-DENABLE_DCONF=$(usex gnome)
-		-DENABLE_DDCUTIL=$(usex ddcutil)
-		-DENABLE_DRM=$(usex drm)
-		-DENABLE_ELF=$(usex elf)
-		-DENABLE_EGL=$(usex opengl)
-		-DENABLE_GIO=$(usex gnome)
-		-DENABLE_GLX=${glx}
-		-DENABLE_IMAGEMAGICK6=${fastfetch_enable_imagemagick6}
-		-DENABLE_IMAGEMAGICK7=${fastfetch_enable_imagemagick7}
-		-DENABLE_OPENCL=$(usex opencl)
-		-DENABLE_OSMESA=$(usex osmesa)
-		-DENABLE_PULSE=$(usex pulseaudio)
-		-DENABLE_SQLITE3=$(usex sqlite)
-		-DENABLE_VULKAN=$(usex vulkan)
-		-DENABLE_WAYLAND=$(usex wayland)
-		-DENABLE_XCB_RANDR=$(usex xcb)
-		-DENABLE_XFCONF=$(usex xfce)
-		-DENABLE_XRANDR=$(usex xrandr)
-		-DBUILD_TESTS=$(usex test)
-	)
-
-	append-cppflags -DNDEBUG
-
-	cmake_src_configure
-}
diff --git a/app-misc/fastfetch/fastfetch-2.32.1.ebuild b/app-misc/fastfetch/fastfetch-2.32.1.ebuild
deleted file mode 100644
index 07ca45b47c22..000000000000
--- a/app-misc/fastfetch/fastfetch-2.32.1.ebuild
+++ /dev/null
@@ -1,125 +0,0 @@
-# Copyright 2022-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake flag-o-matic
-
-DESCRIPTION="Fast neofetch-like system information tool"
-HOMEPAGE="https://github.com/fastfetch-cli/fastfetch"
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/fastfetch-cli/fastfetch.git"
-	[[ ${PV} == *0.1.9999 ]] && EGIT_BRANCH=master
-	[[ ${PV} == *0.2.9999 ]] && EGIT_BRANCH=dev
-	[[ "${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 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-IUSE="X chafa dbus ddcutil drm elf gnome imagemagick opencl opengl osmesa 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.10.0
-	sys-apps/hwdata
-	sys-libs/zlib
-	chafa? ( media-gfx/chafa )
-	dbus? ( sys-apps/dbus )
-	ddcutil? ( app-misc/ddcutil:= )
-	drm? ( x11-libs/libdrm )
-	elf? ( virtual/libelf:= )
-	gnome? (
-		dev-libs/glib
-		gnome-base/dconf
-	)
-	imagemagick? ( media-gfx/imagemagick:= )
-	opencl? ( virtual/opencl )
-	opengl? (
-		media-libs/libglvnd[X?]
-		X? ( x11-libs/libX11 )
-	)
-	osmesa? ( media-libs/mesa[osmesa] )
-	pulseaudio? ( media-libs/libpulse )
-	sqlite? ( dev-db/sqlite:3 )
-	vulkan? (
-		media-libs/vulkan-loader
-		sys-apps/pciutils
-	)
-	wayland? ( dev-libs/wayland )
-	xcb? ( x11-libs/libxcb )
-	xfce? ( xfce-base/xfconf )
-	xrandr? ( x11-libs/libXrandr )
-"
-DEPEND="
-	${RDEPEND}
-	opengl? ( X? ( x11-base/xorg-proto ) )
-	xcb? ( x11-base/xorg-proto )
-	xrandr? ( x11-base/xorg-proto )
-	vulkan? ( dev-util/vulkan-headers )
-"
-BDEPEND="virtual/pkgconfig"
-
-REQUIRED_USE="
-	chafa? ( imagemagick )
-"
-
-pkg_pretend() {
-	if use X && ! use opengl; then
-		einfo 'USE="X" adds GLX support for USE="opengl"'
-		einfo 'This build with USE="X -opengl" will not include any extra X support.'
-	fi
-}
-
-src_configure() {
-	local fastfetch_enable_imagemagick7=no
-	local fastfetch_enable_imagemagick6=no
-	if use imagemagick; then
-		fastfetch_enable_imagemagick7=$(has_version '>=media-gfx/imagemagick-7.0.0' && echo yes || echo no)
-		fastfetch_enable_imagemagick6=$(has_version '<media-gfx/imagemagick-7.0.0' && echo yes || echo no)
-	fi
-
-	local glx=no
-	if use opengl && use X; then
-		glx=yes
-	fi
-
-	local mycmakeargs=(
-		-DENABLE_RPM=no
-		-DENABLE_ZLIB=yes
-		-DENABLE_SYSTEM_YYJSON=yes
-		-DIS_MUSL=$(usex elibc_musl)
-		-DINSTALL_LICENSE=no
-
-		-DENABLE_CHAFA=$(usex chafa)
-		-DENABLE_DBUS=$(usex dbus)
-		-DENABLE_DCONF=$(usex gnome)
-		-DENABLE_DDCUTIL=$(usex ddcutil)
-		-DENABLE_DRM=$(usex drm)
-		-DENABLE_ELF=$(usex elf)
-		-DENABLE_EGL=$(usex opengl)
-		-DENABLE_GIO=$(usex gnome)
-		-DENABLE_GLX=${glx}
-		-DENABLE_IMAGEMAGICK6=${fastfetch_enable_imagemagick6}
-		-DENABLE_IMAGEMAGICK7=${fastfetch_enable_imagemagick7}
-		-DENABLE_OPENCL=$(usex opencl)
-		-DENABLE_OSMESA=$(usex osmesa)
-		-DENABLE_PULSE=$(usex pulseaudio)
-		-DENABLE_SQLITE3=$(usex sqlite)
-		-DENABLE_VULKAN=$(usex vulkan)
-		-DENABLE_WAYLAND=$(usex wayland)
-		-DENABLE_XCB_RANDR=$(usex xcb)
-		-DENABLE_XFCONF=$(usex xfce)
-		-DENABLE_XRANDR=$(usex xrandr)
-		-DBUILD_TESTS=$(usex test)
-	)
-
-	append-cppflags -DNDEBUG
-
-	cmake_src_configure
-}
diff --git a/app-misc/fastfetch/fastfetch-2.33.0.ebuild b/app-misc/fastfetch/fastfetch-2.33.0.ebuild
new file mode 100644
index 000000000000..3a36d05b4aad
--- /dev/null
+++ b/app-misc/fastfetch/fastfetch-2.33.0.ebuild
@@ -0,0 +1,126 @@
+# Copyright 2022-2024 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake flag-o-matic
+
+DESCRIPTION="Fast neofetch-like system information tool"
+HOMEPAGE="https://github.com/fastfetch-cli/fastfetch"
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/fastfetch-cli/fastfetch.git"
+	[[ ${PV} == *0.1.9999 ]] && EGIT_BRANCH=master
+	[[ ${PV} == *0.2.9999 ]] && EGIT_BRANCH=dev
+	[[ "${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 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+fi
+
+LICENSE="MIT"
+SLOT="0"
+IUSE="X chafa dbus ddcutil drm elf gnome imagemagick opencl opengl osmesa 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.10.0
+	sys-apps/hwdata
+	sys-libs/zlib
+	chafa? ( media-gfx/chafa )
+	dbus? ( sys-apps/dbus )
+	ddcutil? ( app-misc/ddcutil:= )
+	drm? ( x11-libs/libdrm )
+	elf? ( virtual/libelf:= )
+	gnome? (
+		dev-libs/glib
+		gnome-base/dconf
+	)
+	imagemagick? ( media-gfx/imagemagick:= )
+	opencl? ( virtual/opencl )
+	opengl? (
+		media-libs/libglvnd[X?]
+		X? ( x11-libs/libX11 )
+	)
+	osmesa? ( media-libs/mesa[osmesa] )
+	pulseaudio? ( media-libs/libpulse )
+	sqlite? ( dev-db/sqlite:3 )
+	vulkan? (
+		media-libs/vulkan-loader
+		sys-apps/pciutils
+	)
+	wayland? ( dev-libs/wayland )
+	xcb? ( x11-libs/libxcb )
+	xfce? ( xfce-base/xfconf )
+	xrandr? ( x11-libs/libXrandr )
+"
+DEPEND="
+	${RDEPEND}
+	opengl? ( X? ( x11-base/xorg-proto ) )
+	xcb? ( x11-base/xorg-proto )
+	xrandr? ( x11-base/xorg-proto )
+	vulkan? ( dev-util/vulkan-headers )
+"
+BDEPEND="virtual/pkgconfig"
+
+REQUIRED_USE="
+	chafa? ( imagemagick )
+"
+
+pkg_pretend() {
+	if use X && ! use opengl; then
+		einfo 'USE="X" adds GLX support for USE="opengl"'
+		einfo 'This build with USE="X -opengl" will not include any extra X support.'
+	fi
+}
+
+src_configure() {
+	local fastfetch_enable_imagemagick7=no
+	local fastfetch_enable_imagemagick6=no
+	if use imagemagick; then
+		fastfetch_enable_imagemagick7=$(has_version '>=media-gfx/imagemagick-7.0.0' && echo yes || echo no)
+		fastfetch_enable_imagemagick6=$(has_version '<media-gfx/imagemagick-7.0.0' && echo yes || echo no)
+	fi
+
+	local glx=no
+	if use opengl && use X; then
+		glx=yes
+	fi
+
+	local mycmakeargs=(
+		-DENABLE_RPM=no
+		-DENABLE_ZLIB=yes
+		-DENABLE_SYSTEM_YYJSON=yes
+		-DIS_MUSL=$(usex elibc_musl)
+		-DINSTALL_LICENSE=no
+		-DBUILD_FLASHFETCH=no
+
+		-DENABLE_CHAFA=$(usex chafa)
+		-DENABLE_DBUS=$(usex dbus)
+		-DENABLE_DCONF=$(usex gnome)
+		-DENABLE_DDCUTIL=$(usex ddcutil)
+		-DENABLE_DRM=$(usex drm)
+		-DENABLE_ELF=$(usex elf)
+		-DENABLE_EGL=$(usex opengl)
+		-DENABLE_GIO=$(usex gnome)
+		-DENABLE_GLX=${glx}
+		-DENABLE_IMAGEMAGICK6=${fastfetch_enable_imagemagick6}
+		-DENABLE_IMAGEMAGICK7=${fastfetch_enable_imagemagick7}
+		-DENABLE_OPENCL=$(usex opencl)
+		-DENABLE_OSMESA=$(usex osmesa)
+		-DENABLE_PULSE=$(usex pulseaudio)
+		-DENABLE_SQLITE3=$(usex sqlite)
+		-DENABLE_VULKAN=$(usex vulkan)
+		-DENABLE_WAYLAND=$(usex wayland)
+		-DENABLE_XCB_RANDR=$(usex xcb)
+		-DENABLE_XFCONF=$(usex xfce)
+		-DENABLE_XRANDR=$(usex xrandr)
+		-DBUILD_TESTS=$(usex test)
+	)
+
+	append-cppflags -DNDEBUG
+
+	cmake_src_configure
+}
-- 
cgit v1.2.3