* [gentoo-commits] proj/gnome:master commit in: x11-libs/pango/, x11-libs/pango/files/
@ 2012-10-29 0:06 Gilles Dartiguelongue
0 siblings, 0 replies; 2+ messages in thread
From: Gilles Dartiguelongue @ 2012-10-29 0:06 UTC (permalink / raw
To: gentoo-commits
commit: a739ce237bf15fd7d9e35a30fd6679f9aa5ea27a
Author: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
AuthorDate: Mon Oct 29 00:02:58 2012 +0000
Commit: Gilles Dartiguelongue <eva <AT> gentoo <DOT> org>
CommitDate: Mon Oct 29 00:06:45 2012 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gnome.git;a=commit;h=a739ce23
x11-libs/pango: 1.30.1 → 1.32.1
Refresh multilib patch and make it non conditional like gtk2.
harfbuzz is a hard requirement now.
---
x11-libs/pango/files/pango-1.26.0-lib64.patch | 20 -------
x11-libs/pango/files/pango-1.32.1-lib64.patch | 44 ++++++++++++++++
.../{pango-9999.ebuild => pango-1.32.1.ebuild} | 54 ++++++-------------
x11-libs/pango/pango-9999.ebuild | 54 ++++++-------------
4 files changed, 78 insertions(+), 94 deletions(-)
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 cdbdd50..0000000
--- 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 0000000..0820c78
--- /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-9999.ebuild b/x11-libs/pango/pango-1.32.1.ebuild
similarity index 65%
copy from x11-libs/pango/pango-9999.ebuild
copy to x11-libs/pango/pango-1.32.1.ebuild
index d2744f3..bb4bb93 100644
--- a/x11-libs/pango/pango-9999.ebuild
+++ b/x11-libs/pango/pango-1.32.1.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; }
diff --git a/x11-libs/pango/pango-9999.ebuild b/x11-libs/pango/pango-9999.ebuild
index d2744f3..bb4bb93 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; }
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [gentoo-commits] proj/gnome:master commit in: x11-libs/pango/, x11-libs/pango/files/
@ 2017-08-11 7:19 Gilles Dartiguelongue
0 siblings, 0 replies; 2+ messages in thread
From: Gilles Dartiguelongue @ 2017-08-11 7:19 UTC (permalink / raw
To: gentoo-commits
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 <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/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>gnome@gentoo.org</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
}
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2017-08-11 7:19 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-10-29 0:06 [gentoo-commits] proj/gnome:master commit in: x11-libs/pango/, x11-libs/pango/files/ Gilles Dartiguelongue
-- strict thread matches above, loose matches on Subject: below --
2017-08-11 7:19 Gilles Dartiguelongue
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox