diff options
Diffstat (limited to 'x11-libs/pango/pango-9999.ebuild')
| -rw-r--r-- | x11-libs/pango/pango-9999.ebuild | 54 |
1 files changed, 17 insertions, 37 deletions
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; } |