commit: 017c693d912d29ad1114f40877fe0c428d2b3ab7 Author: Filip Kobierski <fkobi <AT> pm <DOT> me> AuthorDate: Wed Jun 18 12:17:47 2025 +0000 Commit: Sam James <sam <AT> gentoo <DOT> org> CommitDate: Fri Nov 7 01:46:15 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=017c693d
dev-libs/girara: add USE=X to avoid automagic Inspired by one of Eli's commits that solved 957789 series od bugs. Also minor ebuild improvements: - remove -a from emesonargs declaration - functionality is the same and that style is less common - use . instead of * for docs to use less paths Signed-off-by: Filip Kobierski <fkobi <AT> pm.me> Part-of: https://github.com/gentoo/gentoo/pull/41617 Signed-off-by: Sam James <sam <AT> gentoo.org> .../{girara-9999.ebuild => girara-0.4.5-r1.ebuild} | 16 ++++++++++------ dev-libs/girara/girara-9999.ebuild | 14 +++++++++----- 2 files changed, 19 insertions(+), 11 deletions(-) diff --git a/dev-libs/girara/girara-9999.ebuild b/dev-libs/girara/girara-0.4.5-r1.ebuild similarity index 78% copy from dev-libs/girara/girara-9999.ebuild copy to dev-libs/girara/girara-0.4.5-r1.ebuild index 2d8b03eb3759..8dba0f28afae 100644 --- a/dev-libs/girara/girara-9999.ebuild +++ b/dev-libs/girara/girara-0.4.5-r1.ebuild @@ -3,7 +3,7 @@ EAPI=8 -inherit meson +inherit flag-o-matic meson DESCRIPTION="UI library that focuses on simplicity and minimalism" HOMEPAGE="https://pwmt.org/projects/girara/"; @@ -18,8 +18,8 @@ else fi LICENSE="ZLIB" -SLOT="0/9999" -IUSE="doc test" +SLOT="0/$(ver_cut 2-3)" +IUSE="doc test X" RESTRICT="!test? ( test )" # REVIEW: are all those really needed? @@ -30,7 +30,7 @@ RDEPEND=" media-libs/harfbuzz:= x11-libs/cairo[glib] x11-libs/gdk-pixbuf - >=x11-libs/gtk+-3.24:3 + >=x11-libs/gtk+-3.24:3[X?] x11-libs/pango " DEPEND=" @@ -50,7 +50,11 @@ BDEPEND=" DOCS=( AUTHORS README.md ) src_configure() { - local -a emesonargs=( + # defang automagic dependencies + # Currently only needed for X11-specific workarounds + use X || append-flags -DGENTOO_GTK_HIDE_X11 + + local emesonargs=( -Djson=enabled $(meson_feature doc docs) $(meson_feature test tests) @@ -60,5 +64,5 @@ src_configure() { src_compile() { meson_src_compile - use doc && HTML_DOCS=( "${BUILD_DIR}"/doc/html/* ) # BUILD_DIR is set by meson_src_compile + use doc && HTML_DOCS=( "${BUILD_DIR}"/doc/html/. ) # BUILD_DIR is set by meson_src_compile } diff --git a/dev-libs/girara/girara-9999.ebuild b/dev-libs/girara/girara-9999.ebuild index 2d8b03eb3759..4bd9a026ab01 100644 --- a/dev-libs/girara/girara-9999.ebuild +++ b/dev-libs/girara/girara-9999.ebuild @@ -3,7 +3,7 @@ EAPI=8 -inherit meson +inherit flag-o-matic meson DESCRIPTION="UI library that focuses on simplicity and minimalism" HOMEPAGE="https://pwmt.org/projects/girara/"; @@ -19,7 +19,7 @@ fi LICENSE="ZLIB" SLOT="0/9999" -IUSE="doc test" +IUSE="doc test X" RESTRICT="!test? ( test )" # REVIEW: are all those really needed? @@ -30,7 +30,7 @@ RDEPEND=" media-libs/harfbuzz:= x11-libs/cairo[glib] x11-libs/gdk-pixbuf - >=x11-libs/gtk+-3.24:3 + >=x11-libs/gtk+-3.24:3[X?] x11-libs/pango " DEPEND=" @@ -50,7 +50,11 @@ BDEPEND=" DOCS=( AUTHORS README.md ) src_configure() { - local -a emesonargs=( + # defang automagic dependencies + # Currently only needed for X11-specific workarounds + use X || append-flags -DGENTOO_GTK_HIDE_X11 + + local emesonargs=( -Djson=enabled $(meson_feature doc docs) $(meson_feature test tests) @@ -60,5 +64,5 @@ src_configure() { src_compile() { meson_src_compile - use doc && HTML_DOCS=( "${BUILD_DIR}"/doc/html/* ) # BUILD_DIR is set by meson_src_compile + use doc && HTML_DOCS=( "${BUILD_DIR}"/doc/html/. ) # BUILD_DIR is set by meson_src_compile }
