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 (-6 / +41 lines)
Line  Link Here
0
-- a/glib-2.30.0.ebuild
0
++ b/glib-2.30.0.ebuild
Lines 2-10 Link Here
2
# Distributed under the terms of the GNU General Public License v2
2
# Distributed under the terms of the GNU General Public License v2
3
# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.30.0.ebuild,v 1.2 2011/09/28 11:19:21 ssuominen Exp $
3
# $Header: /var/cvsroot/gentoo-x86/dev-libs/glib/glib-2.30.0.ebuild,v 1.2 2011/09/28 11:19:21 ssuominen Exp $
4
4
5
EAPI="4"
5
EAPI="3"
6
GNOME_TARBALL_SUFFIX="xz"
7
PYTHON_DEPEND="utils? 2"
8
# Avoid runtime dependency on python when USE=test
6
9
7
inherit autotools gnome.org libtool eutils flag-o-matic multilib pax-utils virtualx
10
inherit autotools gnome.org libtool eutils flag-o-matic multilib pax-utils python virtualx
8
11
9
DESCRIPTION="The GLib library of C routines"
12
DESCRIPTION="The GLib library of C routines"
10
HOMEPAGE="http://www.gtk.org/"
13
HOMEPAGE="http://www.gtk.org/"
Lines 13-19 Link Here
13
16
14
LICENSE="LGPL-2"
17
LICENSE="LGPL-2"
15
SLOT="2"
18
SLOT="2"
16
IUSE="debug doc fam selinux +static-libs systemtap test xattr"
19
IUSE="debug doc fam selinux +static-libs systemtap test utils xattr"
17
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh
20
KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh
18
~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-linux"
21
~sparc ~x86 ~sparc-fbsd ~x86-fbsd ~x86-linux"
19
22
Lines 21-27 Link Here
21
	virtual/libffi
24
	virtual/libffi
22
	sys-libs/zlib
25
	sys-libs/zlib
23
	xattr? ( sys-apps/attr )
26
	xattr? ( sys-apps/attr )
24
	fam? ( virtual/fam )"
27
	fam? ( virtual/fam )
28
	utils? ( >=dev-util/gdbus-codegen-2.30.0 )"
25
DEPEND="${RDEPEND}
29
DEPEND="${RDEPEND}
26
	>=sys-devel/gettext-0.11
30
	>=sys-devel/gettext-0.11
27
	>=dev-util/gtk-doc-am-1.15
31
	>=dev-util/gtk-doc-am-1.15
Lines 31-36 Link Here
31
		~app-text/docbook-xml-dtd-4.1.2 )
35
		~app-text/docbook-xml-dtd-4.1.2 )
32
	systemtap? ( >=dev-util/systemtap-1.3 )
36
	systemtap? ( >=dev-util/systemtap-1.3 )
33
	test? (
37
	test? (
38
		=dev-lang/python-2*
34
		>=dev-util/gdbus-codegen-2.30.0
39
		>=dev-util/gdbus-codegen-2.30.0
35
		>=sys-apps/dbus-1.2.14 )
40
		>=sys-apps/dbus-1.2.14 )
36
	!<dev-util/gtk-doc-1.15-r2"
41
	!<dev-util/gtk-doc-1.15-r2"
Lines 38-43 Link Here
38
43
39
# XXX: Consider adding test? ( sys-devel/gdb ); assert-msg-test tries to use it
44
# XXX: Consider adding test? ( sys-devel/gdb ); assert-msg-test tries to use it
40
45
46
pkg_setup() {
47
	# Needed for gio/tests/gdbus-testserver.py
48
	use test && python_set_active_version 2
49
}
50
41
src_prepare() {
51
src_prepare() {
42
	mv -vf "${WORKDIR}"/pkg-config-*/pkg.m4 "${WORKDIR}"/ || die
52
	mv -vf "${WORKDIR}"/pkg-config-*/pkg.m4 "${WORKDIR}"/ || die
43
53
Lines 77-82 Link Here
77
			sed -i -e "/desktop-app-info\/fallback/d" gio/tests/desktop-app-info.c || die
87
			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
88
			sed -i -e "/desktop-app-info\/lastused/d" gio/tests/desktop-app-info.c || die
79
		fi
89
		fi
90
91
		# Disable flaky gdbus/connection/life-cycle test; bug #384853
92
		sed -i -e "/connection\/life-cycle/d" gio/tests/gdbus-connection.c || die
93
94
		# Disable tests requiring dbus-python and pygobject; bugs #349236, #377549, #384853
95
		if ! has_version dev-python/dbus-python || ! has_version 'dev-python/pygobject:2' ; then
96
			ewarn "Some tests will be skipped due to dev-python/dbus-python or dev-python/pygobject:2"
97
			ewarn "not being present on your system, think on installing them to get these tests run."
98
			sed -i -e "/connection\/filter/d" gio/tests/gdbus-connection.c || die
99
			sed -i -e "/connection\/large_message/d" gio/tests/gdbus-connection-slow.c || die
100
			sed -i -e "/gdbus\/proxy/d" gio/tests/gdbus-proxy.c || die
101
			sed -i -e "/gdbus\/proxy-well-known-name/d" gio/tests/gdbus-proxy-well-known-name.c || die
102
			sed -i -e "/gdbus\/introspection-parser/d" gio/tests/gdbus-introspection.c || die
103
			sed -i -e "/g_test_add_func/d" gio/tests/gdbus-threading.c || die
104
			sed -i -e "/gdbus\/method-calls-in-thread/d" gio/tests/gdbus-threading.c || die
105
			# needed to prevent gdbus-threading from asserting
106
			ln -sfn $(type -P true) gio/tests/gdbus-testserver.py
107
		fi
80
	fi
108
	fi
81
109
82
	# gdbus-codegen is a separate package
110
	# gdbus-codegen is a separate package
Lines 127-133 Link Here
127
155
128
src_install() {
156
src_install() {
129
	local f
157
	local f
130
	emake DESTDIR="${D}" install || die "Installation failed"
158
	# install-exec-hook substitutes ${PYTHON} in glib/gtester-report
159
	emake DESTDIR="${D}" PYTHON="${EPREFIX}/usr/bin/python2" install || die "Installation failed"
131
160
132
	# Do not install charset.alias even if generated, leave it to libiconv
161
	# Do not install charset.alias even if generated, leave it to libiconv
133
	rm -f "${ED}/usr/lib/charset.alias"
162
	rm -f "${ED}/usr/lib/charset.alias"
Lines 195-198 Link Here
195
		ewarn "Using <gtk+-3.0.12:3 with ${P} results in frequent crashes."
224
		ewarn "Using <gtk+-3.0.12:3 with ${P} results in frequent crashes."
196
		ewarn "You should upgrade to a newer version of gtk+:3 immediately."
225
		ewarn "You should upgrade to a newer version of gtk+:3 immediately."
197
	fi
226
	fi
227
228
	if ! use utils && ! has_version '=dev-lang/python-2*'; then
229
		elog
230
		elog "If you want to use ${EPREFIX}/usr/bin/gtester-report, you will need"
231
		elog "to install =dev-lang/python-2*"
232
	fi
198
}
233
}

Return to bug 384853