From: "Viorel Munteanu" <ceamac.paragon@gmail.com>
To: gentoo-commits@lists.gentoo.org
Subject: [gentoo-commits] repo/proj/guru:dev commit in: app-misc/fastfetch/
Date: Mon, 20 Jun 2022 10:49:15 +0000 (UTC) [thread overview]
Message-ID: <1655722132.3c45722492e409af426816da8f22254eec29a867.viorel_munteanu@gentoo> (raw)
commit: 3c45722492e409af426816da8f22254eec29a867
Author: Viorel Munteanu <ceamac.paragon <AT> gmail <DOT> com>
AuthorDate: Mon Jun 20 10:48:52 2022 +0000
Commit: Viorel Munteanu <ceamac.paragon <AT> gmail <DOT> 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 <ceamac.paragon <AT> 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)
+ fi
+}
+
src_configure() {
local mycmakeargs=(
-DENABLE_RPM=no
@@ -59,8 +76,8 @@ src_configure() {
-DENABLE_GIO=$(usex gnome)
-DENABLE_DCONF=$(usex gnome)
-DENABLE_XFCONF=$(usex xfce)
- -DENABLE_IMAGEMAGICK7=$(use imagemagick && 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)
+ -DENABLE_IMAGEMAGICK7=${fastfetch_enable_imagemagick7}
+ -DENABLE_IMAGEMAGICK6=${fastfetch_enable_imagemagick6}
-DENABLE_ZLIB=yes
-DENABLE_CHAFA=$(usex chafa)
-DENABLE_SQLITE3=$(usex sqlite)
diff --git a/app-misc/fastfetch/fastfetch-9999.ebuild b/app-misc/fastfetch/fastfetch-9999.ebuild
index 2169043e5..ceed40e9f 100644
--- a/app-misc/fastfetch/fastfetch-9999.ebuild
+++ b/app-misc/fastfetch/fastfetch-9999.ebuild
@@ -22,7 +22,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
@@ -45,6 +48,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)
+ fi
+}
+
src_configure() {
local mycmakeargs=(
-DENABLE_RPM=no
@@ -58,8 +75,8 @@ src_configure() {
-DENABLE_GIO=$(usex gnome)
-DENABLE_DCONF=$(usex gnome)
-DENABLE_XFCONF=$(usex xfce)
- -DENABLE_IMAGEMAGICK7=$(use imagemagick && 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)
+ -DENABLE_IMAGEMAGICK7=${fastfetch_enable_imagemagick7}
+ -DENABLE_IMAGEMAGICK6=${fastfetch_enable_imagemagick6}
-DENABLE_ZLIB=yes
-DENABLE_CHAFA=$(usex chafa)
-DENABLE_SQLITE3=$(usex sqlite)
next reply other threads:[~2022-06-20 10:49 UTC|newest]
Thread overview: 88+ messages / expand[flat|nested] mbox.gz Atom feed top
2022-06-20 10:49 Viorel Munteanu [this message]
-- strict thread matches above, loose matches on Subject: below --
2023-05-27 17:22 [gentoo-commits] repo/proj/guru:master commit in: app-misc/fastfetch/ Viorel Munteanu
2023-05-27 17:18 ` [gentoo-commits] repo/proj/guru:dev " Viorel Munteanu
2023-03-25 7:40 [gentoo-commits] repo/proj/guru:master " Viorel Munteanu
2023-03-25 7:36 ` [gentoo-commits] repo/proj/guru:dev " Viorel Munteanu
2023-03-03 12:53 Viorel Munteanu
2023-02-27 18:04 [gentoo-commits] repo/proj/guru:master " Viorel Munteanu
2023-02-27 17:48 ` [gentoo-commits] repo/proj/guru:dev " Viorel Munteanu
2023-02-27 18:04 [gentoo-commits] repo/proj/guru:master " Viorel Munteanu
2023-02-27 17:48 ` [gentoo-commits] repo/proj/guru:dev " Viorel Munteanu
2023-02-23 9:24 [gentoo-commits] repo/proj/guru:master " Viorel Munteanu
2023-02-22 6:30 ` [gentoo-commits] repo/proj/guru:dev " Viorel Munteanu
2023-02-22 9:35 Viorel Munteanu
2023-02-22 6:30 Viorel Munteanu
2023-02-22 6:30 Viorel Munteanu
2023-01-24 9:42 [gentoo-commits] repo/proj/guru:master " Viorel Munteanu
2023-01-24 9:40 ` [gentoo-commits] repo/proj/guru:dev " Viorel Munteanu
2023-01-24 9:42 [gentoo-commits] repo/proj/guru:master " Viorel Munteanu
2023-01-24 9:40 ` [gentoo-commits] repo/proj/guru:dev " Viorel Munteanu
2023-01-22 7:14 Viorel Munteanu
2023-01-22 7:14 Viorel Munteanu
2022-12-31 12:20 [gentoo-commits] repo/proj/guru:master " Viorel Munteanu
2022-12-31 12:20 ` [gentoo-commits] repo/proj/guru:dev " Viorel Munteanu
2022-12-31 12:20 Viorel Munteanu
2022-12-30 20:42 Viorel Munteanu
2022-12-30 20:36 [gentoo-commits] repo/proj/guru:master " Viorel Munteanu
2022-12-30 20:35 ` [gentoo-commits] repo/proj/guru:dev " Viorel Munteanu
2022-12-30 20:35 Viorel Munteanu
2022-12-30 9:41 [gentoo-commits] repo/proj/guru:master " Viorel Munteanu
2022-12-30 9:41 ` [gentoo-commits] repo/proj/guru:dev " Viorel Munteanu
2022-12-30 9:41 Viorel Munteanu
2022-12-29 15:28 [gentoo-commits] repo/proj/guru:master " Viorel Munteanu
2022-12-29 15:27 ` [gentoo-commits] repo/proj/guru:dev " Viorel Munteanu
2022-12-29 15:27 Viorel Munteanu
2022-12-28 14:39 Viorel Munteanu
2022-11-02 16:23 Viorel Munteanu
2022-10-11 16:45 Viorel Munteanu
2022-10-10 9:02 Viorel Munteanu
2022-10-10 4:47 Viorel Munteanu
2022-09-15 16:54 Viorel Munteanu
2022-09-15 16:54 Viorel Munteanu
2022-09-07 7:42 Viorel Munteanu
2022-09-04 6:35 Viorel Munteanu
2022-08-22 10:29 Viorel Munteanu
2022-08-22 10:29 Viorel Munteanu
2022-08-22 5:15 Viorel Munteanu
2022-08-22 5:15 Viorel Munteanu
2022-08-12 19:56 Viorel Munteanu
2022-08-12 14:10 Viorel Munteanu
2022-08-12 14:10 Viorel Munteanu
2022-07-27 17:54 Viorel Munteanu
2022-07-27 5:37 Viorel Munteanu
2022-07-27 5:37 Viorel Munteanu
2022-07-05 4:23 Viorel Munteanu
2022-07-05 4:23 Viorel Munteanu
2022-06-28 4:30 Viorel Munteanu
2022-06-28 4:30 Viorel Munteanu
2022-06-20 11:17 Viorel Munteanu
2022-06-19 5:51 Viorel Munteanu
2022-06-19 5:51 Viorel Munteanu
2022-06-09 5:39 Viorel Munteanu
2022-06-09 5:39 Viorel Munteanu
2022-05-27 2:57 Viorel Munteanu
2022-05-27 2:57 Viorel Munteanu
2022-04-29 6:04 Viorel Munteanu
2022-04-29 6:04 Viorel Munteanu
2022-04-23 9:48 Viorel Munteanu
2022-04-23 9:48 Viorel Munteanu
2022-04-22 19:46 Viorel Munteanu
2022-04-22 19:46 Viorel Munteanu
2022-04-22 19:18 Viorel Munteanu
2022-03-31 17:19 Viorel Munteanu
2022-03-31 17:19 Viorel Munteanu
2022-03-22 18:07 Viorel Munteanu
2022-03-22 18:07 Viorel Munteanu
2022-03-20 19:02 Viorel Munteanu
2022-03-20 19:02 Viorel Munteanu
2022-03-17 18:14 Viorel Munteanu
2022-03-17 18:14 Viorel Munteanu
2022-03-14 16:41 Viorel Munteanu
2022-03-14 16:41 Viorel Munteanu
2022-03-09 13:18 Viorel Munteanu
2022-03-09 13:18 Viorel Munteanu
2022-02-22 18:31 Viorel Munteanu
2022-02-22 18:31 Viorel Munteanu
2022-02-17 7:58 Viorel Munteanu
2022-02-17 7:58 Viorel Munteanu
2022-02-12 12:56 Viorel Munteanu
2022-02-12 12:56 Viorel Munteanu
2022-02-09 16:12 Viorel Munteanu
2022-02-09 10:43 Viorel Munteanu
2022-02-08 5:09 Viorel Munteanu
2022-01-29 10:30 Viorel Munteanu
2022-01-29 10:30 Viorel Munteanu
2022-01-23 20:25 Viorel Munteanu
2022-01-23 20:25 Viorel Munteanu
2022-01-22 12:48 Viorel Munteanu
2022-01-21 14:55 Viorel Munteanu
2022-01-20 20:54 Viorel Munteanu
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1655722132.3c45722492e409af426816da8f22254eec29a867.viorel_munteanu@gentoo \
--to=ceamac.paragon@gmail.com \
--cc=gentoo-commits@lists.gentoo.org \
--cc=gentoo-dev@lists.gentoo.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox