Fix missing dev-libs/glib and dev-libs/dbus-glib deps and USE="test" handling wrt #371927 by Patrick Lauer

Package-Manager: portage-2.2.0_alpha40/cvs/Linux x86_64

3 files changed, 26 insertions, 11 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/Manifest b/sys-apps/dbus/Manifest
index 35407c096cfe..380f752f6dc0 100644
--- a/sys-apps/dbus/Manifest
+++ b/sys-apps/dbus/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
+Hash: SHA256
 
 AUX 80-dbus 341 RMD160 3b7f55906289d91a1f0ed87edec7902ddac076c5 SHA1 df1f96934fbe164dc4f4e2e4d4b4cdeaf8cef2b5 SHA256 76ce25ce8769cdfcb0d7b7e52e5a7e6474448fc34e8ad9393afac1eca1e07fd2
 AUX dbus-1.4.0-asneeded.patch 3696 RMD160 360f21c06d268116884ed441e7b91478829f1be5 SHA1 a15445bcc5d811276c681b543d0bcd14df9db32f SHA256 f785afd7943b3220ebcf2603b1c059a2dec46bdbfba376e60d8373ba3f933562
@@ -9,15 +9,15 @@ DIST dbus-1.4.12.tar.gz 1878025 RMD160 4c5c718117ebf453844743f6d3c3525d7593d722
 DIST dbus-1.4.6.tar.gz 1835214 RMD160 c751630654225b729512d7a996e5ad70dbfc59fc SHA1 e87520518dfa0bfc4b8791105673e48f993874d7 SHA256 753e1e64df2de518ec93bdee9a813a85b3c147a363615412818c3c095cb8a567
 DIST dbus-1.4.8.tar.gz 1841864 RMD160 3f0f7ff7e952b93c33fe27862d2b4191394e0032 SHA1 68076715cc600964967715fff927face01313b6e SHA256 48bf73a35be0f0e2d9a5071d8f2d9c7c40b4254d9b405dee57f0fb07c9c3cf58
 EBUILD dbus-1.4.10.ebuild 4774 RMD160 23eae6495a2153a1b6658a93a43817fab51d7865 SHA1 97b6190c6949c92d956d210279ca4dd68b44867e SHA256 323b8bfbee5072119bee57f4f8ec8df16f4d5cbcfc456651c3097ad8a318d016
-EBUILD dbus-1.4.12.ebuild 4767 RMD160 e7dcdd881297e87620b5f52f798fba5453c49e07 SHA1 822aa66b33fa05f6e96effb2781eac9a34cd324d SHA256 cfa306797a6dc6a0e6d9d1fcd402b44cf9109145ba991c2793c476d68aaa5243
+EBUILD dbus-1.4.12.ebuild 5042 RMD160 d72394ea48b22c983652ca2099dbb1f2be2e36c2 SHA1 5292bb3794fbd3e8328cde34d4ca22c28bb79067 SHA256 1dbded1d0dfa47e4a2a3e6bbcd7ac53967a934a22adfb996f7b7a3bfc9a8f9a7
 EBUILD dbus-1.4.6.ebuild 4672 RMD160 bf4985c13160d74929a42ee11fc00ca7b9a355c6 SHA1 640c6ace3c712307c540bf5ba371736f805ecf57 SHA256 88b4b014c7618ae2369ff350886c83249a597fe2c3ce85b7dfded590da3df948
 EBUILD dbus-1.4.8-r1.ebuild 4698 RMD160 16110f83ebe71536dffbdad3021a5fbcd3042bf0 SHA1 1b9da73f3b1a183e79ea515570f2460e0ebfeaca SHA256 1aa36033de2cf4603d2d51b08bc5ba0b7414c5cd312adab5f7cb329fe796ea46
-MISC ChangeLog 43815 RMD160 790ff75ff967eea9422d576c585af51cbb5e0416 SHA1 6291bc85efe14574c95455a7e80b1efcd1136ac6 SHA256 8fddf5a6c1a4947f3aed369f8211e64c98dbb247c5c72086bd2ca3ca3efe71b6
+MISC ChangeLog 44007 RMD160 78a8d3a0f6af1e4f87c4dd3c411741855e130369 SHA1 07b4199ad98c7e3604a727e14acf258fb28d98e8 SHA256 447498a301c811953cb280159dd2286fcaa88d864e13d61604b33bd60668d66f
 MISC metadata.xml 285 RMD160 a557848c4782030e9eeb3dc1f06d98840ad7f73a SHA1 e0ba318a0e1a819cc360ea98cc3477dcf52a1526 SHA256 f0df8a3ebe8d22c87645cf66ed8c50c4e64ded6ad1e279e9912cb5074feb5a82
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk33hsAACgkQVWmRsqeSphMexwCdGcNC49l5G1S0nowaNjG3HViP
-7lcAn25zn9gGQiyIlm5P/WNCMzlegXZj
-=wqTF
+iF4EAREIAAYFAk36I8kACgkQXkR9YqOcLPEiywD9HqrDHxvRVu2ft3l3I8vZVbEN
+mCNcYfT4cCitNZ6yCDEA/3SzDn9wxigoBmlCkHuzdi8UCYB+KHlH6/05dt73SdJy
+=5AN4
 -----END PGP SIGNATURE-----
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
 }