summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorThomas Deutschmann <whissi@gentoo.org>2021-05-05 00:04:37 +0200
committerThomas Deutschmann <whissi@gentoo.org>2021-05-07 21:10:41 +0200
commit02d3f847a8af267ce28d468316a166ca1bccf316 (patch)
tree5ed451435b288453d0bd44e31a676a918d7030d0 /x11-libs/pango
parentgames-util/grfcodec: don't rely on git presence (diff)
downloadgentoo-02d3f847a8af267ce28d468316a166ca1bccf316.tar.gz
gentoo-02d3f847a8af267ce28d468316a166ca1bccf316.tar.bz2
gentoo-02d3f847a8af267ce28d468316a166ca1bccf316.zip
x11-libs/pango: make x11 deps depend on USE=X again
Restore <x11-libs/pango-1.44 behavior and allow building without other x11 dependencies. Package-Manager: Portage-3.0.18, Repoman-3.0.3 Signed-off-by: Thomas Deutschmann <whissi@gentoo.org> Closes: https://github.com/gentoo/gentoo/pull/20685 Signed-off-by: Thomas Deutschmann <whissi@gentoo.org>
Diffstat (limited to 'x11-libs/pango')
-rw-r--r--x11-libs/pango/pango-1.48.4-r1.ebuild (renamed from x11-libs/pango/pango-1.48.4.ebuild)16
1 files changed, 9 insertions, 7 deletions
diff --git a/x11-libs/pango/pango-1.48.4.ebuild b/x11-libs/pango/pango-1.48.4-r1.ebuild
index a480f4aec88d..e928c4faeae2 100644
--- a/x11-libs/pango/pango-1.48.4.ebuild
+++ b/x11-libs/pango/pango-1.48.4-r1.ebuild
@@ -24,16 +24,18 @@ RDEPEND="
>=media-libs/fontconfig-2.12.92:1.0=[${MULTILIB_USEDEP}]
>=media-libs/freetype-2.5.0.1:2=[${MULTILIB_USEDEP}]
>=media-libs/harfbuzz-2.0:=[glib(+),introspection?,truetype(+),${MULTILIB_USEDEP}]
- >=x11-libs/cairo-1.12.10:=[X,${MULTILIB_USEDEP}]
- >=x11-libs/libXrender-0.9.8[${MULTILIB_USEDEP}]
- >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
- >=x11-libs/libXft-2.3.1-r1[${MULTILIB_USEDEP}]
- x11-libs/libXrender[${MULTILIB_USEDEP}]
+ >=x11-libs/cairo-1.12.10:=[X?,${MULTILIB_USEDEP}]
introspection? ( >=dev-libs/gobject-introspection-0.9.5:= )
+ X? (
+ >=x11-libs/libXrender-0.9.8[${MULTILIB_USEDEP}]
+ >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+ >=x11-libs/libXft-2.3.1-r1[${MULTILIB_USEDEP}]
+ x11-libs/libXrender[${MULTILIB_USEDEP}]
+ )
"
DEPEND="${RDEPEND}
- x11-base/xorg-proto
sysprof? ( dev-util/sysprof-capture:4[${MULTILIB_USEDEP}] )
+ X? ( x11-base/xorg-proto )
"
BDEPEND="
dev-util/glib-utils
@@ -56,6 +58,7 @@ multilib_src_configure() {
--wrap-mode nofallback
$(meson_feature sysprof)
+ $(meson_feature X xft)
-Dcairo=enabled
-Dfontconfig=enabled
-Dfreetype=enabled
@@ -63,7 +66,6 @@ multilib_src_configure() {
-Dintrospection="$(multilib_native_usex introspection enabled disabled)"
-Dinstall-tests=false
-Dlibthai=disabled
- -Dxft=enabled
)
meson_src_configure
}