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.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id F1FEF158093 for ; Sun, 12 Sep 2021 21:04:04 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 48F9FE078A; Sun, 12 Sep 2021 21:04:03 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-CHACHA20-POLY1305 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id CDC0DE0849 for ; Sun, 12 Sep 2021 21:03:48 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 6FFC2342DA1 for ; Sun, 12 Sep 2021 20:59:51 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 29C35CF for ; Sun, 12 Sep 2021 20:59:50 +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: <1631480377.22c3f29da2f1f0604b6be9f93d421e9962483a9e.sam@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: x11-libs/pango/ X-VCS-Repository: repo/gentoo X-VCS-Files: x11-libs/pango/Manifest x11-libs/pango/pango-1.48.5-r1.ebuild X-VCS-Directories: x11-libs/pango/ X-VCS-Committer: sam X-VCS-Committer-Name: Sam James X-VCS-Revision: 22c3f29da2f1f0604b6be9f93d421e9962483a9e X-VCS-Branch: master Date: Sun, 12 Sep 2021 20:59:50 +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: 62225024-813a-4b45-8b85-033e4e0d7565 X-Archives-Hash: 435a959224cb66ab68bb97860c391272 commit: 22c3f29da2f1f0604b6be9f93d421e9962483a9e Author: Sam James gentoo org> AuthorDate: Sun Sep 12 20:57:50 2021 +0000 Commit: Sam James gentoo org> CommitDate: Sun Sep 12 20:59:37 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=22c3f29d x11-libs/pango: restore 1.48.5-r1 for circular dep workaround This is the last version to not depend on freetype[harfbuzz], see https://wiki.gentoo.org/wiki/User:Sam/Portage_help/Circular_dependencies#Solution. Acked-by: Mart Raudsepp gentoo.org> Signed-off-by: Sam James gentoo.org> x11-libs/pango/Manifest | 1 + x11-libs/pango/pango-1.48.5-r1.ebuild | 83 +++++++++++++++++++++++++++++++++++ 2 files changed, 84 insertions(+) diff --git a/x11-libs/pango/Manifest b/x11-libs/pango/Manifest index b5971f78c44..9e8a7cd33f8 100644 --- a/x11-libs/pango/Manifest +++ b/x11-libs/pango/Manifest @@ -1,5 +1,6 @@ DIST pango-1.42.4-patchset.tar.xz 6040 BLAKE2B ec3f1a6a4de30e0864e7f0bf0950cb7a7b4bada8c3db496a8e5b1e770f221ae72b43167178445ea9cd0d6b88e51d2af49e7fdf27b2e792997fe7c37e55d429c1 SHA512 b7654c3493931e3c6d3cbd40ee49c5cbebaf403954bae75dea80e9f03e12dd5082548aff6a9e778821b8f935e227a7efaad4c1b980fa108e7258042221cadfc1 DIST pango-1.42.4.tar.xz 833876 BLAKE2B 7de1094a29750b9e59ea1e5c92644fa5d6b835828d027963a53cce3f204ee1ea0042ec492e209de9136f05ca131ccda959bc477d4f6e9c72e5f620ddf4235f26 SHA512 993e97f647eba0c5ed90bcfcb8228bf67fa3f20b1f4331e4e40a30788d7c3ac55eee1209471bf21df125cb8fc6121acc8062a9da2f8a7d6cbe8e9ad13a9320dc DIST pango-1.48.10.tar.xz 2071736 BLAKE2B 68bca7e8307fc7ddb49830c84b17e95fbb1f2e1afbe04d26d04d9bd9f48f0767b80cb7446a22150a7f3d5650614d6652d7b20be102d533b4c78adf58574c57d1 SHA512 f9acdfb3fde50e8fb4b3dfad329624754ef7cb1c6ff6d80485c1fc7a24d92095b7e9053cd8713a291fbee68cd1cd699dcdb8110265b44e97a34c5b4ef0c06390 +DIST pango-1.48.5.tar.xz 1819476 BLAKE2B 8529e8cbcf0f33be56cf09229abe45fb3525e12a9c2a6ad7cca416ff67a92eb010abc2ce814fa4d19a924186369eede4a576efdd2f4c64b39e31c9821c5e414a SHA512 2c758e649af5b9f9fa960c26a6f4dcf5abd8035101fdfe4a02fe02cb892250b615584b02d63aaa06f3da5cbe7bb848459ac969f43437c34cec084b51bcf48cab DIST pango-1.48.7.tar.xz 2050880 BLAKE2B 2ee048d9713aed0972ffdf3feb96c7c0683ffa1494ac2b798a4f6b1f5797d689b0e0c06bcc3f4a10130d23279ed295a3a59141c75bd3a0f2da7facf62d6c3baa SHA512 e5680d628f531bea7633945bd74dc51a93c4c881dec58fcf9f6271043e77b82a4805e311355cb4d9f8cdfcdf52785a5a6391517a264b62416c26e82dff4aca39 DIST pango-1.48.9.tar.xz 2063756 BLAKE2B d1610aaac783b95a35ad3e083b4bab33f3d4beff533386817addcb5eb9022de242087ffe4e62c043870b4aac1fbc0fe3e1c5d18744909a5a05015a702dfea2e3 SHA512 e3bba743bb596b0a34cedc893f9af0216bcc9fec521c2da09cfdeec9ad80a05b5c53c3fce1a225ab27536e9335725cffb87c66867d0522fd4632df00b1d4c056 diff --git a/x11-libs/pango/pango-1.48.5-r1.ebuild b/x11-libs/pango/pango-1.48.5-r1.ebuild new file mode 100644 index 00000000000..382eb4b7793 --- /dev/null +++ b/x11-libs/pango/pango-1.48.5-r1.ebuild @@ -0,0 +1,83 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit gnome2-utils meson-multilib toolchain-funcs xdg + +DESCRIPTION="Internationalized text layout and rendering library" +HOMEPAGE="https://www.pango.org/" +SRC_URI="http://ftp.gnome.org/pub/GNOME/sources/pango/$(ver_cut 1-2)/${P}.tar.xz" + +LICENSE="LGPL-2+ FTL" +SLOT="0" +KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv sparc x86" + +IUSE="gtk-doc +introspection sysprof test X" +RESTRICT="!test? ( test )" +REQUIRED_USE="gtk-doc? ( introspection )" + +RDEPEND=" + >=dev-libs/fribidi-0.19.7[${MULTILIB_USEDEP}] + >=dev-libs/glib-2.62.2:2[${MULTILIB_USEDEP}] + >=media-libs/fontconfig-2.12.92:1.0=[${MULTILIB_USEDEP}] + >=media-libs/freetype-2.5.0.1:2=[${MULTILIB_USEDEP}] + >=media-libs/harfbuzz-2.0:=[glib(+),introspection?,truetype(+),${MULTILIB_USEDEP}] + >=x11-libs/cairo-1.12.10:=[X?,${MULTILIB_USEDEP}] + introspection? ( >=dev-libs/gobject-introspection-0.9.5:= ) + X? ( + >=x11-libs/libXrender-0.9.8[${MULTILIB_USEDEP}] + >=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}] + >=x11-libs/libXft-2.3.1-r1[${MULTILIB_USEDEP}] + x11-libs/libXrender[${MULTILIB_USEDEP}] + ) +" +DEPEND="${RDEPEND} + sysprof? ( >=dev-util/sysprof-capture-3.40.1:4[${MULTILIB_USEDEP}] ) + X? ( x11-base/xorg-proto ) +" +BDEPEND=" + dev-util/glib-utils + sys-apps/help2man + virtual/pkgconfig + gtk-doc? ( + dev-util/gi-docgen + app-text/docbook-xml-dtd:4.2 + app-text/docbook-xml-dtd:4.5 + ) +" + +src_prepare() { + xdg_src_prepare + gnome2_environment_reset +} + +multilib_src_configure() { + local emesonargs=( + # Never use gi-docgen subproject + --wrap-mode nofallback + + $(meson_feature sysprof) + $(meson_feature X xft) + -Dcairo=enabled + -Dfontconfig=enabled + -Dfreetype=enabled + $(meson_native_use_bool gtk-doc gtk_doc) + $(meson_native_use_feature introspection) + -Dinstall-tests=false + -Dlibthai=disabled + ) + meson_src_configure +} + +multilib_src_install_all() { + if use gtk-doc; then + mv "${ED}"/usr/share/doc/{${PN}/reference/,${PF}/html/} || die + rmdir "${ED}"/usr/share/doc/${PN} || die + fi +} + +pkg_postinst() { + xdg_pkg_postinst + gnome2_schemas_update +}