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 0CE3E158086 for ; Mon, 1 Nov 2021 20:41:25 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5D2B2E07A5; Mon, 1 Nov 2021 20:41:24 +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 25389E07A5 for ; Mon, 1 Nov 2021 20:41:24 +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 E4DC7342E52 for ; Mon, 1 Nov 2021 20:41:22 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 44019132 for ; Mon, 1 Nov 2021 20:41:21 +0000 (UTC) From: "Andreas K. Hüttel" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Andreas K. Hüttel" Message-ID: <1635799268.0aa556416160e9ad6bafd733a64789627f36f1b2.dilfridge@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: x11-libs/pango/ X-VCS-Repository: repo/gentoo X-VCS-Files: x11-libs/pango/pango-1.48.10-r1.ebuild x11-libs/pango/pango-1.48.10.ebuild x11-libs/pango/pango-1.48.7-r1.ebuild x11-libs/pango/pango-1.48.7-r2.ebuild X-VCS-Directories: x11-libs/pango/ X-VCS-Committer: dilfridge X-VCS-Committer-Name: Andreas K. Hüttel X-VCS-Revision: 0aa556416160e9ad6bafd733a64789627f36f1b2 X-VCS-Branch: master Date: Mon, 1 Nov 2021 20:41:21 +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: 43ad8f49-6e47-44bc-9a74-61daadfbe850 X-Archives-Hash: 0dfa1b6f0bde62bd694790b169bfc582 commit: 0aa556416160e9ad6bafd733a64789627f36f1b2 Author: Andreas K. Hüttel gentoo org> AuthorDate: Mon Nov 1 20:40:54 2021 +0000 Commit: Andreas K. Hüttel gentoo org> CommitDate: Mon Nov 1 20:41:08 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0aa55641 x11-libs/pango: Do NOT depend on freetype[harfbuzz,png] anymore This caused ugly circular dependencies between harfbuzz and freetype on just about every initial installation. Minor font rendering issues accompanied by a warning are an acceptable tradeoff. Discussed in detail in releng team Bug: https://bugs.gentoo.org/712374 Bug: https://bugs.gentoo.org/717380 Bug: https://bugs.gentoo.org/813504 Package-Manager: Portage-3.0.28, Repoman-3.0.3 Signed-off-by: Andreas K. Hüttel gentoo.org> .../pango/{pango-1.48.10.ebuild => pango-1.48.10-r1.ebuild} | 11 ++++++++++- .../pango/{pango-1.48.7-r1.ebuild => pango-1.48.7-r2.ebuild} | 11 ++++++++++- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/x11-libs/pango/pango-1.48.10.ebuild b/x11-libs/pango/pango-1.48.10-r1.ebuild similarity index 87% rename from x11-libs/pango/pango-1.48.10.ebuild rename to x11-libs/pango/pango-1.48.10-r1.ebuild index 0c88d226201..9eb3d082e26 100644 --- a/x11-libs/pango/pango-1.48.10.ebuild +++ b/x11-libs/pango/pango-1.48.10-r1.ebuild @@ -21,7 +21,7 @@ RDEPEND=" >=media-libs/harfbuzz-2.2.0:=[glib(+),introspection?,truetype(+),${MULTILIB_USEDEP}] >=media-libs/fontconfig-2.12.92:1.0=[${MULTILIB_USEDEP}] >=x11-libs/cairo-1.12.10:=[X?,${MULTILIB_USEDEP}] - >=media-libs/freetype-2.5.0.1:2=[harfbuzz,png,${MULTILIB_USEDEP}] + >=media-libs/freetype-2.5.0.1:2=[${MULTILIB_USEDEP}] introspection? ( >=dev-libs/gobject-introspection-0.9.5:= ) X? ( >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] @@ -73,3 +73,12 @@ multilib_src_install_all() { # This will install PangoXft API docs regardless of USE=-X, but this is intentional doins -r "${S}"/docs/Pango* } + +pkg_postinst() { + xdg_pkg_postinst + + if has_version 'media-libs/freetype[-harfbuzz]' ; then + ewarn "media-libs/freetype is installed without harfbuzz support. This may" + ewarn "lead to minor font rendering problems, see bug 712374." + fi +} diff --git a/x11-libs/pango/pango-1.48.7-r1.ebuild b/x11-libs/pango/pango-1.48.7-r2.ebuild similarity index 86% rename from x11-libs/pango/pango-1.48.7-r1.ebuild rename to x11-libs/pango/pango-1.48.7-r2.ebuild index aef9e1d9db1..cc225cce0cd 100644 --- a/x11-libs/pango/pango-1.48.7-r1.ebuild +++ b/x11-libs/pango/pango-1.48.7-r2.ebuild @@ -21,7 +21,7 @@ RDEPEND=" >=media-libs/harfbuzz-2.0:=[glib(+),introspection?,truetype(+),${MULTILIB_USEDEP}] >=media-libs/fontconfig-2.12.92:1.0=[${MULTILIB_USEDEP}] >=x11-libs/cairo-1.12.10:=[X?,${MULTILIB_USEDEP}] - >=media-libs/freetype-2.5.0.1:2=[harfbuzz,png,${MULTILIB_USEDEP}] + >=media-libs/freetype-2.5.0.1:2=[${MULTILIB_USEDEP}] introspection? ( >=dev-libs/gobject-introspection-0.9.5:= ) X? ( >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] @@ -73,3 +73,12 @@ multilib_src_install_all() { # This will install PangoXft API docs regardless of USE=-X, but this is intentional doins -r "${S}"/docs/Pango* } + +pkg_postinst() { + xdg_pkg_postinst + + if has_version 'media-libs/freetype[-harfbuzz]' ; then + ewarn "media-libs/freetype is installed without harfbuzz support. This may" + ewarn "lead to minor font rendering problems, see bug 712374." + fi +}