commit:     8452eb3824c34af3893d1bd77588a5ad3e8c3110
Author:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
AuthorDate: Sun Mar  3 04:17:21 2024 +0000
Commit:     Matt Turner <mattst88 <AT> gentoo <DOT> org>
CommitDate: Sun Mar  3 04:24:11 2024 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8452eb38

media-fonts/encodings: Version bump to 1.1.0

Signed-off-by: Matt Turner <mattst88 <AT> gentoo.org>

 media-fonts/encodings/encodings-1.1.0.ebuild | 20 +++++++++++++-------
 1 file changed, 13 insertions(+), 7 deletions(-)

diff --git a/media-fonts/encodings/encodings-1.1.0.ebuild 
b/media-fonts/encodings/encodings-1.1.0.ebuild
index f3aca458dcc8..d562eac99ac8 100644
--- a/media-fonts/encodings/encodings-1.1.0.ebuild
+++ b/media-fonts/encodings/encodings-1.1.0.ebuild
@@ -6,16 +6,22 @@ EAPI=8
 # font eclass is inherited directly, since this package is a special case that
 # would greatly complicate the fonts logic of xorg-3
 XORG_TARBALL_SUFFIX="xz"
-inherit font xorg-3
+inherit font xorg-3 meson
 
 DESCRIPTION="X.Org font encodings"
 
 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 
~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos 
~x64-solaris"
 
-BDEPEND="x11-apps/mkfontscale
-       >=media-fonts/font-util-1.1.1-r1"
+BDEPEND="x11-apps/mkfontscale"
 
-XORG_CONFIGURE_OPTIONS=(
-       # https://bugs.gentoo.org/815520
-       --with-fontrootdir="${EPREFIX}"/usr/share/fonts
-)
+# Override xorg-3's src_prepare
+src_prepare() {
+       default
+}
+
+src_configure() {
+       local emesonargs=(
+               -Dfontrootdir="${EPREFIX}"/usr/share/fonts
+       )
+       meson_src_configure
+}

Reply via email to