From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 8C917158041 for ; Sun, 3 Mar 2024 04:24:36 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 69A20E2A03; Sun, 3 Mar 2024 04:24:35 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 503D5E2A03 for ; Sun, 3 Mar 2024 04:24:35 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 7EE9434301E for ; Sun, 3 Mar 2024 04:24:34 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id E39C6137F for ; Sun, 3 Mar 2024 04:24:32 +0000 (UTC) From: "Matt Turner" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Matt Turner" Message-ID: <1709439851.8452eb3824c34af3893d1bd77588a5ad3e8c3110.mattst88@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-fonts/encodings/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-fonts/encodings/encodings-1.1.0.ebuild X-VCS-Directories: media-fonts/encodings/ X-VCS-Committer: mattst88 X-VCS-Committer-Name: Matt Turner X-VCS-Revision: 8452eb3824c34af3893d1bd77588a5ad3e8c3110 X-VCS-Branch: master Date: Sun, 3 Mar 2024 04:24:32 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 3815c57e-390f-4d89-b4a4-1e8d0f6655c2 X-Archives-Hash: 46c4308b2f40e9238f15017bfa9cf942 commit: 8452eb3824c34af3893d1bd77588a5ad3e8c3110 Author: Matt Turner gentoo org> AuthorDate: Sun Mar 3 04:17:21 2024 +0000 Commit: Matt Turner gentoo 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 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 +}