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

Collapse All | Expand All

(-)file_not_specified_in_diff (-19 / +15 lines)
Line  Link Here
0
-- dev-libs/glib/glib-2.34.3.ebuild
0
++ dev-libs/glib/glib-2.34.3-r1.ebuild
Lines 3-12 Link Here
3
# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.34.3.ebuild,v 1.3 2013/02/19 00:08:33 tetromino Exp $
3
# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.34.3.ebuild,v 1.3 2013/02/19 00:08:33 tetromino Exp $
4
4
5
EAPI="5"
5
EAPI="5"
6
PYTHON_DEPEND="utils? 2"
6
PYTHON_COMPAT=( python2_5 python2_6 python2_7 )
7
# Avoid runtime dependency on python when USE=test
7
8
8
inherit autotools gnome.org libtool eutils flag-o-matic gnome2-utils multilib pax-utils python-r1 toolchain-funcs virtualx linux-info
9
inherit autotools gnome.org libtool eutils flag-o-matic gnome2-utils multilib pax-utils python toolchain-funcs virtualx linux-info
10
9
11
DESCRIPTION="The GLib library of C routines"
10
DESCRIPTION="The GLib library of C routines"
12
HOMEPAGE="http://www.gtk.org/"
11
HOMEPAGE="http://www.gtk.org/"
Lines 26-32 Link Here
26
		>=dev-libs/libelf-0.8.12 )
25
		>=dev-libs/libelf-0.8.12 )
27
	xattr? ( sys-apps/attr )
26
	xattr? ( sys-apps/attr )
28
	fam? ( virtual/fam )
27
	fam? ( virtual/fam )
29
	utils? ( >=dev-util/gdbus-codegen-${PV} )"
28
	utils? (
29
		${PYTHON_DEPS}
30
		>=dev-util/gdbus-codegen-${PV}[${PYTHON_USEDEP}]
31
	)"
30
DEPEND="${RDEPEND}
32
DEPEND="${RDEPEND}
31
	app-text/docbook-xml-dtd:4.1.2
33
	app-text/docbook-xml-dtd:4.1.2
32
	>=dev-libs/libxslt-1.0
34
	>=dev-libs/libxslt-1.0
Lines 35-42 Link Here
35
	systemtap? ( >=dev-util/systemtap-1.3 )
37
	systemtap? ( >=dev-util/systemtap-1.3 )
36
	test? (
38
	test? (
37
		sys-devel/gdb
39
		sys-devel/gdb
38
		=dev-lang/python-2*
40
		${PYTHON_DEPS}
39
		>=dev-util/gdbus-codegen-${PV}
41
		>=dev-util/gdbus-codegen-${PV}[${PYTHON_USEDEP}]
40
		>=sys-apps/dbus-1.2.14 )
42
		>=sys-apps/dbus-1.2.14 )
41
	!<dev-util/gtk-doc-1.15-r2"
43
	!<dev-util/gtk-doc-1.15-r2"
42
PDEPEND="x11-misc/shared-mime-info
44
PDEPEND="x11-misc/shared-mime-info
Lines 45-56 Link Here
45
# Earlier versions of gvfs do not work with glib
47
# Earlier versions of gvfs do not work with glib
46
48
47
pkg_setup() {
49
pkg_setup() {
48
	# Needed for gio/tests/gdbus-testserver.py
49
	if use test; then
50
		python_set_active_version 2
51
		python_pkg_setup
52
	fi
53
54
	if use kernel_linux ; then
50
	if use kernel_linux ; then
55
		CONFIG_CHECK="~INOTIFY_USER"
51
		CONFIG_CHECK="~INOTIFY_USER"
56
		linux-info_pkg_setup
52
		linux-info_pkg_setup
Lines 107-115 Link Here
107
103
108
	epatch_user
104
	epatch_user
109
105
110
	# disable pyc compiling
111
	use test && python_clean_py-compile_files
112
113
	# Needed for the punt-python-check patch, disabling timeout test
106
	# Needed for the punt-python-check patch, disabling timeout test
114
	# Also needed to prevent croscompile failures, see bug #267603
107
	# Also needed to prevent croscompile failures, see bug #267603
115
	# Also needed for the no-gdbus-codegen patch
108
	# Also needed for the no-gdbus-codegen patch
Lines 169-176 Link Here
169
src_install() {
162
src_install() {
170
	local f
163
	local f
171
164
172
	# install-exec-hook substitutes ${PYTHON} in glib/gtester-report
165
	# PYTHON is only for temporary shebang in glib/gtester-report
173
	emake DESTDIR="${D}" PYTHON="${EPREFIX}/usr/bin/python2" install
166
	emake DESTDIR="${D}" PYTHON="/usr/bin/python" install
174
167
175
	if ! use utils; then
168
	if ! use utils; then
176
		rm "${ED}usr/bin/gtester-report"
169
		rm "${ED}usr/bin/gtester-report"
Lines 187-192 Link Here
187
	# Completely useless with or without USE static-libs, people need to use
180
	# Completely useless with or without USE static-libs, people need to use
188
	# pkg-config
181
	# pkg-config
189
	prune_libtool_files --modules
182
	prune_libtool_files --modules
183
184
	use utils && python_replicate_script "${ED}"/usr/bin/gtester-report
190
}
185
}
191
186
192
src_test() {
187
src_test() {
Lines 198-203 Link Here
198
	export G_DBUS_COOKIE_SHA1_KEYRING_DIR="${T}/temp"
193
	export G_DBUS_COOKIE_SHA1_KEYRING_DIR="${T}/temp"
199
	unset GSETTINGS_BACKEND # bug 352451
194
	unset GSETTINGS_BACKEND # bug 352451
200
	export LC_TIME=C # bug #411967
195
	export LC_TIME=C # bug #411967
196
	python_export_best
201
197
202
	# Related test is a bit nitpicking
198
	# Related test is a bit nitpicking
203
	mkdir "$G_DBUS_COOKIE_SHA1_KEYRING_DIR"
199
	mkdir "$G_DBUS_COOKIE_SHA1_KEYRING_DIR"

Return to bug 458788