Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 488868
Collapse All | Expand All

(-)pango-1.34.1.ebuild.orig (-15 / +45 lines)
Lines 6-12 Link Here
6
GCONF_DEBUG="yes"
6
GCONF_DEBUG="yes"
7
GNOME2_LA_PUNT="yes"
7
GNOME2_LA_PUNT="yes"
8
8
9
inherit autotools eutils gnome2 multilib toolchain-funcs
9
inherit autotools eutils gnome2 toolchain-funcs multilib-minimal
10
10
11
DESCRIPTION="Internationalized text layout and rendering library"
11
DESCRIPTION="Internationalized text layout and rendering library"
12
HOMEPAGE="http://www.pango.org/"
12
HOMEPAGE="http://www.pango.org/"
Lines 20-35 Link Here
20
# Bump cairo dep to be safer:
20
# Bump cairo dep to be safer:
21
# https://bugzilla.gnome.org/show_bug.cgi?id=700247#c4
21
# https://bugzilla.gnome.org/show_bug.cgi?id=700247#c4
22
RDEPEND="
22
RDEPEND="
23
	>=media-libs/harfbuzz-0.9.9:=[glib(+),truetype(+)]
23
	>=media-libs/harfbuzz-0.9.9:=[glib(+),truetype(+),${MULTILIB_USEDEP}]
24
	>=dev-libs/glib-2.33.12:2
24
	>=dev-libs/glib-2.33.12:2[${MULTILIB_USEDEP}]
25
	>=media-libs/fontconfig-2.10.91:1.0=
25
	>=media-libs/fontconfig-2.10.91:1.0=[${MULTILIB_USEDEP}]
26
	media-libs/freetype:2=
26
	media-libs/freetype:2=[${MULTILIB_USEDEP}]
27
	>=x11-libs/cairo-1.12.10:=[X?]
27
	>=x11-libs/cairo-1.12.10:=[X?,${MULTILIB_USEDEP}]
28
	introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
28
	introspection? ( >=dev-libs/gobject-introspection-0.9.5 )
29
	X? (
29
	X? (
30
		x11-libs/libXrender
30
		x11-libs/libXrender[${MULTILIB_USEDEP}]
31
		x11-libs/libX11
31
		x11-libs/libX11[${MULTILIB_USEDEP}]
32
		>=x11-libs/libXft-2.0.0 )
32
		>=x11-libs/libXft-2.0.0[${MULTILIB_USEDEP}] )
33
"
33
"
34
DEPEND="${RDEPEND}
34
DEPEND="${RDEPEND}
35
	>=dev-util/gtk-doc-am-1.13
35
	>=dev-util/gtk-doc-am-1.13
Lines 47-66 Link Here
47
	gnome2_src_prepare
47
	gnome2_src_prepare
48
}
48
}
49
49
50
src_configure() {
50
multilib_src_configure() {
51
	ECONF_SOURCE="${S}" \
51
	gnome2_src_configure \
52
	gnome2_src_configure \
52
		$(use_enable introspection) \
53
		$(multilib_is_native_abi \
54
			&& use_enable introspection \
55
			|| echo --disable-introspection) \
53
		$(use_with X xft) \
56
		$(use_with X xft) \
54
		"$(usex X --x-includes="${EPREFIX}/usr/include" "")" \
57
		"$(usex X --x-includes="${EPREFIX}/usr/include" "")" \
55
		"$(usex X --x-libraries="${EPREFIX}/usr/$(get_libdir)" "")"
58
		"$(usex X --x-libraries="${EPREFIX}/usr/$(get_libdir)" "")"
56
}
59
}
57
60
58
src_install() {
61
multilib_src_install() {
59
	gnome2_src_install
62
	gnome2_src_install
60
63
61
	local PANGO_CONFDIR="/etc/pango/${CHOST}"
64
	if multilib_is_native_abi; then
62
	dodir "${PANGO_CONFDIR}"
65
		local PANGO_CONFDIR="/etc/pango/${CHOST}"
63
	keepdir "${PANGO_CONFDIR}"
66
		dodir "${PANGO_CONFDIR}"
67
		keepdir "${PANGO_CONFDIR}"
68
	elif [[ ${ABI} == x86 ]]; then
69
		local PANGO_CONFDIR="/etc/pango/i686-pc-linux-gnu"
70
		dodir "${PANGO_CONFDIR}"
71
		keepdir "${PANGO_CONFDIR}"
72
		mv "${D}"/usr/bin/pango-querymodules{,-32} || die
73
	fi
64
}
74
}
65
75
66
pkg_postinst() {
76
pkg_postinst() {
Lines 82-87 Link Here
82
	fi
92
	fi
83
	rm "${tmp_file}"
93
	rm "${tmp_file}"
84
94
95
	if has x86 $(multilib_get_enabled_abis) && has amd64 $(multilib_get_enabled_abis); then
96
		PANGO_CONFDIR="/etc/pango/i686-pc-linux-gnu"
97
		einfo "Generating modules listing for x86..."
98
99
		mkdir -p "${PANGO_CONFDIR}"
100
		local pango_conf="${PANGO_CONFDIR}/pango.modules"
101
		local tmp_file=$(mktemp -t tmp.XXXXXXXXXXpango_querymodules)
102
		if [ -z "${tmp_file}" ]; then
103
			ewarn "Cannot create temporary file"
104
			return 1
105
		fi
106
107
		if pango-querymodules-32 > "${tmp_file}"; then
108
			cat "${tmp_file}" > "${pango_conf}"
109
		else
110
			ewarn "Cannot update pango.modules, file generation failed"
111
		fi
112
		rm "${tmp_file}"
113
	fi
114
85
	if [[ ${REPLACING_VERSIONS} < 1.30.1 ]]; then
115
	if [[ ${REPLACING_VERSIONS} < 1.30.1 ]]; then
86
		elog "In >=${PN}-1.30.1, default configuration file locations moved from"
116
		elog "In >=${PN}-1.30.1, default configuration file locations moved from"
87
		elog "~/.pangorc and ~/.pangox_aliases to ~/.config/pango/pangorc and"
117
		elog "~/.pangorc and ~/.pangox_aliases to ~/.config/pango/pangorc and"

Return to bug 488868