From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (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 finch.gentoo.org (Postfix) with ESMTPS id 6ECCC1582EF for ; Sat, 22 Feb 2025 09:39:01 +0000 (UTC) Received: from lists.gentoo.org (bobolink.gentoo.org [140.211.166.189]) (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) (Authenticated sender: relay-lists.gentoo.org@gentoo.org) by smtp.gentoo.org (Postfix) with ESMTPSA id 5C234343209 for ; Sat, 22 Feb 2025 09:39:01 +0000 (UTC) Received: from bobolink.gentoo.org (localhost [127.0.0.1]) by bobolink.gentoo.org (Postfix) with ESMTP id 4E89A110474; Sat, 22 Feb 2025 09:38:50 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.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 bobolink.gentoo.org (Postfix) with ESMTPS id 3A0A4110475 for ; Sat, 22 Feb 2025 09:38:50 +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)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id E91AE3431F2 for ; Sat, 22 Feb 2025 09:38:49 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 637642741 for ; Sat, 22 Feb 2025 09:38:47 +0000 (UTC) From: "Ulrich Müller" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Ulrich Müller" Message-ID: <1740217092.9e519be6e86135eb9c088ee05ac8d2d5e42dd6cb.ulm@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: media-libs/fontconfig/ X-VCS-Repository: repo/gentoo X-VCS-Files: media-libs/fontconfig/fontconfig-2.16.0.ebuild X-VCS-Directories: media-libs/fontconfig/ X-VCS-Committer: ulm X-VCS-Committer-Name: Ulrich Müller X-VCS-Revision: 9e519be6e86135eb9c088ee05ac8d2d5e42dd6cb X-VCS-Branch: master Date: Sat, 22 Feb 2025 09:38:47 +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: 850e3bb6-af46-4722-b2bc-bfeb703a51c0 X-Archives-Hash: ec83fface0abedd31ce4c976807515de commit: 9e519be6e86135eb9c088ee05ac8d2d5e42dd6cb Author: Ulrich Müller gentoo org> AuthorDate: Fri Feb 14 14:11:22 2025 +0000 Commit: Ulrich Müller gentoo org> CommitDate: Sat Feb 22 09:38:12 2025 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9e519be6 media-libs/fontconfig: Port to ver_replacing Signed-off-by: Ulrich Müller gentoo.org> media-libs/fontconfig/fontconfig-2.16.0.ebuild | 17 +++++++---------- 1 file changed, 7 insertions(+), 10 deletions(-) diff --git a/media-libs/fontconfig/fontconfig-2.16.0.ebuild b/media-libs/fontconfig/fontconfig-2.16.0.ebuild index 71ab244159db..d47abbcf4baa 100644 --- a/media-libs/fontconfig/fontconfig-2.16.0.ebuild +++ b/media-libs/fontconfig/fontconfig-2.16.0.ebuild @@ -4,7 +4,7 @@ EAPI=8 PYTHON_COMPAT=( python3_{10..13} ) -inherit multilib meson-multilib python-any-r1 readme.gentoo-r1 +inherit eapi9-ver multilib meson-multilib python-any-r1 readme.gentoo-r1 DESCRIPTION="A library for configuring and customizing font access" HOMEPAGE="https://fontconfig.org/" @@ -220,16 +220,13 @@ pkg_postinst() { readme.gentoo_print_elog - local ver - for ver in ${REPLACING_VERSIONS} ; do - # 2.14.2 and 2.14.2-r1 included the bad 10-sub-pixel-none.conf - if ver_test ${ver} -lt 2.14.2-r2 && ver_test ${ver} -ge 2.14.2 ; then - if [[ -e "${EROOT}"/etc/fonts/conf.d/10-sub-pixel-none.conf ]] ; then - einfo "Deleting 10-sub-pixel-none.conf from bad fontconfig-2.14.2 (bug #900681)" - rm "${EROOT}"/etc/fonts/conf.d/10-sub-pixel-none.conf || die - fi + # 2.14.2 and 2.14.2-r1 included the bad 10-sub-pixel-none.conf + if ver_replacing -eq 2.14.2 || ver_replacing -eq 2.14.2-r1; then + if [[ -e "${EROOT}"/etc/fonts/conf.d/10-sub-pixel-none.conf ]] ; then + einfo "Deleting 10-sub-pixel-none.conf from bad fontconfig-2.14.2 (bug #900681)" + rm "${EROOT}"/etc/fonts/conf.d/10-sub-pixel-none.conf || die fi - done + fi if [[ -z ${ROOT} ]] ; then multilib_pkg_postinst() {