From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-1586124-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (2048 bits))
(No client certificate requested)
by finch.gentoo.org (Postfix) with ESMTPS id 67AA015803E
for <garchives@archives.gentoo.org>; Mon, 1 Jan 2024 17:54:33 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id A6BF72BC028;
Mon, 1 Jan 2024 17:54:31 +0000 (UTC)
Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256)
(No client certificate requested)
by pigeon.gentoo.org (Postfix) with ESMTPS id 85E1D2BC025
for <gentoo-commits@lists.gentoo.org>; Mon, 1 Jan 2024 17:54:31 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
(using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256)
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id 6D79F33E690
for <gentoo-commits@lists.gentoo.org>; Mon, 1 Jan 2024 17:54:30 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
by oystercatcher.gentoo.org (Postfix) with ESMTP id C856213D5
for <gentoo-commits@lists.gentoo.org>; Mon, 1 Jan 2024 17:54:28 +0000 (UTC)
From: "Viorel Munteanu" <ceamac@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Viorel Munteanu" <ceamac@gentoo.org>
Message-ID: <1704131658.2afdfbb9c3dbda2e22ba4cefde46f97a4f5816cd.ceamac@gentoo>
Subject: [gentoo-commits] repo/gentoo:master commit in: app-misc/fastfetch/files/, app-misc/fastfetch/
X-VCS-Repository: repo/gentoo
X-VCS-Files: app-misc/fastfetch/Manifest app-misc/fastfetch/fastfetch-2.4.0-r1.ebuild app-misc/fastfetch/files/fastfetch-2.4.0-default-config-suffix.patch
X-VCS-Directories: app-misc/fastfetch/ app-misc/fastfetch/files/
X-VCS-Committer: ceamac
X-VCS-Committer-Name: Viorel Munteanu
X-VCS-Revision: 2afdfbb9c3dbda2e22ba4cefde46f97a4f5816cd
X-VCS-Branch: master
Date: Mon, 1 Jan 2024 17:54:28 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply
X-Archives-Salt: 559bd4e0-e065-4087-a54f-01b259394345
X-Archives-Hash: e5bdfb758111e0902f00258ecbd3ce30
commit: 2afdfbb9c3dbda2e22ba4cefde46f97a4f5816cd
Author: Viorel Munteanu <ceamac <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 1 17:35:05 2024 +0000
Commit: Viorel Munteanu <ceamac <AT> gentoo <DOT> org>
CommitDate: Mon Jan 1 17:54:18 2024 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2afdfbb9
app-misc/fastfetch: drop 2.4.0-r1
Signed-off-by: Viorel Munteanu <ceamac <AT> gentoo.org>
app-misc/fastfetch/Manifest | 1 -
app-misc/fastfetch/fastfetch-2.4.0-r1.ebuild | 117 ---------------------
.../fastfetch-2.4.0-default-config-suffix.patch | 35 ------
3 files changed, 153 deletions(-)
diff --git a/app-misc/fastfetch/Manifest b/app-misc/fastfetch/Manifest
index 3b7689e55f48..25cebe925918 100644
--- a/app-misc/fastfetch/Manifest
+++ b/app-misc/fastfetch/Manifest
@@ -1,4 +1,3 @@
DIST fastfetch-2.2.3.tar.gz 901203 BLAKE2B d6d097b72ce2f252e42b3e59cbd26b43a4f17ae974382f986270fbf91b457cf3c49e78a3c775e713d9302d536fb5a363e809005b9174d1a27622e6b6ed666709 SHA512 81e051b7555d56415c723606c0b6dfc3ad7ed91fb2c7b36c07465f4dfbdb91da5c8d216e46df36863888448de0a7bd63e28c6aa701995bf1165e0d7c33c4f724
DIST fastfetch-2.3.4.tar.gz 909105 BLAKE2B 132f88681f9133cdeae8126c4dabf4e8805865fe506a005f938bcda487750a874ab59deebdf2fc348c2a469cf4771fe5916f594a5a408769c1e49fba417ab113 SHA512 fe1e6465380e513e4e75092bc737b23adca4c9dd42de8adb888bad1ce173f1fa9c93e9cbd7b2ca648058503b7cfb72c2ba1d70abf63b8f1497e94ce6eb349524
-DIST fastfetch-2.4.0.tar.gz 913193 BLAKE2B 88df9a8cb641596855cbd539d0be7f9270cd234dc060612ee6c52f5d47b2deb0d95608bdc496c81ac5e0e74c0c403f373fdcf7c17303eebab1f3b32ee0a41270 SHA512 00130ad3825cff039dc9ab3efd9f3431b36357e0ae144148872ab761f8b07a8d95c2413450d000b0181e9424d490ad55e6af928d1b7b2efdc7d5842ead8ab028
DIST fastfetch-2.5.0.tar.gz 984182 BLAKE2B 5185cce0e5933524835093a2f730cac8a9262cb6ec2c422fff60a4c6daec4f2a8ba11eab4323f00eaeebf2d946da9767f125b265e87cda6714d50e1c5e1383de SHA512 a69f4e839acf8897a9cd8f6c017a4d7657a8dc0b3c58e645c88fc8e47e0a7bd3411d1a3e1e916628a948cb7e1688a200f7ac1eabd090f5eb42ce4b0030e342b4
diff --git a/app-misc/fastfetch/fastfetch-2.4.0-r1.ebuild b/app-misc/fastfetch/fastfetch-2.4.0-r1.ebuild
deleted file mode 100644
index 4590e479070b..000000000000
--- a/app-misc/fastfetch/fastfetch-2.4.0-r1.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 2022-2023 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 ~x86"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-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
- )
- imagemagick? ( media-gfx/imagemagick:= )
- networkmanager? ( net-misc/networkmanager )
- opencl? ( virtual/opencl )
- opengl? ( media-libs/libglvnd[X] )
- osmesa? ( media-libs/mesa[osmesa] )
- pci? ( sys-apps/pciutils )
- 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}"
-BDEPEND="virtual/pkgconfig"
-
-REQUIRED_USE="
- xrandr? ( X )
- chafa? ( imagemagick )
-"
-
-PATCHES=(
- "${FILESDIR}"/${P}-default-config-suffix.patch
-)
-
-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
-
- -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)
- -DENABLE_IMAGEMAGICK6=${fastfetch_enable_imagemagick6}
- -DENABLE_IMAGEMAGICK7=${fastfetch_enable_imagemagick7}
- -DENABLE_LIBNM=$(usex networkmanager)
- -DENABLE_LIBPCI=$(usex pci)
- -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
-}
-
-src_install() {
- cmake_src_install
-
- rm -r "${ED}"/usr/share/licenses || die
-}
diff --git a/app-misc/fastfetch/files/fastfetch-2.4.0-default-config-suffix.patch b/app-misc/fastfetch/files/fastfetch-2.4.0-default-config-suffix.patch
deleted file mode 100644
index fcf21ce0af23..000000000000
--- a/app-misc/fastfetch/files/fastfetch-2.4.0-default-config-suffix.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-Make specifying `.jsonc` suffix for configs optional
-
-https://github.com/fastfetch-cli/fastfetch/commit/456a58c8f57aaf22c51571ec0ead1e7c40c3d860
-
-From: =?UTF-8?q?=E6=9D=8E=E9=80=9A=E6=B4=B2?= <zhangsongcui3371@sina.com>
-Date: Tue, 19 Dec 2023 15:26:51 +0800
-Subject: [PATCH] fastfetch: default preset names to `.jsonc`
-
-Fix #666
---- a/src/fastfetch.c
-+++ b/src/fastfetch.c
-@@ -501,6 +501,11 @@ static void optionParseConfigFile(FFdata* data, const char* key, const char* val
- ffStrbufAppendS(&absolutePath, value);
-
- bool success = isJsonConfig ? parseJsoncFile(absolutePath.chars) : parseConfigFile(data, absolutePath.chars);
-+ if (!success)
-+ {
-+ ffStrbufAppendS(&absolutePath, ".jsonc");
-+ success = parseJsoncFile(absolutePath.chars);
-+ }
-
- if(success)
- return;
-@@ -514,6 +519,11 @@ static void optionParseConfigFile(FFdata* data, const char* key, const char* val
- ffStrbufAppendS(&absolutePath, value);
-
- bool success = isJsonConfig ? parseJsoncFile(absolutePath.chars) : parseConfigFile(data, absolutePath.chars);
-+ if (!success)
-+ {
-+ ffStrbufAppendS(&absolutePath, ".jsonc");
-+ success = parseJsoncFile(absolutePath.chars);
-+ }
-
- if(success)
- return;