From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 186B3158091 for ; Mon, 20 Jun 2022 10:49:19 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 3E034E094A; Mon, 20 Jun 2022 10:49:18 +0000 (UTC) Received: from smtp.gentoo.org (mail.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (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 23286E094A for ; Mon, 20 Jun 2022 10:49:18 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (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 00DBD341626 for ; Mon, 20 Jun 2022 10:49:17 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 565DA480 for ; Mon, 20 Jun 2022 10:49:15 +0000 (UTC) From: "Viorel Munteanu" 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" Message-ID: <1655722132.3c45722492e409af426816da8f22254eec29a867.viorel_munteanu@gentoo> Subject: [gentoo-commits] repo/proj/guru:dev commit in: app-misc/fastfetch/ X-VCS-Repository: repo/proj/guru X-VCS-Files: app-misc/fastfetch/fastfetch-1.5.4-r1.ebuild app-misc/fastfetch/fastfetch-1.5.4.ebuild app-misc/fastfetch/fastfetch-9999.ebuild X-VCS-Directories: app-misc/fastfetch/ X-VCS-Committer: viorel_munteanu X-VCS-Committer-Name: Viorel Munteanu X-VCS-Revision: 3c45722492e409af426816da8f22254eec29a867 X-VCS-Branch: dev Date: Mon, 20 Jun 2022 10:49:15 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 084cde23-d3db-44a5-a623-f588f9f1de0e X-Archives-Hash: 7c57a8df1880feb5904996ebf6b7520e commit: 3c45722492e409af426816da8f22254eec29a867 Author: Viorel Munteanu gmail com> AuthorDate: Mon Jun 20 10:48:52 2022 +0000 Commit: Viorel Munteanu gmail com> CommitDate: Mon Jun 20 10:48:52 2022 +0000 URL: https://gitweb.gentoo.org/repo/proj/guru.git/commit/?id=3c457224 app-misc/fastfetch: chafa depends on imagemagick Closes: https://bugs.gentoo.org/853052 Signed-off-by: Viorel Munteanu gmail.com> ...etch-1.5.4.ebuild => fastfetch-1.5.4-r1.ebuild} | 23 +++++++++++++++++++--- app-misc/fastfetch/fastfetch-9999.ebuild | 23 +++++++++++++++++++--- 2 files changed, 40 insertions(+), 6 deletions(-) diff --git a/app-misc/fastfetch/fastfetch-1.5.4.ebuild b/app-misc/fastfetch/fastfetch-1.5.4-r1.ebuild similarity index 74% rename from app-misc/fastfetch/fastfetch-1.5.4.ebuild rename to app-misc/fastfetch/fastfetch-1.5.4-r1.ebuild index 5a9974833..cda8b003a 100644 --- a/app-misc/fastfetch/fastfetch-1.5.4.ebuild +++ b/app-misc/fastfetch/fastfetch-1.5.4-r1.ebuild @@ -23,7 +23,10 @@ IUSE="X chafa dbus gnome imagemagick opencl opengl osmesa pci sqlite vulkan wayl RDEPEND=" sys-libs/zlib X? ( x11-libs/libX11 ) - chafa? ( media-gfx/chafa ) + chafa? ( + media-gfx/chafa + media-gfx/imagemagick:= + ) dbus? ( sys-apps/dbus ) gnome? ( dev-libs/glib @@ -46,6 +49,20 @@ BDEPEND="virtual/pkgconfig" REQUIRED_USE="xrandr? ( X )" +pkg_setup() { + if use chafa && ! use imagemagick; then + elog "USE chafa depends on imagemagick, but that is currently disabled. Enabling imagemagick" + fi + + if use imagemagick || use chafa; then + export fastfetch_enable_imagemagick7=$(has_version '>=media-gfx/imagemagick-7.0.0' && echo yes || echo no) + fi + + if use imagemagick || use chafa; then + export fastfetch_enable_imagemagick6=$(has_version '=media-gfx/imagemagick-7.0.0' && echo yes || echo no) - -DENABLE_IMAGEMAGICK6=$(use imagemagick && has_version '=media-gfx/imagemagick-7.0.0' && echo yes || echo no) + fi + + if use imagemagick || use chafa; then + export fastfetch_enable_imagemagick6=$(has_version '=media-gfx/imagemagick-7.0.0' && echo yes || echo no) - -DENABLE_IMAGEMAGICK6=$(use imagemagick && has_version '