From: Stephen Klimaszewski <steev@gentoo.org>
Date: Mon, 7 Nov 2005 04:42:56 +0000 (+0000)
Subject: Change the system socket back to /var/run/dbus/
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=a024476a8bdc564eb7526ccb4ad90f068c0097e2;p=gentoo.git

Change the system socket back to /var/run/dbus/
Package-Manager: portage-2.0.53_rc7
---

diff --git a/sys-apps/dbus/ChangeLog b/sys-apps/dbus/ChangeLog
index b07f63df859e..eeaeb2647c1e 100644
--- a/sys-apps/dbus/ChangeLog
+++ b/sys-apps/dbus/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-apps/dbus
 # Copyright 2000-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/ChangeLog,v 1.56 2005/11/07 02:56:35 steev Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/ChangeLog,v 1.57 2005/11/07 04:42:56 steev Exp $
+
+  07 Nov 2005; Steev Klimaszewski <steev@gentoo.org> dbus-0.36.2.ebuild,
+  dbus-0.50.ebuild:
+  Change the path for the system socket back into /var/run/dbus/
+  This fixeds Bug #96451.  Thanks to joem for pointing it out, as 
+  well as kwant <qbit.interia.pl> for filing the bug.
 
 *dbus-0.50 (07 Nov 2005)
 
diff --git a/sys-apps/dbus/Manifest b/sys-apps/dbus/Manifest
index 5bdb4e43f216..3e69423225c4 100644
--- a/sys-apps/dbus/Manifest
+++ b/sys-apps/dbus/Manifest
@@ -1,11 +1,11 @@
-MD5 307f1993df7e4c3294d50b82f957179d ChangeLog 7993
+MD5 d142ab1be47b7ee2a45f27ba072a4279 ChangeLog 8273
 MD5 fab22de6cb9a5cf7e0abedfe77c9b04a dbus-0.23-r3.ebuild 3246
 MD5 fedfd2a1281d8773038a8036a2a75ef8 dbus-0.23.2-r1.ebuild 3454
 MD5 321657dd580453465e0cab3102a92e98 dbus-0.23.2.ebuild 3242
 MD5 fc8c0f943b0a6462694f8f3874a2db6c dbus-0.23.4-r1.ebuild 3448
 MD5 bb8292b02298d653808cb0d0edd271da dbus-0.23.4.ebuild 3413
-MD5 93866034c91aa263619d32d914c2679f dbus-0.36.2.ebuild 3620
-MD5 d8170bc0be33614502788e5be41d632f dbus-0.50.ebuild 3746
+MD5 f127ffa8cdc75cbd0befadcb16d08401 dbus-0.36.2.ebuild 3620
+MD5 196da1f13b185960d92e0b54d0271394 dbus-0.50.ebuild 3746
 MD5 d14e59575f04e55d21a04907b6fd9f3c files/30-dbus 243
 MD5 6e8a551caef6f55569fa4724d3cf1fe0 files/dbus 663
 MD5 768e500cfda89809161576ea2080a7aa files/dbus-0.23-dbus_session_connect.patch 1185
diff --git a/sys-apps/dbus/dbus-0.36.2.ebuild b/sys-apps/dbus/dbus-0.36.2.ebuild
index 49a024b231f6..4075434cb381 100644
--- a/sys-apps/dbus/dbus-0.36.2.ebuild
+++ b/sys-apps/dbus/dbus-0.36.2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/dbus-0.36.2.ebuild,v 1.4 2005/11/05 15:06:08 geoman Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/dbus-0.36.2.ebuild,v 1.5 2005/11/07 04:42:56 steev Exp $
 
 inherit eutils mono python multilib debug
 
@@ -78,7 +78,7 @@ src_compile() {
 		--enable-checks \
 		--enable-asserts \
 		--with-system-pid-file=/var/run/dbus.pid \
-		--with-system-socket=/var/lib/dbus/system_bus_socket \
+		--with-system-socket=/var/dbus/dbus/system_bus_socket \
 		--with-session-socket-dir=/tmp \
 		--with-dbus-user=messagebus \
 		`use_enable doc doxygen-docs` \
@@ -117,7 +117,7 @@ src_install() {
 	doexe ${FILESDIR}/30-dbus
 
 	# needs to exist for the system socket
-	keepdir /var/lib/dbus
+	keepdir /var/run/dbus
 
 	keepdir /usr/lib/dbus-1.0/services
 	keepdir /usr/share/dbus-1/services
diff --git a/sys-apps/dbus/dbus-0.50.ebuild b/sys-apps/dbus/dbus-0.50.ebuild
index 49bc8d0f8d97..52fc28a4ba46 100644
--- a/sys-apps/dbus/dbus-0.50.ebuild
+++ b/sys-apps/dbus/dbus-0.50.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/dbus-0.50.ebuild,v 1.1 2005/11/07 02:56:35 steev Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/dbus-0.50.ebuild,v 1.2 2005/11/07 04:42:56 steev Exp $
 
 inherit eutils mono python multilib autotools debug
 
@@ -82,7 +82,7 @@ src_compile() {
 		--enable-checks \
 		--enable-asserts \
 		--with-system-pid-file=/var/run/dbus.pid \
-		--with-system-socket=/var/lib/dbus/system_bus_socket \
+		--with-system-socket=/var/run/dbus/system_bus_socket \
 		--with-session-socket-dir=/tmp \
 		--with-dbus-user=messagebus \
 		`use_enable doc doxygen-docs` \
@@ -121,7 +121,7 @@ src_install() {
 	doexe ${FILESDIR}/30-dbus
 
 	# needs to exist for the system socket
-	keepdir /var/lib/dbus
+	keepdir /var/run/dbus
 
 	keepdir /usr/lib/dbus-1.0/services
 	keepdir /usr/share/dbus-1/services