diff options
Diffstat (limited to 'x11-libs/pango')
| -rw-r--r-- | x11-libs/pango/Manifest | 11 | ||||
| -rw-r--r-- | x11-libs/pango/files/pango-1.26.0-lib64.patch | 20 | ||||
| -rw-r--r-- | x11-libs/pango/files/pango-1.32.1-lib64.patch | 44 | ||||
| -rw-r--r-- | x11-libs/pango/pango-1.32.1.ebuild | 83 | ||||
| -rw-r--r-- | x11-libs/pango/pango-9999.ebuild | 54 |
5 files changed, 155 insertions, 57 deletions
diff --git a/x11-libs/pango/Manifest b/x11-libs/pango/Manifest new file mode 100644 index 00000000..3f374bde --- /dev/null +++ b/x11-libs/pango/Manifest @@ -0,0 +1,11 @@ +-----BEGIN PGP SIGNED MESSAGE----- +Hash: SHA512 + +DIST pango-1.32.1.tar.xz 1035924 SHA256 484babf7e1ac4bf959a0babe8168f180acb516932d70e2985de5f6e2961fcd82 SHA512 36152a2fb6ead5ae609ab3d9b7daa64e68fdd0aeca74b32c64be1cc7cfcc3c1a93d6047396f130652647da2c8d55845b9410dfb48a747b7b95b2532c1754e505 WHIRLPOOL e41c9dfefc507882ecdbcd87eaf169fa09b146f21fb976c8c92472a8058c48e0c1e615d9d9632b46d50624e68c9c3553f80478d0f428a18b392e93ad52c5f228 +-----BEGIN PGP SIGNATURE----- +Version: GnuPG v2.0.19 (GNU/Linux) + +iEYEAREKAAYFAlCNx7IACgkQ1fmVwcYIWAaRDQCg6E9Vz79SsUSo87sAt2mUnP7W +gCgAn1hs0D3bYK90wkA86l7g1jvUCx/F +=A/UG +-----END PGP SIGNATURE----- diff --git a/x11-libs/pango/files/pango-1.26.0-lib64.patch b/x11-libs/pango/files/pango-1.26.0-lib64.patch deleted file mode 100644 index cdbdd502..00000000 --- a/x11-libs/pango/files/pango-1.26.0-lib64.patch +++ /dev/null @@ -1,20 +0,0 @@ ---- pango/Makefile.am -+++ pango/Makefile.am -@@ -16,6 +16,7 @@ - -DPANGO_ENABLE_BACKEND \ - -DPANGO_ENABLE_ENGINE \ - -DSYSCONFDIR=\"$(sysconfdir)\" \ -+ -DHOST=\"$(host_triplet)\" \ - -DLIBDIR=\"$(libdir)\" \ - -DMODULE_VERSION=\"$(PANGO_MODULE_VERSION)\" \ - -DG_DISABLE_DEPRECATED \ ---- pango/modules.c -+++ pango/modules.c -@@ -353,6 +353,7 @@ - - if (!file_str) - file_str = g_build_filename (pango_get_sysconf_subdirectory (), -+ HOST, - "pango.modules", - NULL); - diff --git a/x11-libs/pango/files/pango-1.32.1-lib64.patch b/x11-libs/pango/files/pango-1.32.1-lib64.patch new file mode 100644 index 00000000..0820c78f --- /dev/null +++ b/x11-libs/pango/files/pango-1.32.1-lib64.patch @@ -0,0 +1,44 @@ +From c41144ce0d72cb19d347a46ef9386f257f14fb58 Mon Sep 17 00:00:00 2001 +From: Gilles Dartiguelongue <eva@gentoo.org> +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/pango-1.32.1.ebuild b/x11-libs/pango/pango-1.32.1.ebuild new file mode 100644 index 00000000..bb4bb93e --- /dev/null +++ b/x11-libs/pango/pango-1.32.1.ebuild @@ -0,0 +1,83 @@ +# Copyright 1999-2012 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Header: $ + +EAPI="4" +GCONF_DEBUG="yes" +GNOME2_LA_PUNT="yes" + +inherit autotools eutils gnome2 multilib toolchain-funcs +if [[ ${PV} = 9999 ]]; then + inherit gnome2-live +fi + +DESCRIPTION="Internationalized text layout and rendering library" +HOMEPAGE="http://www.pango.org/" + +LICENSE="LGPL-2+ FTL" +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 ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" +fi + +IUSE="X +introspection" + +RDEPEND=" + >=media-libs/harfbuzz-0.9.3 + >=dev-libs/glib-2.33.12:2 + >=media-libs/fontconfig-2.5.0:1.0 + media-libs/freetype:2 + >=x11-libs/cairo-1.7.6[X?] + X? ( + x11-libs/libXrender + x11-libs/libX11 + >=x11-libs/libXft-2.0.0 )" +DEPEND="${RDEPEND} + >=dev-util/gtk-doc-am-1.13 + virtual/pkgconfig + introspection? ( >=dev-libs/gobject-introspection-0.9.5 ) + X? ( x11-proto/xproto ) + !<=sys-devel/autoconf-2.63:2.5" + +src_prepare() { + tc-export CXX + DOCS="AUTHORS ChangeLog* NEWS README THANKS" + G2CONF="${G2CONF} + $(use_enable introspection) + $(use_with X xft) + $(use X && echo --x-includes=${EPREFIX}/usr/include) + $(use X && echo --x-libraries=${EPREFIX}/usr/$(get_libdir))" + + epatch "${FILESDIR}/${PN}-1.32.1-lib64.patch" + eautoreconf + + gnome2_src_prepare +} + +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) + + dodir "${PANGO_CONFDIR}" + keepdir "${PANGO_CONFDIR}" + + # be atomic! + if pango-querymodules --system \ + "${EROOT}"usr/$(get_libdir)/pango/1.6.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" + fi + rm "${tmp_file}" + + 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" +} diff --git a/x11-libs/pango/pango-9999.ebuild b/x11-libs/pango/pango-9999.ebuild index d2744f37..bb4bb93e 100644 --- a/x11-libs/pango/pango-9999.ebuild +++ b/x11-libs/pango/pango-9999.ebuild @@ -14,7 +14,7 @@ fi DESCRIPTION="Internationalized text layout and rendering library" HOMEPAGE="http://www.pango.org/" -LICENSE="LGPL-2 FTL" +LICENSE="LGPL-2+ FTL" SLOT="0" if [[ ${PV} = 9999 ]]; then KEYWORDS="" @@ -22,12 +22,11 @@ else KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~x86-freebsd ~x86-interix ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~sparc-solaris ~x64-solaris ~x86-solaris" fi -IUSE="X doc +introspection test" +IUSE="X +introspection" -# Upstream bug #643802 -REQUIRED_USE="doc? ( X )" - -RDEPEND=">=dev-libs/glib-2.31.0:2 +RDEPEND=" + >=media-libs/harfbuzz-0.9.3 + >=dev-libs/glib-2.33.12:2 >=media-libs/fontconfig-2.5.0:1.0 media-libs/freetype:2 >=x11-libs/cairo-1.7.6[X?] @@ -36,42 +35,23 @@ RDEPEND=">=dev-libs/glib-2.31.0:2 x11-libs/libX11 >=x11-libs/libXft-2.0.0 )" DEPEND="${RDEPEND} - virtual/pkgconfig >=dev-util/gtk-doc-am-1.13 - doc? ( - >=dev-util/gtk-doc-1.13 - ~app-text/docbook-xml-dtd-4.1.2 - x11-libs/libXft ) + virtual/pkgconfig introspection? ( >=dev-libs/gobject-introspection-0.9.5 ) - test? ( - >=dev-util/gtk-doc-1.13 - ~app-text/docbook-xml-dtd-4.1.2 - x11-libs/libXft ) X? ( x11-proto/xproto ) !<=sys-devel/autoconf-2.63:2.5" -function multilib_enabled() { - has_multilib_profile || ( use x86 && [ "$(get_libdir)" = "lib32" ] ) -} - -pkg_setup() { +src_prepare() { tc-export CXX + DOCS="AUTHORS ChangeLog* NEWS README THANKS" G2CONF="${G2CONF} $(use_enable introspection) - $(use_with X x) + $(use_with X xft) $(use X && echo --x-includes=${EPREFIX}/usr/include) $(use X && echo --x-libraries=${EPREFIX}/usr/$(get_libdir))" - DOCS="AUTHORS ChangeLog* NEWS README THANKS" -} -src_prepare() { - # make config file location host specific so that a 32bit and 64bit pango - # wont fight with each other on a multilib system. Fix building for - # emul-linux-x86-gtklibs - if multilib_enabled ; then - epatch "${FILESDIR}/${PN}-1.26.0-lib64.patch" - eautoreconf - fi + epatch "${FILESDIR}/${PN}-1.32.1-lib64.patch" + eautoreconf gnome2_src_prepare } @@ -79,16 +59,16 @@ src_prepare() { pkg_postinst() { einfo "Generating modules listing..." - local PANGO_CONFDIR="${EROOT}/etc/pango" - multilib_enabled && PANGO_CONFDIR+="/${CHOST}" - - mkdir -p "${PANGO_CONFDIR}" + local PANGO_CONFDIR="${EROOT}/etc/pango/${CHOST}" local pango_conf="${PANGO_CONFDIR}/pango.modules" - local tmp_file=$(mktemp -t tmp.XXXXXXXXXXgdk_pixbuf_ebuild) + local tmp_file=$(mktemp -t tmp_pango_ebuild.XXXXXXXXXX) + + dodir "${PANGO_CONFDIR}" + keepdir "${PANGO_CONFDIR}" # be atomic! if pango-querymodules --system \ - "${EROOT}"usr/$(get_libdir)/pango/1.6.0/modules/*.so \ + "${EROOT}"usr/$(get_libdir)/pango/1.6.0/modules/*$(get_modname) \ > "${tmp_file}"; then cat "${tmp_file}" > "${pango_conf}" || { rm "${tmp_file}"; die; } |