Fake expat check for configure, bug #529546. Add missing ||die calls.

Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0xEFB4464E!

3 files changed, 31 insertions, 14 deletions

diff --git a/sys-apps/dbus/ChangeLog b/sys-apps/dbus/ChangeLog
index c628e9670bd1..893e1ec3132c 100644
--- a/sys-apps/dbus/ChangeLog
+++ b/sys-apps/dbus/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for sys-apps/dbus
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/ChangeLog,v 1.455 2014/11/14 21:28:01 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/ChangeLog,v 1.456 2014/11/16 21:25:10 mgorny Exp $
+
+  16 Nov 2014; Michał Górny <mgorny@gentoo.org> dbus-1.8.10.ebuild:
+  Fake expat check for configure, bug #529546. Add missing ||die calls.
 
   14 Nov 2014; Markus Meier <maekke@gentoo.org> dbus-1.8.10.ebuild:
   arm stable, bug #528900
diff --git a/sys-apps/dbus/Manifest b/sys-apps/dbus/Manifest
index 2584f9ed1d35..f27dfb24451f 100644
--- a/sys-apps/dbus/Manifest
+++ b/sys-apps/dbus/Manifest
@@ -5,14 +5,26 @@ AUX 80-dbus 341 SHA256 76ce25ce8769cdfcb0d7b7e52e5a7e6474448fc34e8ad9393afac1eca
 AUX dbus.initd 1185 SHA256 98e37b8b6ed25004e48c5855d74c9361eea06d3fee13cefcc0ed10ccf452aa01 SHA512 7983e77015b46c204b10948a1fcedaae53a75848919961eb1ef8878bfa11c933256642c0e3f59163e72374ce1bd33b0338c787ce067c0982fcdf8a798b922a15 WHIRLPOOL 62ef5b9191a2bd3410c53ed63015e9968789f448e5959de2ebc2404bc13ce99c333546bf1eb335f826ef7ea143f70a53c2ecffd81b4e35fa51ba2e2bdf68879f
 DIST dbus-1.8.10.tar.gz 1864902 SHA256 10bf87fdb68815edd01d53885101dbcdd80dacad7198912cca61a4fa22dfaf8e SHA512 e6c3ad81a6f6eb966a39ee5612513809fb74b411e001ea0987ab91e3f6492d506527dca39263d2dfced726a7341a284a189ca588ee1525894ac751eee68878aa WHIRLPOOL 6b50b3296cfe3db9195541d35a7bdf88e74d1b65aa846e63e1885396b1515ac1f93e1ee6ac579db762033538f002a3a2bf12491af0b9810f20f0560beb49cb13
 DIST dbus-1.8.8.tar.gz 1864881 SHA256 dfab263649a979d0fff64a30cac374891a8e9940350e41f3bbd7679af32bd1fd SHA512 99e7e05347666e95f3ccaf3f19500b59a5e509cdb9489c11f47ed4f139d3bc8e21adcf48cbb5c4f0de1661e831d60634eb7b6b76cc080d32091b63c732ebe391 WHIRLPOOL 3905352dfc2f922b599dfe7bd650258b16b489802b1c39b0be03bcfbe56c6d89b39f51f1b6d2d851dd23705aa068f40ade856001fadcca885bd3e81cf6e51199
-EBUILD dbus-1.8.10.ebuild 7079 SHA256 b3d06a169ea4d13df8d622db1b6af8d240a1e06389d1429684106b57819310d1 SHA512 9561d0c98e5d93ab5d7d5e707cfe2e6f941cfeb71cca72c420c8c49b8760c629d1bab4418a796f5b4262abbe3e8db1aeea4c4b157d5629b14afacf018325c270 WHIRLPOOL 9be289488e623765760b1446f55904bd780a5ada55c1878400f28e9b8c5cc71707b955934d047d6d438e3aa4c286da14f9296f6beccee27dd026ee502eb7aead
+EBUILD dbus-1.8.10.ebuild 7193 SHA256 8dee384b7aaafb430a728998e9f42a48c1dc53887712052c89929a012e7ac387 SHA512 db8ecac88eda591f3c92640712c7f61a868e069e62e56676e1f95232e18d110182934aa853e7265ae5abb39d00cf27c985e08a3b7f369fd412ac7537a7b6ef46 WHIRLPOOL 0eb3a7e730c4fe5dee14967653d993701240ae29ef7f2e71e973adb25227ef7fe092f0041ddfe649b102105423de6747ac3ef069960e2a4b52b14ff82240ac26
 EBUILD dbus-1.8.8.ebuild 7073 SHA256 1f090e4f6c4eba4fb7ab6fb0d6b5b5afafae66799682ff41bff21d53c6d48d6b SHA512 d0cf98e3f40b8b5720d6968a2c9ab93cf195600e1a07291a712c973bb637334cea01a219474e7afdd0863c251f0e09e3ce6922fa192e43683635d91ec0211907 WHIRLPOOL ce9a152d1f24b46ac24320d758bac34e621a71953de58ebf2a9f221d46266eaeb309b99d5cbb633dab5f75dc9a848877ee53de148242cb30f00b5eafc105d439
-MISC ChangeLog 65113 SHA256 7ab43132b5b20f23c6c45160929fa6cdcbe0cd66aa594d57c413c97d33ea4a57 SHA512 6399b2f8753118d2829550581fb3c9a50d031847b10d49cca18662ed2ef4d6a56d7c4f5763f3f083eb216e02dc23a95516097a1f85df92b56713d1f0e0a0810d WHIRLPOOL 3a7a984d1ff82e3401286b481ae83e3cae7d4d5f0a6b8d56cfafee1a2be85f8da36f557f888cd19ae4b8eb1c3d1476ff44a79bab1b13eb14a337692a1708fb98
+MISC ChangeLog 65256 SHA256 07f2f32ba87c04e42c33aae5695fa94b201efaa2db532e83ee4cc5305b2afd92 SHA512 29392e7067d66eb3bce13d04512fac5cfb2e532c88b8e25ec3cd8ae55578dda498d5fb80bdea00a57c4d25bffc66a4d445f7949cfb82de64bc6c3c80bfee6c12 WHIRLPOOL 8695ac23c450193df841113583402b8e19a531dc4fec6629f602b015b5c6b5bec9687549a259b266730d2b100f01d139cf2d3e3571a1e881947a1773b8e9db50
 MISC metadata.xml 427 SHA256 d8fc8fedafc547578a85222cb60fb7eff3740c8ce101b22ba75aa3e5028135ce SHA512 2f8f64ded5050e87ce679d944dcf9c9a801ea03ee14471ab0702f10339f3f995701c313bfe10e7ab01f1bc784f04a5e6efbb29ea0b44513b9b3e384370956dc5 WHIRLPOOL 7a2add023434038b287c141213c2caf2adcc7ff5bcfb8025b2db0163bedd436fea64dd0e1a072f00232722738705fdc1f367e758d108373146d6fbea8803d5b2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iEYEAREIAAYFAlRmc+MACgkQkKaRLQcq0GJHMACfZ+pAPPp0H1B0/RAs+bOODQf1
-0esAnidZs4sO9qKX1AcdtNeCVC9n6uiR
-=SMiH
+iQJ8BAEBCABmBQJUaRY4XxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
+ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
+MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOc7gP/ictlyePScxhss5KYcTFrk+f
+mCJlvMio62DzrLj23CZ5wZ4WeDzwHlDzwrxFJ/KNEDrfY9gTWDsPYHyFWh8D4dLb
+bdbhlKDf8MMV1w0ujJ46d7JAyjJkewiWUlEZPDeIIQpiXhUBck1eAgIYfOnVEzV/
+cuPjtLsysvVuxjuzURU3vxpYA6xYdYbUiWFXAeudxF/aK2u2H4Qll7NLDoR5lCEI
+2VepBIsjstnS9pqMb3OgI0XulZrUsl0alisGmqXOnyz/AkmWCOkQwNa9453xb8a8
+QibpIlMdDwXE92DEPrfmXFzz8t2L8biyMEM0h+S1dE1m5MqSU9ye0cHYSRtNeF1O
+8+v4yGynjHV2AQeUsyIcqh6DMV9h7QtyUv9SOY6b6rKoejIAfDZnnzjbS3F8VuQt
+wDTvVPWD/bvT0VkesL/RhZ7aO2PYh/dDca7fyUclDmpMqaQ+j9wsA5y7zfXGX2m/
+1M6haN0tNEaBoq3AJrfXgTMm4/YIB3b3ZcJJIgyMUmrULfSsp5sGhWOytGDhuPk9
+758Gfcw37PTQ3x3oNm7kihEPcllaogANkvn0O2fiWGg7ZqUdeMBV1bxjc6jPf3wB
+n4ZolbHmVskCHwroJjyqKM6RvJxoY/lvMMZ/JLdX4WCRVkm4b0dbtjBXQnDBtA+B
+OjvCwILFPBQwaDtorXZL
+=pPz1
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/dbus/dbus-1.8.10.ebuild b/sys-apps/dbus/dbus-1.8.10.ebuild
index a2d2a35985de..7da96ed76d84 100644
--- a/sys-apps/dbus/dbus-1.8.10.ebuild
+++ b/sys-apps/dbus/dbus-1.8.10.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/dbus-1.8.10.ebuild,v 1.5 2014/11/14 21:28:01 maekke Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/dbus-1.8.10.ebuild,v 1.6 2014/11/16 21:25:10 mgorny Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python2_7 )
@@ -131,6 +131,10 @@ multilib_src_configure() {
 			--disable-libaudit
 			--disable-systemd
 			--without-x
+
+			# expat is used for the daemon only
+			# fake the check for multilib library build
+			ac_cv_lib_expat_XML_ParserCreate_MM=yes
 		)
 	fi
 
@@ -138,8 +142,8 @@ multilib_src_configure() {
 	ECONF_SOURCE="${S}" econf "${myconf[@]}" "${docconf[@]}"
 
 	if multilib_is_native_abi && use test; then
-		mkdir "${TBD}"
-		cd "${TBD}"
+		mkdir "${TBD}" || die
+		cd "${TBD}" || die
 		einfo "Running configure in ${TBD}"
 		ECONF_SOURCE="${S}" econf "${myconf[@]}" \
 			$(use_enable test asserts) \
@@ -158,10 +162,9 @@ multilib_src_compile() {
 		einfo "Running make in ${BUILD_DIR}"
 		emake
 
-		if multilib_is_native_abi && use test; then
-			cd "${TBD}"
+		if use test; then
 			einfo "Running make in ${TBD}"
-			emake
+			emake -C "${TBD}"
 		fi
 	else
 		emake -C dbus libdbus-1.la
@@ -169,8 +172,7 @@ multilib_src_compile() {
 }
 
 src_test() {
-	cd "${TBD}"
-	DBUS_VERBOSE=1 Xemake -j1 check
+	DBUS_VERBOSE=1 Xemake -j1 -C "${TBD}" check
 }
 
 multilib_src_install() {