Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 489000 | Differences between
and this patch

Collapse All | Expand All

(-)gtk+-2.24.22.ebuild.orig (-24 / +42 lines)
Lines 3-9 Link Here
3
# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-2.24.22.ebuild,v 1.2 2013/10/14 19:17:25 pacho Exp $
3
# $Header: /var/cvsroot/gentoo-x86/x11-libs/gtk+/gtk+-2.24.22.ebuild,v 1.2 2013/10/14 19:17:25 pacho Exp $
4
4
5
EAPI="5"
5
EAPI="5"
6
inherit eutils flag-o-matic gnome2-utils gnome.org multilib virtualx autotools readme.gentoo
6
inherit eutils flag-o-matic gnome2-utils gnome.org multilib virtualx autotools readme.gentoo multilib-minimal
7
7
8
DESCRIPTION="Gimp ToolKit +"
8
DESCRIPTION="Gimp ToolKit +"
9
HOMEPAGE="http://www.gtk.org/"
9
HOMEPAGE="http://www.gtk.org/"
Lines 14-42 Link Here
14
IUSE="aqua cups debug examples +introspection test vim-syntax xinerama"
14
IUSE="aqua cups debug examples +introspection test vim-syntax xinerama"
15
15
16
# NOTE: cairo[svg] dep is due to bug 291283 (not patched to avoid eautoreconf)
16
# NOTE: cairo[svg] dep is due to bug 291283 (not patched to avoid eautoreconf)
17
# cups has no MULTILIB_USEDEP because nothing needs it, see econf below.
17
COMMON_DEPEND="
18
COMMON_DEPEND="
18
	!aqua? (
19
	!aqua? (
19
		x11-libs/libXrender
20
		x11-libs/libXrender[${MULTILIB_USEDEP}]
20
		x11-libs/libX11
21
		x11-libs/libX11[${MULTILIB_USEDEP}]
21
		x11-libs/libXi
22
		x11-libs/libXi[${MULTILIB_USEDEP}]
22
		x11-libs/libXext
23
		x11-libs/libXext[${MULTILIB_USEDEP}]
23
		>=x11-libs/libXrandr-1.3
24
		>=x11-libs/libXrandr-1.3[${MULTILIB_USEDEP}]
24
		x11-libs/libXcursor
25
		x11-libs/libXcursor[${MULTILIB_USEDEP}]
25
		x11-libs/libXfixes
26
		x11-libs/libXfixes[${MULTILIB_USEDEP}]
26
		x11-libs/libXcomposite
27
		x11-libs/libXcomposite[${MULTILIB_USEDEP}]
27
		x11-libs/libXdamage
28
		x11-libs/libXdamage[${MULTILIB_USEDEP}]
28
		>=x11-libs/cairo-1.6:=[X,svg]
29
		>=x11-libs/cairo-1.6:=[X,svg,${MULTILIB_USEDEP}]
29
		x11-libs/gdk-pixbuf:2[X,introspection?]
30
		x11-libs/gdk-pixbuf:2[X,introspection?,${MULTILIB_USEDEP}]
30
	)
31
	)
31
	aqua? (
32
	aqua? (
32
		>=x11-libs/cairo-1.6:=[aqua,svg]
33
		>=x11-libs/cairo-1.6:=[aqua,svg,${MULTILIB_USEDEP}]
33
		x11-libs/gdk-pixbuf:2[introspection?]
34
		x11-libs/gdk-pixbuf:2[introspection?,${MULTILIB_USEDEP}]
34
	)
35
	)
35
	xinerama? ( x11-libs/libXinerama )
36
	xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
36
	>=dev-libs/glib-2.34:2
37
	>=dev-libs/glib-2.34:2[${MULTILIB_USEDEP}]
37
	>=x11-libs/pango-1.20[introspection?]
38
	>=x11-libs/pango-1.20[introspection?,${MULTILIB_USEDEP}]
38
	>=dev-libs/atk-1.29.2[introspection?]
39
	>=dev-libs/atk-1.29.2[introspection?,${MULTILIB_USEDEP}]
39
	media-libs/fontconfig
40
	media-libs/fontconfig[${MULTILIB_USEDEP}]
40
	x11-misc/shared-mime-info
41
	x11-misc/shared-mime-info
41
	cups? ( net-print/cups:= )
42
	cups? ( net-print/cups:= )
42
	introspection? ( >=dev-libs/gobject-introspection-0.9.3 )
43
	introspection? ( >=dev-libs/gobject-introspection-0.9.3 )
Lines 157-182 Link Here
157
	#elibtoolize
158
	#elibtoolize
158
}
159
}
159
160
160
src_configure() {
161
multilib_src_configure() {
162
	# cups is disabled for non-native multilib builds because nothing in
163
	# the tree needs it (see bug 489000 discussion).
161
	# Passing --disable-debug is not recommended for production use
164
	# Passing --disable-debug is not recommended for production use
165
	ECONF_SOURCE="${S}" \
162
	econf \
166
	econf \
163
		$(usex aqua --with-gdktarget=quartz --with-gdktarget=x11) \
167
		$(usex aqua --with-gdktarget=quartz --with-gdktarget=x11) \
164
		$(usex aqua "" --with-xinput) \
168
		$(usex aqua "" --with-xinput) \
165
		$(usex debug --enable-debug=yes "") \
169
		$(usex debug --enable-debug=yes "") \
166
		$(use_enable cups cups auto) \
170
		$(multilib_build_binaries \
167
		$(use_enable introspection) \
171
			&& use_enable cups cups auto \
172
			|| echo --disable-cups) \
173
		$(multilib_build_binaries \
174
			&& use_enable introspection \
175
			|| echo --disable-introspection) \
168
		$(use_enable xinerama) \
176
		$(use_enable xinerama) \
169
		--disable-papi
177
		--disable-papi
170
}
178
}
171
179
172
src_test() {
180
multilib_src_test() {
173
	unset DBUS_SESSION_BUS_ADDRESS
181
	unset DBUS_SESSION_BUS_ADDRESS
174
	Xemake check
182
	Xemake check
175
}
183
}
176
184
177
src_install() {
185
multilib_src_install() {
178
	default
186
	default
179
187
188
	if ! multilib_is_native_abi && [[ ${ABI} == x86 ]]; then
189
		mv "${D}"/usr/bin/gtk-query-immodules-2.0{,-32} || die
190
	fi
191
}
192
193
multilib_src_install_all() {
180
	# see bug #133241
194
	# see bug #133241
181
	echo 'gtk-fallback-icon-theme = "gnome"' > "${T}/gtkrc"
195
	echo 'gtk-fallback-icon-theme = "gnome"' > "${T}/gtkrc"
182
	insinto /usr/share/gtk-2.0
196
	insinto /usr/share/gtk-2.0
Lines 202-207 Link Here
202
216
203
	gtk-query-immodules-2.0 --update-cache || die "Update immodules cache failed"
217
	gtk-query-immodules-2.0 --update-cache || die "Update immodules cache failed"
204
218
219
	if has x86 $(multilib_get_enabled_abis) && has amd64 $(multilib_get_enabled_abis); then
220
		gtk-query-immodules-2.0-32 --update-cache || die "Update x86 immodules cache failed"
221
	fi
222
205
	if [ -e "${EROOT%/}/etc/gtk-2.0/gtk.immodules" ]; then
223
	if [ -e "${EROOT%/}/etc/gtk-2.0/gtk.immodules" ]; then
206
		elog "File /etc/gtk-2.0/gtk.immodules has been moved to \$CHOST"
224
		elog "File /etc/gtk-2.0/gtk.immodules has been moved to \$CHOST"
207
		elog "aware location. Removing deprecated file."
225
		elog "aware location. Removing deprecated file."

Return to bug 489000