commit:     0aa556416160e9ad6bafd733a64789627f36f1b2
Author:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> org>
AuthorDate: Mon Nov  1 20:40:54 2021 +0000
Commit:     Andreas K. Hüttel <dilfridge <AT> gentoo <DOT> 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 <dilfridge <AT> 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
+}

Reply via email to