6 files changed, 128 insertions, 103 deletions
diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index f512417760ae..67b9b315951d 100644
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
diff --git a/app-misc/boxes/Manifest b/app-misc/boxes/Manifest
index 76c4d974e0af..2ea50811ecfd 100644
--- a/app-misc/boxes/Manifest
+++ b/app-misc/boxes/Manifest
@@ -1,8 +1,4 @@
 AUX boxes-2.3.0-ncurses-gentoo.patch 644 BLAKE2B 8a01d5948379a268a3bb91076f35ebdc524aba16245b11bf04af0e18748c97ed7f29579ca85b5bf2c1b24cbfbef04ae1adff9a6fa2a619bd744f5883c47b8bfe SHA512 18c647b91ca5e2c0bcf1243eb3d78841d85c0275cbb766672c98b6198ec547714ef6166b58ace878bd52b40cd758dae3932bd2c605efb9156cf7f51d4d5557c8
-DIST boxes-2.2.1.tar.gz 230900 BLAKE2B 65ab0c8ad52d2764279397135b072bfa6f4bf86e465cc3a4778d30c5b19ce2c0d7c5f8636173529eca92754ee16d38b46a83b067b94315b1ea82448e4b1ac0a8 SHA512 0afa115d5ec01944878ef4d8f33e2887d123b172a0589eda53a04ba671916d9ef1d8299f9df9aeac8989807f86ca1b96b1c34aed03856643a89a07586b82e3b6
-DIST boxes-2.3.0.tar.gz 272302 BLAKE2B 282b41aee214f54aa3c8b237bc9f2e48e4144eebd6619880a38c7a71d9bf7bb434a250f29a05f20746530e8458bb0d062cd7e5bea88ebdf64030f090b1a8674a SHA512 d7580462ed5cf8a3299f528d7e4abea1c9733da2823c204bff69a804c72b768c4d3e8505b4d8881aae066f1fd95133cf9dc52e960333a82d8c529f85eb096fb4
 DIST boxes-2.3.1.tar.gz 299074 BLAKE2B 12bf2389d689194a9dc9efd34f6fad3686bf9120874b91671bb871e221e13d5b00e4baca4eb081ccafb346207584be0ba7ffd16bb7a80d45bf83ac2484b2481e SHA512 cfb772c11d4bc169f1a6cc7f550af02947e4fee43cd70cb8ec7c8f9c976d9e59bc017d4b40b77ba60d2c52a76fd826d0a2b962b3dc02021407ca4f0cbcb316d8
-EBUILD boxes-2.2.1.ebuild 963 BLAKE2B 2d88d07b7d0eb5b5c6a07ac286b9077ac44c9cbc2fef38139771d5136c3aed709dc4ef4d0ac02197c24915f63e0c94a435a43f783c06fbba8bdcec72989f025b SHA512 6470c2bea2a8b8a441f7656cb5f88198d41120d0796e75e1d233197a0a5e8f001e3d9aaa99ccf001d8e3bdfbbff0a0983917f79910f35968275fd1cbeab2aadf
-EBUILD boxes-2.3.0.ebuild 1046 BLAKE2B 85833a1942d3ebd230fb826c57e8cd029636602e112a12d09be1ddf012782d811ee1673f9400649ab9332594e2d55f01855cdcf464bccf6c24c41638b73fd879 SHA512 63de064aa46309ff2721b7fddc66803f02c3d9e7a3433edf75f6b928f5fd53639b167220c9adf082d63c468c10d138429a858e25542ca9308397c3724389456a
 EBUILD boxes-2.3.1.ebuild 1048 BLAKE2B 20ce46ea9ac755b554a60378ac573857c15d98bccb7db791244e23892ba376a9c1356d42bd3273ffc3c96e56d2aabdf7e1b8d49e1f8c35a3cf15f5a84a2e5a9c SHA512 873e22cffb8a0163f0a2a824acd203e99cbcee7ae4a105d9d165864e4caf772c306ee3409b4656c0fdf4c774500d628c36a4cc11c5e812df89456a1a4c70f51d
 MISC metadata.xml 900 BLAKE2B ed21e2f334f908418be9025531cb81b38eb20c29a2d6824db34b60bc9cab117cf7390c223942b0a97b00a94cbf0a3d56d5991599bdc6ee2ae779cafd2ee9f423 SHA512 ff396d6d3de85f836cd7af967d783ce51ce17f4a542e5a800aec5929f0de1a27eb823014f1452045183eb437c960347c1c120ce38b60bead7f9a38eaef24e261
diff --git a/app-misc/boxes/boxes-2.2.1.ebuild b/app-misc/boxes/boxes-2.2.1.ebuild
deleted file mode 100644
index ed2d6bff1820..000000000000
--- a/app-misc/boxes/boxes-2.2.1.ebuild
+++ /dev/null
@@ -1,47 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit toolchain-funcs
-
-DESCRIPTION="Draw any kind of boxes around your text"
-HOMEPAGE="https://boxes.thomasjensen.com/ https://github.com/ascii-boxes/boxes"
-SRC_URI="https://github.com/ascii-boxes/boxes/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~mips ppc ppc64 sparc x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-libs/libpcre2[pcre32]
-	dev-libs/libunistring:=
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	app-alternatives/yacc
-	app-alternatives/lex
-	test? ( app-editors/vim-core )
-"
-
-src_prepare() {
-	default
-
-	sed \
-		-e 's:STRIP=true:STRIP=false:g' \
-		-i src/Makefile || die
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" CFLAGS_ADDTL="${CFLAGS}" LDFLAGS_ADDTL="${LDFLAGS}"
-}
-
-src_install() {
-	dobin out/boxes
-	doman doc/boxes.1
-	insinto /usr/share
-	newins boxes-config boxes
-	einstalldocs
-}
diff --git a/app-misc/boxes/boxes-2.3.0.ebuild b/app-misc/boxes/boxes-2.3.0.ebuild
deleted file mode 100644
index 05b8c350d99f..000000000000
--- a/app-misc/boxes/boxes-2.3.0.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2024 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit toolchain-funcs
-
-DESCRIPTION="Draw any kind of boxes around your text"
-HOMEPAGE="https://boxes.thomasjensen.com/ https://github.com/ascii-boxes/boxes"
-SRC_URI="https://github.com/ascii-boxes/boxes/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-libs/libpcre2:=[pcre32]
-	dev-libs/libunistring:=
-	sys-libs/ncurses:=
-"
-DEPEND="
-	${RDEPEND}
-"
-BDEPEND="
-	app-alternatives/yacc
-	app-alternatives/lex
-	test? ( app-editors/vim-core )
-"
-
-PATCHES=( "${FILESDIR}/${P}-ncurses-gentoo.patch" )
-
-src_prepare() {
-	default
-
-	sed \
-		-e 's:STRIP=true:STRIP=false:g' \
-		-i src/Makefile || die
-}
-
-src_compile() {
-	emake CC="$(tc-getCC)" CFLAGS_ADDTL="${CFLAGS}" LDFLAGS_ADDTL="${LDFLAGS}"
-}
-
-src_install() {
-	dobin out/boxes
-	doman doc/boxes.1
-	insinto /usr/share
-	newins boxes-config boxes
-	einstalldocs
-}
diff --git a/app-misc/fastfetch/Manifest b/app-misc/fastfetch/Manifest
index b2690ff31c6e..ff32276d4859 100644
--- a/app-misc/fastfetch/Manifest
+++ b/app-misc/fastfetch/Manifest
@@ -2,10 +2,12 @@ DIST fastfetch-2.30.1.tar.gz 1144835 BLAKE2B f44e0d8b74f124a1978403c0af61450eae4
 DIST fastfetch-2.33.0.tar.gz 1161845 BLAKE2B 1a31aa0b7651c27ecff34067360c136ad5c0dddac60e5bc2c4ae749194d63c49df3bc92de91e5a3249b8bcd1f640b62025a01d7f6b89b96991ad1623ca079bb5 SHA512 f9d824f908e36e3dc1b7784f2da818d764be6bbc6baa77d6b26ea6776acb5f101c4c39267fa42d1c9ae735c9889badc7b3a65170d81308de852a178e50140154
 DIST fastfetch-2.34.1.tar.gz 1168310 BLAKE2B 2b3e617cd2c7b2168ad9844ba907aa533b500cf90b19762c180555967605ed3ba83030e07893adee9ec2f30887ace3f63840fdc62cbad00c7c9d1d9bd9021952 SHA512 026b71c8d6ad5d5683ededf173d4cb2e936b3e934c7f27227fa7c5f665b9628717e90413626a4fab25fa5f5fde50cae6cdeb75621d6a2cac1ca6368c943293de
 DIST fastfetch-2.35.0.tar.gz 1171386 BLAKE2B f862c98737fe72a1b2068f05e7b78bdacbc9664a30261c7a129aa869a0aa15022ae5d716ded01ee309f0d72ab89032ed0a47372f170b9e6ccfe04897994828cd SHA512 c77f0496e7be630b1e19443058e5176c0b361375adeb4a6c2f1e5084c00869f9c939f82e35205c9316f3f81a622124bcc926f409fd0eb9c0ce59be5f5ab086a2
+DIST fastfetch-2.36.0.tar.gz 1176595 BLAKE2B 8e65cf1f5772878770cc3deaea0782c0b0f71f2bdff0b728ef262fff8be237563e105db8648e63cd28cae65445762961f8d4821f604e3b83394e8767f2f5a311 SHA512 9391f7409e46b1ec410568cd789d803cf15020b294e2391fd2310d9a88770dbe68f14f4e0ec6b3f6e01e51ba5d657fef30c6727338996fac98953f47fcc4a742
 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.30.1.ebuild 3137 BLAKE2B 2ef89b3171766797ac6d0e6adc2ccfe382fa94b37ed9e60df81ab37ee316aab370a53fd69038c6f3c561d2b4c20dc9a29b511afb9e9e7065bde92a4c1b253299 SHA512 087bae54243297c377be64ee38c30efd118243b83bc0686ec165c65eb8a869ee83e7d1f61ee88a732e04288e542b2443dad9d0a9a53030d503b9419410b3a6ae
 EBUILD fastfetch-2.33.0.ebuild 3440 BLAKE2B eb0fd72015c0f51661b8d9937dbd4b2cfe577ac19303f15994678ee15ff83624e77f9a8a20aceb8007bd2d89d604ee9798d07db952a5f7fc772f82014d2cba8c SHA512 676130d3d01971db4a4fa97f06ea6ce86a19476419dfd7c1738f52142c2bfaab4c51b662d4b3d6c917cb6d1a6b5e17153c48696d28426c330adf6db20bc429fb
 EBUILD fastfetch-2.34.1.ebuild 3443 BLAKE2B 3e2289a1c1e1d41f8fb97be96f4c2445880a255f53a5fa50f8ec89d5047f07229be26a851070b71b05ceb3bb77938904e08f1c5eee33bcafaa601c4dd0cebb49 SHA512 e5c9505f6007ad86f818aecf8a20f72439d10941ad14fdcad32a2277bba55aaca6965b218169508ef8d24848996c4974883c54bbb0e2fbf6c0865cbcac749880
 EBUILD fastfetch-2.35.0.ebuild 3443 BLAKE2B 3e2289a1c1e1d41f8fb97be96f4c2445880a255f53a5fa50f8ec89d5047f07229be26a851070b71b05ceb3bb77938904e08f1c5eee33bcafaa601c4dd0cebb49 SHA512 e5c9505f6007ad86f818aecf8a20f72439d10941ad14fdcad32a2277bba55aaca6965b218169508ef8d24848996c4974883c54bbb0e2fbf6c0865cbcac749880
+EBUILD fastfetch-2.36.0.ebuild 3443 BLAKE2B 3e2289a1c1e1d41f8fb97be96f4c2445880a255f53a5fa50f8ec89d5047f07229be26a851070b71b05ceb3bb77938904e08f1c5eee33bcafaa601c4dd0cebb49 SHA512 e5c9505f6007ad86f818aecf8a20f72439d10941ad14fdcad32a2277bba55aaca6965b218169508ef8d24848996c4974883c54bbb0e2fbf6c0865cbcac749880
 MISC metadata.xml 1398 BLAKE2B bba6a400cbf5e68dc779b4f15cf30b477a4837cd57e09fb17cf4c2ca06e05b19d89c9cd3c1063b078b3411a27c5b265e78e21e15e9cb32b1c681bd9a4bab3545 SHA512 018c51650911637fad242e431a2a9bdb017210b9082c0c49ed29e744fc2cba7733617d49721dd9d2519ee24ea61076608154d63e1f67c3ada4a1ef4774be2432
diff --git a/app-misc/fastfetch/fastfetch-2.36.0.ebuild b/app-misc/fastfetch/fastfetch-2.36.0.ebuild
new file mode 100644
index 000000000000..a6fd045ed767
--- /dev/null
+++ b/app-misc/fastfetch/fastfetch-2.36.0.ebuild
@@ -0,0 +1,126 @@
+# Copyright 2022-2025 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
+}