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

Collapse All | Expand All

(-)file_not_specified_in_diff (-1 / +27 lines)
Line  Link Here
0
-- a/glib-2.30.0.ebuild
0
++ b/glib-2.30.0.ebuild
Lines 5-10 Link Here
5
EAPI="4"
5
EAPI="4"
6
6
7
inherit autotools gnome.org libtool eutils flag-o-matic multilib pax-utils virtualx
7
inherit autotools gnome.org libtool eutils flag-o-matic multilib pax-utils virtualx
8
# Do not inherit python.eclass to avoid python runtime dependency; #377549
8
9
9
DESCRIPTION="The GLib library of C routines"
10
DESCRIPTION="The GLib library of C routines"
10
HOMEPAGE="http://www.gtk.org/"
11
HOMEPAGE="http://www.gtk.org/"
Lines 31-36 Link Here
31
		~app-text/docbook-xml-dtd-4.1.2 )
32
		~app-text/docbook-xml-dtd-4.1.2 )
32
	systemtap? ( >=dev-util/systemtap-1.3 )
33
	systemtap? ( >=dev-util/systemtap-1.3 )
33
	test? (
34
	test? (
35
		=dev-lang/python-2*
34
		>=dev-util/gdbus-codegen-2.30.0
36
		>=dev-util/gdbus-codegen-2.30.0
35
		>=sys-apps/dbus-1.2.14 )
37
		>=sys-apps/dbus-1.2.14 )
36
	!<dev-util/gtk-doc-1.15-r2"
38
	!<dev-util/gtk-doc-1.15-r2"
Lines 77-82 Link Here
77
			sed -i -e "/desktop-app-info\/fallback/d" gio/tests/desktop-app-info.c || die
79
			sed -i -e "/desktop-app-info\/fallback/d" gio/tests/desktop-app-info.c || die
78
			sed -i -e "/desktop-app-info\/lastused/d" gio/tests/desktop-app-info.c || die
80
			sed -i -e "/desktop-app-info\/lastused/d" gio/tests/desktop-app-info.c || die
79
		fi
81
		fi
82
83
		# Disable flaky gdbus/connection/life-cycle test; bug #384853
84
		sed -i -e "/connection\/life-cycle/d" gio/tests/gdbus-connection.c || die
85
86
		# Disable tests requiring dbus-python and pygobject; bugs #349236, #377549, #384853
87
		if ! has_version dev-python/dbus-python || ! has_version 'dev-python/pygobject:2' ; then
88
			ewarn "Some tests will be skipped due to dev-python/dbus-python or dev-python/pygobject:2"
89
			ewarn "not being present on your system, think on installing them to get these tests run."
90
			sed -i -e "/connection\/filter/d" gio/tests/gdbus-connection.c || die
91
			sed -i -e "/connection\/large_message/d" gio/tests/gdbus-connection-slow.c || die
92
			sed -i -e "/gdbus\/proxy/d" gio/tests/gdbus-proxy.c || die
93
			sed -i -e "/gdbus\/proxy-well-known-name/d" gio/tests/gdbus-proxy-well-known-name.c || die
94
			sed -i -e "/gdbus\/introspection-parser/d" gio/tests/gdbus-introspection.c || die
95
			sed -i -e "/g_test_add_func/d" gio/tests/gdbus-threading.c || die
96
			sed -i -e "/gdbus\/method-calls-in-thread/d" gio/tests/gdbus-threading.c || die
97
			# needed to prevent gdbus-threading from asserting
98
			ln -sfn $(type -P true) gio/tests/gdbus-testserver.py
99
		else
100
			# use python2 for the test server
101
			sed -i -e 's:/usr/bin/env python$:/usr/bin/env python2:' gio/tests/gdbus-testserver.py || die
102
		fi
80
	fi
103
	fi
81
104
82
	# gdbus-codegen is a separate package
105
	# gdbus-codegen is a separate package
Lines 85-90 Link Here
85
	# disable pyc compiling
108
	# disable pyc compiling
86
	ln -sfn $(type -P true) py-compile
109
	ln -sfn $(type -P true) py-compile
87
110
111
	# python2 needed for gtester-report
112
	sed -e 's:/usr/bin/env python$:/usr/bin/env python2:' -i glib/gtester-report || die
113
88
	# Needed for the punt-python-check patch, disabling timeout test
114
	# Needed for the punt-python-check patch, disabling timeout test
89
	# Also needed to prevent croscompile failures, see bug #267603
115
	# Also needed to prevent croscompile failures, see bug #267603
90
	# Also needed for the no-gdbus-codegen patch
116
	# Also needed for the no-gdbus-codegen patch

Return to bug 384853