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)
