Gentoo Archives: gentoo-commits

From: Sam James <sam@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/fontconfig/
Date: Sat, 02 Apr 2022 03:07:55
Message-Id: 1648868855.c1d90c29867fe33c76c7d4705da7740b1522cc87.sam@gentoo
1 commit: c1d90c29867fe33c76c7d4705da7740b1522cc87
2 Author: David Michael <fedora.dm0 <AT> gmail <DOT> com>
3 AuthorDate: Thu Jul 1 19:23:58 2021 +0000
4 Commit: Sam James <sam <AT> gentoo <DOT> org>
5 CommitDate: Sat Apr 2 03:07:35 2022 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c1d90c29
7
8 media-libs/fontconfig: install the eselect module in BROOT
9
10 This updates the dependencies to put eselect-fontconfig in both
11 BDEPEND and RDEPEND to approximate IDEPEND as closely as possible.
12 (Currently autotools.eclass is blocking EAPI 8 everywhere.) This
13 allows using "eselect fontconfig" commands to configure $ROOT when
14 installing a staging root.
15
16 Package-Manager: Portage-3.0.20, Repoman-3.0.2
17 Signed-off-by: David Michael <fedora.dm0 <AT> gmail.com>
18 Closes: https://github.com/gentoo/gentoo/pull/21503
19 Signed-off-by: Sam James <sam <AT> gentoo.org>
20
21 media-libs/fontconfig/fontconfig-2.13.93.ebuild | 7 +++++--
22 1 file changed, 5 insertions(+), 2 deletions(-)
23
24 diff --git a/media-libs/fontconfig/fontconfig-2.13.93.ebuild b/media-libs/fontconfig/fontconfig-2.13.93.ebuild
25 index 72b70d969b41..a47819b7d743 100644
26 --- a/media-libs/fontconfig/fontconfig-2.13.93.ebuild
27 +++ b/media-libs/fontconfig/fontconfig-2.13.93.ebuild
28 @@ -41,8 +41,11 @@ RDEPEND=">=dev-libs/expat-2.1.0-r3[${MULTILIB_USEDEP}]
29 elibc_SunOS? ( sys-libs/libuuid )
30 virtual/libintl[${MULTILIB_USEDEP}]"
31 DEPEND="${RDEPEND}"
32 -PDEPEND="!x86-winnt? ( app-eselect/eselect-fontconfig )
33 - virtual/ttf-fonts"
34 +PDEPEND="virtual/ttf-fonts"
35 +# Put the eselect module in BDEPEND until EAPI 8 is ready for IDEPEND, so that
36 +# it is natively usable in BROOT to update ROOT when cross-compiling.
37 +BDEPEND+=" !x86-winnt? ( app-eselect/eselect-fontconfig )"
38 +RDEPEND+=" !x86-winnt? ( app-eselect/eselect-fontconfig )"
39
40 PATCHES=(
41 "${FILESDIR}"/${PN}-2.10.2-docbook.patch # 310157