diff options
| author |   Samuli Suominen <ssuominen@gentoo.org> | 2011-06-16 15:40:07 +0000 |
|---|---|---|
| committer | Samuli Suominen <ssuominen@gentoo.org> | 2011-06-16 15:40:07 +0000 |
| commit | d773949a56dbcaaf1efe626060f671945699e596 (patch) | |
| tree | c4ddb4e8a2d24ae035346019fe8abfe2553c5c21 /sys-apps | |
| parent | Remove old versions (diff) | |
| download | gentoo-2-d773949a56dbcaaf1efe626060f671945699e596.tar.gz gentoo-2-d773949a56dbcaaf1efe626060f671945699e596.tar.bz2 gentoo-2-d773949a56dbcaaf1efe626060f671945699e596.zip | |
Fix missing dev-libs/glib and dev-libs/dbus-glib deps and USE="test" handling wrt #371927 by Patrick Lauer
(Portage version: 2.2.0_alpha40/cvs/Linux x86_64)
Diffstat (limited to 'sys-apps')
| -rw-r--r-- | sys-apps/dbus/ChangeLog | 6 | ||||
| -rw-r--r-- | sys-apps/dbus/dbus-1.4.12.ebuild | 19 |
2 files changed, 20 insertions, 5 deletions
diff --git a/sys-apps/dbus/ChangeLog b/sys-apps/dbus/ChangeLog index 9e420a366877..2061d3afd563 100644 --- a/sys-apps/dbus/ChangeLog +++ b/sys-apps/dbus/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for sys-apps/dbus # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/ChangeLog,v 1.291 2011/06/14 16:05:14 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/ChangeLog,v 1.292 2011/06/16 15:40:07 ssuominen Exp $ + + 16 Jun 2011; Samuli Suominen <ssuominen@gentoo.org> dbus-1.4.12.ebuild: + Fix missing dev-libs/glib and dev-libs/dbus-glib deps and USE="test" handling + wrt #371927 by Patrick Lauer 14 Jun 2011; Jeroen Roovers <jer@gentoo.org> dbus-1.4.12.ebuild: Stable for HPPA (bug #371261). diff --git a/sys-apps/dbus/dbus-1.4.12.ebuild b/sys-apps/dbus/dbus-1.4.12.ebuild index 038820dd10ab..d0caa36cd425 100644 --- a/sys-apps/dbus/dbus-1.4.12.ebuild +++ b/sys-apps/dbus/dbus-1.4.12.ebuild @@ -1,6 +1,6 @@ # Copyright 1999-2011 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/dbus-1.4.12.ebuild,v 1.2 2011/06/14 16:05:14 jer Exp $ +# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/dbus-1.4.12.ebuild,v 1.3 2011/06/16 15:40:07 ssuominen Exp $ EAPI=2 inherit autotools eutils multilib flag-o-matic python systemd virtualx @@ -32,7 +32,10 @@ DEPEND="${RDEPEND} app-text/docbook-xml-dtd:4.1.2 app-text/xmlto ) - test? ( =dev-lang/python-2* ) + test? ( + =dev-lang/python-2* + >=dev-libs/glib-2.22:2 + ) " # out of sources build directory @@ -97,14 +100,22 @@ src_configure() { $(use_enable doc xml-docs) if use test; then + local circular + if ! has_version dev-libs/dbus-glib; then + circular="--disable-modular-tests" + ewarn "Skipping modular tests because dev-libs/dbus-glib is missing" + fi + mkdir "${TBD}" cd "${TBD}" einfo "Running configure in ${TBD}" ECONF_SOURCE="${S}" econf \ ${my_conf} \ $(use_enable test checks) \ - $(use_enable test tests) \ - $(use_enable test asserts) + $(use_enable test embedded-tests) \ + $(use_enable test modular-tests) \ + $(use_enable test asserts) \ + ${circular} fi } |