commit: ebc513a00651a2b9ef0ef338f61f749eef3130ed Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org> AuthorDate: Fri Aug 11 07:13:59 2017 +0000 Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org> CommitDate: Fri Aug 11 07:13:59 2017 +0000 URL: https://gitweb.gentoo.org/proj/gnome.git/commit/?id=ebc513a0
x11-libs/pango: sync with gentoo repository Package-Manager: Portage-2.3.6, Repoman-2.3.3 Manifest-Sign-Key: 0x5A56C8CD0C13248A x11-libs/pango/files/pango-1.32.1-lib64.patch | 44 -------------- x11-libs/pango/metadata.xml | 3 + x11-libs/pango/pango-1.37.5.ebuild | 66 -------------------- x11-libs/pango/pango-9999.ebuild | 86 +++++++++------------------ 4 files changed, 30 insertions(+), 169 deletions(-) diff --git a/x11-libs/pango/files/pango-1.32.1-lib64.patch b/x11-libs/pango/files/pango-1.32.1-lib64.patch deleted file mode 100644 index 0820c78f..00000000 --- a/x11-libs/pango/files/pango-1.32.1-lib64.patch +++ /dev/null @@ -1,44 +0,0 @@ -From c41144ce0d72cb19d347a46ef9386f257f14fb58 Mon Sep 17 00:00:00 2001 -From: Gilles Dartiguelongue <[email protected]> -Date: Sun, 28 Oct 2012 23:19:39 +0100 -Subject: [PATCH] Add multilib support - -pango.modules list modules specific to a host architecture. -Add host triplet in path so that machine able to run multiple -triplet have a proper file per pango library. ---- - pango/Makefile.am | 1 + - pango/pango-utils.c | 4 ++-- - 2 files changed, 3 insertions(+), 2 deletions(-) - -diff --git a/pango/Makefile.am b/pango/Makefile.am -index ab092c9..558108b 100644 ---- a/pango/Makefile.am -+++ b/pango/Makefile.am -@@ -17,6 +17,7 @@ INCLUDES = \ - -DPANGO_ENABLE_BACKEND \ - -DPANGO_ENABLE_ENGINE \ - -DSYSCONFDIR=\"$(sysconfdir)\" \ -+ -DHOST=\"$(host_triplet)\" \ - -DLIBDIR=\"$(libdir)\" \ - -I$(top_srcdir) \ - -I$(top_builddir) \ -diff --git a/pango/pango-utils.c b/pango/pango-utils.c -index 18ffa26..3b88f15 100644 ---- a/pango/pango-utils.c -+++ b/pango/pango-utils.c -@@ -738,9 +738,9 @@ pango_get_sysconf_subdirectory (void) - #else - const char *sysconfdir = g_getenv ("PANGO_SYSCONFDIR"); - if (sysconfdir != NULL) -- tmp_result = g_build_filename (sysconfdir, "pango", NULL); -+ tmp_result = g_build_filename (sysconfdir, "pango", HOST, NULL); - else -- tmp_result = SYSCONFDIR "/pango"; -+ tmp_result = SYSCONFDIR "/pango/" HOST; - #endif - g_once_init_leave((gsize*)&result, (gsize)tmp_result); - } --- -1.7.12.4 - diff --git a/x11-libs/pango/metadata.xml b/x11-libs/pango/metadata.xml index c183bcf3..ce9f853c 100644 --- a/x11-libs/pango/metadata.xml +++ b/x11-libs/pango/metadata.xml @@ -5,6 +5,9 @@ <email>[email protected]</email> <name>Gentoo GNOME Desktop</name> </maintainer> +<use> + <flag name="X">Build and install the legacy pangoxft library</flag> +</use> <upstream> <remote-id type="cpe">cpe:/a:pango:pango</remote-id> </upstream> diff --git a/x11-libs/pango/pango-1.37.5.ebuild b/x11-libs/pango/pango-1.37.5.ebuild deleted file mode 100644 index 5421c79e..00000000 --- a/x11-libs/pango/pango-1.37.5.ebuild +++ /dev/null @@ -1,66 +0,0 @@ -# Copyright 1999-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 -# $Id$ - -EAPI="5" -GCONF_DEBUG="yes" -GNOME2_LA_PUNT="yes" - -inherit gnome2 multilib toolchain-funcs multilib-minimal - -DESCRIPTION="Internationalized text layout and rendering library" -HOMEPAGE="http://www.pango.org/"; - -LICENSE="LGPL-2+ FTL" -SLOT="0" -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" - -IUSE="X +introspection" - -RDEPEND=" - >=media-libs/harfbuzz-0.9.12:=[glib(+),truetype(+),${MULTILIB_USEDEP}] - >=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}] - >=media-libs/fontconfig-2.10.92:1.0=[${MULTILIB_USEDEP}] - >=media-libs/freetype-2.5.0.1:2=[${MULTILIB_USEDEP}] - >=x11-libs/cairo-1.12.14-r4:=[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}] - ) - abi_x86_32? ( - !<=app-emulation/emul-linux-x86-gtklibs-20131008-r3 - !app-emulation/emul-linux-x86-gtklibs[-abi_x86_32(-)] - ) -" -DEPEND="${RDEPEND} - >=dev-util/gtk-doc-am-1.20 - virtual/pkgconfig - X? ( >=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}] ) - !<=sys-devel/autoconf-2.63:2.5 -" - -multilib_src_configure() { - tc-export CXX - - ECONF_SOURCE=${S} \ - gnome2_src_configure \ - --with-cairo \ - $(multilib_native_use_enable introspection) \ - $(use_with X xft) \ - "$(usex X --x-includes="${EPREFIX}/usr/include" "")" \ - "$(usex X --x-libraries="${EPREFIX}/usr/$(get_libdir)" "")" - - if multilib_is_native_abi; then - ln -s "${S}"/docs/html docs/html || die - fi -} - -multilib_src_install() { - gnome2_src_install -} - -pkg_postinst() { - gnome2_pkg_postinst -} diff --git a/x11-libs/pango/pango-9999.ebuild b/x11-libs/pango/pango-9999.ebuild index d754fc85..9d5d0d05 100644 --- a/x11-libs/pango/pango-9999.ebuild +++ b/x11-libs/pango/pango-9999.ebuild @@ -1,12 +1,10 @@ -# Copyright 1999-2015 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Id$ -EAPI="5" -GCONF_DEBUG="yes" +EAPI=6 GNOME2_LA_PUNT="yes" -inherit autotools eutils gnome2 multilib toolchain-funcs +inherit gnome2 multilib-minimal toolchain-funcs if [[ ${PV} = 9999 ]]; then inherit gnome2-live fi @@ -19,78 +17,48 @@ SLOT="0" if [[ ${PV} = 9999 ]]; then KEYWORDS="" else - KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~arm-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" fi -IUSE="X +introspection" +IUSE="X +introspection test" RDEPEND=" - >=media-libs/harfbuzz-0.9.9:=[glib(+),truetype(+)] - >=dev-libs/glib-2.33.12:2 - >=media-libs/fontconfig-2.10.91:1.0= - media-libs/freetype:2= - >=x11-libs/cairo-1.12.10:=[X?] - introspection? ( >=dev-libs/gobject-introspection-0.9.5 ) + >=media-libs/harfbuzz-1.2.3:=[glib(+),truetype(+),${MULTILIB_USEDEP}] + >=dev-libs/glib-2.34.3:2[${MULTILIB_USEDEP}] + >=media-libs/fontconfig-2.10.92:1.0=[${MULTILIB_USEDEP}] + >=media-libs/freetype-2.5.0.1:2=[${MULTILIB_USEDEP}] + >=x11-libs/cairo-1.12.14-r4:=[X?,${MULTILIB_USEDEP}] + introspection? ( >=dev-libs/gobject-introspection-0.9.5:= ) X? ( - x11-libs/libXrender - x11-libs/libX11 - >=x11-libs/libXft-2.0.0 ) + >=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}] + ) " DEPEND="${RDEPEND} - >=dev-util/gtk-doc-am-1.15 - virtual/pkgconfig - X? ( x11-proto/xproto ) + >=dev-util/gtk-doc-am-1.20 + virtual/pkgconfig[${MULTILIB_USEDEP}] + test? ( media-fonts/cantarell ) + X? ( >=x11-proto/xproto-7.0.24[${MULTILIB_USEDEP}] ) !<=sys-devel/autoconf-2.63:2.5 " -src_prepare() { - epatch "${FILESDIR}/${PN}-1.32.1-lib64.patch" - eautoreconf - - gnome2_src_prepare -} - -src_configure() { +multilib_src_configure() { tc-export CXX + ECONF_SOURCE=${S} \ gnome2_src_configure \ --with-cairo \ - $(use_enable introspection) \ + $(multilib_native_use_enable introspection) \ $(use_with X xft) \ "$(usex X --x-includes="${EPREFIX}/usr/include" "")" \ "$(usex X --x-libraries="${EPREFIX}/usr/$(get_libdir)" "")" -} -src_install() { - gnome2_src_install - - local PANGO_CONFDIR="/etc/pango/${CHOST}" - dodir "${PANGO_CONFDIR}" - keepdir "${PANGO_CONFDIR}" -} - -pkg_postinst() { - gnome2_pkg_postinst - - einfo "Generating modules listing..." - local PANGO_CONFDIR="${EROOT}/etc/pango/${CHOST}" - local pango_conf="${PANGO_CONFDIR}/pango.modules" - local tmp_file=$(mktemp -t tmp_pango_ebuild.XXXXXXXXXX) - - # be atomic! - if pango-querymodules --system \ - "${EROOT}"usr/$(get_libdir)/pango/1.8.0/modules/*$(get_modname) \ - > "${tmp_file}"; then - cat "${tmp_file}" > "${pango_conf}" || { - rm "${tmp_file}"; die; } - else - ewarn "Cannot update pango.modules, file generation failed" + if multilib_is_native_abi; then + ln -s "${S}"/docs/html docs/html || die fi - rm "${tmp_file}" +} - if [[ ${REPLACING_VERSIONS} < 1.30.1 ]]; then - elog "In >=${PN}-1.30.1, default configuration file locations moved from" - elog "~/.pangorc and ~/.pangox_aliases to ~/.config/pango/pangorc and" - elog "~/.config/pango/pangox.aliases" - fi +multilib_src_install() { + gnome2_src_install }
