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 5C4DD158021 for ; Thu, 10 Nov 2022 07:13:41 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 6490EE0938; Thu, 10 Nov 2022 07:13:40 +0000 (UTC) Received: from smtp.gentoo.org (dev.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)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 4E474E0938 for ; Thu, 10 Nov 2022 07:13:40 +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 5E999340EFF for ; Thu, 10 Nov 2022 07:13:39 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 9C1B672B for ; Thu, 10 Nov 2022 07:13:37 +0000 (UTC) From: "Sam James" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Sam James" Message-ID: <1668064227.950f2bcf514f844b58ae9ff4cf635e0e0e076b7a.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/freetype/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-libs/freetype/freetype-9999.ebuild X-VCS-Directories: media-libs/freetype/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 950f2bcf514f844b58ae9ff4cf635e0e0e076b7a X-VCS-Branch: master Date: Thu, 10 Nov 2022 07:13:37 +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: 7869cb4a-9721-47e0-b13b-db14540f8d47 X-Archives-Hash: a097eaff5e1b983680faf5b2a6634a1b commit: 950f2bcf514f844b58ae9ff4cf635e0e0e076b7a Author: Sam James gentoo org> AuthorDate: Thu Nov 10 07:10:27 2022 +0000 Commit: Sam James gentoo org> CommitDate: Thu Nov 10 07:10:27 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=950f2bcf media-libs/freetype: sync live Signed-off-by: Sam James gentoo.org> media-libs/freetype/freetype-9999.ebuild | 33 ++++++++++++++++++++++---------- 1 file changed, 23 insertions(+), 10 deletions(-) diff --git a/media-libs/freetype/freetype-9999.ebuild b/media-libs/freetype/freetype-9999.ebuild index 011cc4310aba..4b80a7e3b439 100644 --- a/media-libs/freetype/freetype-9999.ebuild +++ b/media-libs/freetype/freetype-9999.ebuild @@ -3,11 +3,11 @@ EAPI=8 -inherit flag-o-matic libtool multilib-build multilib-minimal toolchain-funcs +inherit autotools flag-o-matic libtool multilib-build multilib-minimal toolchain-funcs DESCRIPTION="High-quality and portable font engine" HOMEPAGE="https://www.freetype.org/" -IUSE="X +adobe-cff brotli bzip2 +cleartype-hinting debug fontforge harfbuzz infinality +png static-libs utils" +IUSE="X +adobe-cff brotli bzip2 +cleartype-hinting debug fontforge harfbuzz infinality +png static-libs svg utils" if [[ "${PV}" != 9999 ]] ; then SRC_URI="mirror://sourceforge/freetype/${P/_/}.tar.xz @@ -16,10 +16,10 @@ if [[ "${PV}" != 9999 ]] ; then mirror://nongnu/freetype/ft2demos-${PV}.tar.xz ) doc? ( mirror://sourceforge/freetype/${PN}-doc-${PV}.tar.xz mirror://nongnu/freetype/${PN}-doc-${PV}.tar.xz )" - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt" IUSE+=" doc" else - inherit autotools git-r3 + inherit git-r3 fi LICENSE="|| ( FTL GPL-2+ )" @@ -32,17 +32,18 @@ RDEPEND=" harfbuzz? ( >=media-libs/harfbuzz-1.3.0[truetype,${MULTILIB_USEDEP}] ) png? ( >=media-libs/libpng-1.2.51:0=[${MULTILIB_USEDEP}] ) utils? ( - X? ( - >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] - >=x11-libs/libXau-1.0.7-r1[${MULTILIB_USEDEP}] - >=x11-libs/libXdmcp-1.1.1-r1[${MULTILIB_USEDEP}] - ) - )" + svg? ( >=gnome-base/librsvg-2.46.0[${MULTILIB_USEDEP}] ) + X? ( >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] ) + ) +" DEPEND="${RDEPEND}" BDEPEND=" virtual/pkgconfig " +PATCHES=( +) + _egit_repo_handler() { if [[ "${PV}" == 9999 ]] ; then local phase="${1}" @@ -68,6 +69,12 @@ _egit_repo_handler() { fi } +pkg_pretend() { + if use svg && ! use utils ; then + einfo "The \"svg\" USE flag only has effect when the \"utils\" USE flag is also enabled." + fi +} + src_fetch() { _egit_repo_handler ${EBUILD_PHASE} } @@ -109,6 +116,11 @@ src_prepare() { default + pushd builds/unix &>/dev/null || die + # eautoheader produces broken ftconfig.in + AT_NOEAUTOHEADER="yes" AT_M4DIR="." eautoreconf + popd &>/dev/null || die + # This is the same as the 01 patch from infinality sed '/AUX_MODULES += \(gx\|ot\)valid/s@^# @@' -i modules.cfg || die @@ -185,6 +197,7 @@ multilib_src_configure() { $(use_with harfbuzz) $(use_with png) $(use_enable static-libs static) + $(usex utils $(use_with svg librsvg) --without-librsvg) # avoid using libpng-config LIBPNG_CFLAGS="$($(tc-getPKG_CONFIG) --cflags libpng)"