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 / +37 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 16-44 Link Here
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
COMMON_DEPEND="
17
COMMON_DEPEND="
18
	!aqua? (
18
	!aqua? (
19
		x11-libs/libXrender
19
		x11-libs/libXrender[${MULTILIB_USEDEP}]
20
		x11-libs/libX11
20
		x11-libs/libX11[${MULTILIB_USEDEP}]
21
		x11-libs/libXi
21
		x11-libs/libXi[${MULTILIB_USEDEP}]
22
		x11-libs/libXext
22
		x11-libs/libXext[${MULTILIB_USEDEP}]
23
		>=x11-libs/libXrandr-1.3
23
		>=x11-libs/libXrandr-1.3[${MULTILIB_USEDEP}]
24
		x11-libs/libXcursor
24
		x11-libs/libXcursor[${MULTILIB_USEDEP}]
25
		x11-libs/libXfixes
25
		x11-libs/libXfixes[${MULTILIB_USEDEP}]
26
		x11-libs/libXcomposite
26
		x11-libs/libXcomposite[${MULTILIB_USEDEP}]
27
		x11-libs/libXdamage
27
		x11-libs/libXdamage[${MULTILIB_USEDEP}]
28
		>=x11-libs/cairo-1.6:=[X,svg]
28
		>=x11-libs/cairo-1.6:=[X,svg,${MULTILIB_USEDEP}]
29
		x11-libs/gdk-pixbuf:2[X,introspection?]
29
		x11-libs/gdk-pixbuf:2[X,introspection?,${MULTILIB_USEDEP}]
30
	)
30
	)
31
	aqua? (
31
	aqua? (
32
		>=x11-libs/cairo-1.6:=[aqua,svg]
32
		>=x11-libs/cairo-1.6:=[aqua,svg,${MULTILIB_USEDEP}]
33
		x11-libs/gdk-pixbuf:2[introspection?]
33
		x11-libs/gdk-pixbuf:2[introspection?,${MULTILIB_USEDEP}]
34
	)
34
	)
35
	xinerama? ( x11-libs/libXinerama )
35
	xinerama? ( x11-libs/libXinerama[${MULTILIB_USEDEP}] )
36
	>=dev-libs/glib-2.34:2
36
	>=dev-libs/glib-2.34:2[${MULTILIB_USEDEP}]
37
	>=x11-libs/pango-1.20[introspection?]
37
	>=x11-libs/pango-1.20[introspection?,${MULTILIB_USEDEP}]
38
	>=dev-libs/atk-1.29.2[introspection?]
38
	>=dev-libs/atk-1.29.2[introspection?,${MULTILIB_USEDEP}]
39
	media-libs/fontconfig
39
	media-libs/fontconfig[${MULTILIB_USEDEP}]
40
	x11-misc/shared-mime-info
40
	x11-misc/shared-mime-info
41
	cups? ( net-print/cups:= )
41
	cups? ( net-print/cups:=[${MULTILIB_USEDEP}] )
42
	introspection? ( >=dev-libs/gobject-introspection-0.9.3 )
42
	introspection? ( >=dev-libs/gobject-introspection-0.9.3 )
43
	!<gnome-base/gail-1000
43
	!<gnome-base/gail-1000
44
"
44
"
Lines 157-182 Link Here
157
	#elibtoolize
157
	#elibtoolize
158
}
158
}
159
159
160
src_configure() {
160
multilib_src_configure() {
161
	# Passing --disable-debug is not recommended for production use
161
	# Passing --disable-debug is not recommended for production use
162
	ECONF_SOURCE="${S}" \
162
	econf \
163
	econf \
163
		$(usex aqua --with-gdktarget=quartz --with-gdktarget=x11) \
164
		$(usex aqua --with-gdktarget=quartz --with-gdktarget=x11) \
164
		$(usex aqua "" --with-xinput) \
165
		$(usex aqua "" --with-xinput) \
165
		$(usex debug --enable-debug=yes "") \
166
		$(usex debug --enable-debug=yes "") \
166
		$(use_enable cups cups auto) \
167
		$(use_enable cups cups auto) \
167
		$(use_enable introspection) \
168
		$(multilib_is_native_abi \
169
			&& use_enable introspection \
170
			|| echo --disable-introspection) \
168
		$(use_enable xinerama) \
171
		$(use_enable xinerama) \
169
		--disable-papi
172
		--disable-papi
170
}
173
}
171
174
172
src_test() {
175
multilib_src_test() {
173
	unset DBUS_SESSION_BUS_ADDRESS
176
	unset DBUS_SESSION_BUS_ADDRESS
174
	Xemake check
177
	Xemake check
175
}
178
}
176
179
177
src_install() {
180
multilib_src_install() {
178
	default
181
	default
179
182
183
	if ! multilib_is_native_abi && [[ ${ABI} == x86 ]]; then
184
		mv "${D}"/usr/bin/gtk-query-immodules-2.0{,-32} || die
185
	fi
186
}
187
188
multilib_src_install_all() {
180
	# see bug #133241
189
	# see bug #133241
181
	echo 'gtk-fallback-icon-theme = "gnome"' > "${T}/gtkrc"
190
	echo 'gtk-fallback-icon-theme = "gnome"' > "${T}/gtkrc"
182
	insinto /usr/share/gtk-2.0
191
	insinto /usr/share/gtk-2.0
Lines 202-207 Link Here
202
211
203
	gtk-query-immodules-2.0 --update-cache || die "Update immodules cache failed"
212
	gtk-query-immodules-2.0 --update-cache || die "Update immodules cache failed"
204
213
214
	if has x86 $(multilib_get_enabled_abis) && has amd64 $(multilib_get_enabled_abis); then
215
		gtk-query-immodules-2.0-32 --update-cache || die "Update x86 immodules cache failed"
216
	fi
217
205
	if [ -e "${EROOT%/}/etc/gtk-2.0/gtk.immodules" ]; then
218
	if [ -e "${EROOT%/}/etc/gtk-2.0/gtk.immodules" ]; then
206
		elog "File /etc/gtk-2.0/gtk.immodules has been moved to \$CHOST"
219
		elog "File /etc/gtk-2.0/gtk.immodules has been moved to \$CHOST"
207
		elog "aware location. Removing deprecated file."
220
		elog "aware location. Removing deprecated file."

Return to bug 489000