dbus: New upstream release, fixes a crasher with syslogging. Also move

to using EAPI-2, side results are not dying after successfully
installing when using xorg-server-9999 (and eventually xorg-server 1.8.)
Should also fix bug #222551, so that the messagebus user/group get
created before src_install.
Package-Manager: portage-2.1.8.3/cvs/Linux i686

3 files changed, 26 insertions, 15 deletions

diff --git a/sys-apps/dbus/ChangeLog b/sys-apps/dbus/ChangeLog
index 6369c63c2061..3753bd58d408 100644
--- a/sys-apps/dbus/ChangeLog
+++ b/sys-apps/dbus/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for sys-apps/dbus
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/ChangeLog,v 1.245 2010/03/21 12:03:12 steev Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/ChangeLog,v 1.246 2010/03/25 17:21:59 steev Exp $
+
+*dbus-1.2.24 (25 Mar 2010)
+
+  25 Mar 2010; <steev@gentoo.org> -dbus-1.2.22.ebuild, +dbus-1.2.24.ebuild:
+  dbus: New upstream release, fixes a crasher with syslogging. Also move 
+  to using EAPI-2, side results are not dying after successfully 
+  installing when using xorg-server-9999 (and eventually xorg-server 1.8.) 
+  Should also fix bug #222551, so that the messagebus user/group get 
+  created before src_install.
 
 *dbus-1.2.22 (21 Mar 2010)
 
diff --git a/sys-apps/dbus/Manifest b/sys-apps/dbus/Manifest
index 47f40e412428..b0470c0cc7c2 100644
--- a/sys-apps/dbus/Manifest
+++ b/sys-apps/dbus/Manifest
@@ -5,13 +5,13 @@ AUX dbus-1.3.0-asneeded.patch 3655 RMD160 31d3eef602d1d95adfe548285e00c25699f5d0
 AUX dbus-1.3.0-no-cloexec.patch 578 RMD160 74403299da1ab2224738cd9770462cf5e1d037ee SHA1 5ff5856e4fc1a10bcdd841e2c0650e417badade6 SHA256 aba67f8431dd66619c0f6105b99fc887d0b0da90f86765ef56eb1919d822249e
 AUX dbus.init-1.0 1152 RMD160 f0f409b59167beef2e2b8c14f701fbeaa54c3bc9 SHA1 b00e23868046c67eaec87220e92ffcea5d9dd911 SHA256 a2e13a025faa488ff35521188c0d44909bc82c55e8676a24a5a5179545303d98
 DIST dbus-1.2.12.tar.gz 1574756 RMD160 779d76320f1343dae7447c82a683e372e6c11729 SHA1 13de8dc28c9edae7b9d2928ff691549bb2bef21a SHA256 b2ec81e7d9fa5e24f67baccfd9af2755a7797a65cb4c3cad10d023867f2bd220
-DIST dbus-1.2.22.tar.gz 1668680 RMD160 a6809db65339951f4c0dcc45a8a9f66602d48b43 SHA1 3ff6580b955d94c76e7bb2ecf046612cd2165302 SHA256 4cc258b4bc27f4af1233cf100e832c952fd4b7ce8ecb07d291d65ee137a38db7
+DIST dbus-1.2.24.tar.gz 1673774 RMD160 2f51def784056bc16fbec2ddc3be22c022a94fb5 SHA1 9593717348ea36ba228b46f165bb67c127c12be8 SHA256 f12c748f4a703655e3d4c3db94cdf5a752a0cd0b36958c715804373bd3595c48
 DIST dbus-1.2.3.tar.gz 1564475 RMD160 d1a207b2a4c744f27c9c01388e80cebdb61f43f0 SHA1 ceb8d496bc1a9c2dcdbe559515c01ec9c0cdcf81 SHA256 16ffaa4a8758f115cf02c78962b0849ed4d802872420fd460c433a9cd580ed1a
 DIST dbus-1.3.0.tar.gz 1517408 RMD160 ed823727c11a437e9a0d548b9c3d92a8fd4d386b SHA1 ebd23c65ebf5448efc6367da1414de212db38055 SHA256 fe32b49667894cf91b0a97503163be5c4814ecf67259e8feb26d1ba57cb03dae
 EBUILD dbus-1.2.12.ebuild 3858 RMD160 e690a95d18c1b003f0555cd2ef59ae98aad7b16d SHA1 3aa70b1e08b7ac672fcf407755b4ab45e988f9d7 SHA256 507833339197a3b9fef81ef513be658f616a3d38e5a9b924cc24e332daa0121e
-EBUILD dbus-1.2.22.ebuild 3855 RMD160 9ece257cf9b82083514cca7b669a5957aa9c118e SHA1 f0194c376aee7ff48573fd4fbd2f6bc5a6ad5742 SHA256 bb834c2f7e571e7a757583af18e0fab942a2feb116fda56873f1a5aa5baace15
+EBUILD dbus-1.2.24.ebuild 3876 RMD160 5f1a7cf20e6a524e75c309a5d98529e738e36357 SHA1 5aa0e7dd3cb997fb42c46c83b86555cd4cff7955 SHA256 30462262c272f5513ae8577a44637f7b70c77b3352af9b2e216d948b9d682550
 EBUILD dbus-1.2.3-r1.ebuild 3752 RMD160 dc66d0b29adcde506e40b3240f4e19144f3ed159 SHA1 fc9c2db2f73605fbcc2807ee0bd886e86f8bb93d SHA256 09c62bdce60af40e79f88f6bc7110867f6f6d051b08aa5ed585a10570beeb2fc
 EBUILD dbus-1.3.0-r1.ebuild 4829 RMD160 8962f2e34bfcd96f3ce004b1990df1fc0143ef76 SHA1 173474aa263caa03ddb8aa6cc791faa7dfd67a96 SHA256 3022f1452397cda6a917fb04dd2a9146e7054beb9e6e67ebc125b6a951d32c0f
 EBUILD dbus-1.3.0.ebuild 4068 RMD160 89a06c41e86334f57a2256a0667e7f24083c2561 SHA1 b0a9eb87b19d9998f1732880e8e2626ad0d57f5b SHA256 38a01cdf9aa19e527e9cfc0917f60b38d2a3b6615e16c25b5d15755cc4b99e94
-MISC ChangeLog 37476 RMD160 b2c9fa24beca17f10053f51f1f2fa77e9fe5035f SHA1 bd2de2d5751737815729eeb2871520defb6f85f5 SHA256 8b8e0645eaab73d298067956114c61edfa509afc1add06df8a274ce21c79c45b
+MISC ChangeLog 37897 RMD160 d2df80800cedd0f2ca7ebf8794d774c6df150636 SHA1 aa075ab63da83622a62176cd66fb0548c0329380 SHA256 1d54e0cec70f9996e56838db3d729c2e25173bd67db65a7093a842fd3f86cf3e
 MISC metadata.xml 285 RMD160 a557848c4782030e9eeb3dc1f06d98840ad7f73a SHA1 e0ba318a0e1a819cc360ea98cc3477dcf52a1526 SHA256 f0df8a3ebe8d22c87645cf66ed8c50c4e64ded6ad1e279e9912cb5074feb5a82
diff --git a/sys-apps/dbus/dbus-1.2.22.ebuild b/sys-apps/dbus/dbus-1.2.24.ebuild
index c76d9208751e..9923dfa14cf9 100644
--- a/sys-apps/dbus/dbus-1.2.22.ebuild
+++ b/sys-apps/dbus/dbus-1.2.24.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2010 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/dbus-1.2.22.ebuild,v 1.1 2010/03/21 12:03:12 steev Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/dbus-1.2.24.ebuild,v 1.1 2010/03/25 17:21:59 steev Exp $
+
+EAPI=2
 
 inherit eutils multilib flag-o-matic
 
@@ -23,16 +25,18 @@ DEPEND="${RDEPEND}
 	doc? (	app-doc/doxygen
 		app-text/xmlto )"
 
-src_unpack() {
-	unpack ${A}
-	cd "${S}"
-
-	# Tests were restricted because of this
-	sed -e 's/.*bus_dispatch_test.*/printf ("Disabled due to excess noise\\n");/' \
+src_prepare() {
+		enewgroup messagebus
+	    enewuser messagebus -1 "-1" -1 messagebus
+		unpack ${A}
+		cd "${S}"
+		# Tests were restricted because of this
+	    sed -e 's/.*bus_dispatch_test.*/printf ("Disabled due to excess noise\\n");/' \
 		-e '/"dispatch"/d' -i "${S}/bus/test-main.c"
+
 }
 
-src_compile() {
+src_configure() {
 	# so we can get backtraces from apps
 	append-flags -rdynamic
 
@@ -61,8 +65,6 @@ src_compile() {
 	# after the compile, it uses a selinuxfs interface to
 	# check if the SELinux policy has the right support
 	use selinux && addwrite /selinux/access
-
-	emake || die "make failed"
 }
 
 src_test() {
@@ -119,7 +121,7 @@ pkg_postinst() {
 	ewarn "You must restart D-Bus \`/etc/init.d/dbus restart\` to run"
 	ewarn "the new version of the daemon."
 
-	if has_version x11-base/xorg-server && built_with_use x11-base/xorg-server hal; then
+	if has_version x11-base/xorg-server[hal]; then
 		elog
 		ewarn "You are currently running X with the hal useflag enabled"
 		ewarn "restarting the dbus service WILL restart X as well"