Fix socket location

(Portage version: 2.0.51.22-r1)

4 files changed, 156 insertions, 2 deletions

diff --git a/sys-apps/dbus/ChangeLog b/sys-apps/dbus/ChangeLog
index 42e07501529b..e6b30a97a78c 100644
--- a/sys-apps/dbus/ChangeLog
+++ b/sys-apps/dbus/ChangeLog
@@ -1,6 +1,11 @@
 # 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.43 2005/07/07 05:03:49 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/ChangeLog,v 1.44 2005/07/13 22:38:06 foser Exp $
+
+*dbus-0.23.4-r1 (14 Jul 2005)
+
+  14 Jul 2005; Marinus Schraal <foser@gentoo.org> dbus-0.23.4-r1.ebuild :
+  Fix location of system socket (#96451)
 
   07 Jul 2005; Caleb Tennis <caleb@gentoo.org> dbus-0.23-r3.ebuild,
   dbus-0.23.2.ebuild, dbus-0.23.2-r1.ebuild:
diff --git a/sys-apps/dbus/Manifest b/sys-apps/dbus/Manifest
index c2556ee1f7d3..45228a997b30 100644
--- a/sys-apps/dbus/Manifest
+++ b/sys-apps/dbus/Manifest
@@ -1,5 +1,6 @@
+MD5 bb8292b02298d653808cb0d0edd271da dbus-0.23.4-r1.ebuild 3413
 MD5 321657dd580453465e0cab3102a92e98 dbus-0.23.2.ebuild 3242
-MD5 bb8292b02298d653808cb0d0edd271da dbus-0.23.4.ebuild 3413
+MD5 72ddada6435a62e18ed82fc3e132921e dbus-0.23.4.ebuild 3414
 MD5 e6345c032f35bc163f1ca3e91a6575ca dbus-0.23-r3.ebuild 3240
 MD5 fedfd2a1281d8773038a8036a2a75ef8 dbus-0.23.2-r1.ebuild 3454
 MD5 948a5be675d8aac7535971e6755cf87b ChangeLog 6077
@@ -16,4 +17,5 @@ MD5 b683f990bc7207366b4dac487a8d1416 files/digest-dbus-0.23-r3 62
 MD5 038de28fe446b2303c072e96df531500 files/dbus-0.23.2-version_fix.patch 496
 MD5 c66dfd4b07508de75f541b24035b74af files/dbus-0.23.2-python_api.patch 571
 MD5 dd13fcb75ab8edf4c308de6a66f2b3e3 files/digest-dbus-0.23.2-r1 64
+MD5 8a28a6744a8a85a487c87eec1e1725b6 files/digest-dbus-0.23.4-r1 64
 MD5 f3ab25d85c77b7f859d4d2cefc787aef files/dbus-0.23-fd_set.patch 293
diff --git a/sys-apps/dbus/dbus-0.23.4-r1.ebuild b/sys-apps/dbus/dbus-0.23.4-r1.ebuild
new file mode 100644
index 000000000000..0f57f5458ed5
--- /dev/null
+++ b/sys-apps/dbus/dbus-0.23.4-r1.ebuild
@@ -0,0 +1,146 @@
+# 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.23.4-r1.ebuild,v 1.1 2005/07/13 22:38:06 foser Exp $
+
+# because of the experimental nature debug by default
+inherit debug eutils mono python multilib
+
+# FIXME : fix docs
+#IUSE="X gtk qt python mono doc xml2"
+IUSE="X gtk qt python mono xml2"
+
+DESCRIPTION="A message bus system, a simple way for applications to talk to eachother"
+HOMEPAGE="http://dbus.freedesktop.org/"
+SRC_URI="http://dbus.freedesktop.org/releases/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="|| ( GPL-2 AFL-2.1 )"
+KEYWORDS="~x86 ~ppc ~amd64 ~ppc64 ~ia64 ~sparc"
+
+RDEPEND=">=dev-libs/glib-2
+	xml2? ( >=dev-libs/libxml2-2.6 )
+	!xml2? ( dev-libs/expat )
+	X? ( virtual/x11 )
+	gtk? ( >=x11-libs/gtk+-2 )
+	python? ( >=dev-lang/python-2.2
+		>=dev-python/pyrex-0.9 )
+	qt? ( =x11-libs/qt-3* )
+	!ppc64? (
+		mono? ( >=dev-lang/mono-0.95 )
+	)"
+
+
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+#	doc? ( app-doc/doxygen
+#		app-text/xmlto )"
+
+# needs gcj, we have no neat way of knowing if it was enabled
+#	java? ( sys-devel/gcc )
+
+src_unpack() {
+
+	unpack ${A}
+	cd ${S}
+
+	epatch ${FILESDIR}/${PN}-0.23-qt.patch
+	# add missing include (#78617)
+	epatch ${FILESDIR}/${PN}-0.23-fd_set.patch
+	# workaround mono lib versioning (#81794)
+	epatch ${FILESDIR}/${PN}-0.23.2-version_fix.patch
+
+	# It stupidly tries to install python stuff to platform-independent
+	# libdir
+	epatch ${FILESDIR}/dbus-0.23-pyexecdir.patch
+
+	# Don't rerun auto*
+	sleep 1
+	touch ${S}/python/Makefile.in
+	sleep 1
+	touch ${S}/configure
+
+}
+
+src_compile() {
+
+	local myconf
+
+	if use xml2; then
+		myconf="--with-xml=libxml";
+	else
+		myconf="--with-xml=expat";
+	fi
+
+	econf \
+		--localstatedir=/var \
+		`use_with X x` \
+		`use_enable gtk` \
+		`use_enable qt` \
+		`use_enable python` \
+		`use_enable mono` \
+		--enable-glib \
+		--enable-verbose-mode \
+		--enable-checks \
+		--enable-asserts \
+		--with-system-socket=/var/run/dbus/system_bus_socket \
+		--with-system-pid-file=/var/run/dbus.pid \
+		--with-session-socket-dir=/tmp \
+		--disable-doxygen-docs \
+		--disable-xml-docs \
+		--disable-mono-docs \
+		${myconf} \
+		|| die
+
+#		`use_enable doc doxygen-docs` \
+#		`use_enable doc xml-docs` \
+
+	# do not build the mono examples, they need gtk-sharp
+	touch ${S}/mono/example/{bus-listener,echo-{server,client}}.exe
+
+	# this gets around a lib64 sandbox bug. note that this addpredict is
+	# added automatically by sandbox.c for lib.
+	addpredict /usr/lib64/python2.3/
+	addpredict /usr/lib64/python2.2/
+	addpredict /usr/lib64/python2.1/
+
+	emake || die
+
+}
+
+src_install() {
+
+	make DESTDIR=${D} install || die
+
+	# initscript
+	exeinto /etc/init.d/
+	doexe ${FILESDIR}/dbus
+
+	# dbus X session script (#77504)
+	# FIXME : turns out to only work for GDM, better solution needed
+	exeinto /etc/X11/xinit/xinitrc.d/
+	doexe ${FILESDIR}/30-dbus
+
+	# needs to exist for the system socket
+	keepdir /var/run/dbus
+
+	keepdir /usr/lib/dbus-1.0/services
+	keepdir /usr/share/dbus-1/services
+
+	dodoc AUTHORS ChangeLog HACKING NEWS README doc/TODO doc/*html
+
+}
+
+pkg_preinst() {
+
+	enewgroup messagebus || die "Problem adding messagebus group"
+	enewuser messagebus -1 /bin/false /dev/null messagebus || die "Problem adding messagebus user"
+
+}
+
+pkg_postinst() {
+
+	einfo "To start the DBUS system-wide messagebus by default"
+	einfo "you should add it to the default runlevel :"
+	einfo "\`rc-update add dbus default\`"
+
+}
diff --git a/sys-apps/dbus/files/digest-dbus-0.23.4-r1 b/sys-apps/dbus/files/digest-dbus-0.23.4-r1
new file mode 100644
index 000000000000..1ec572380e0b
--- /dev/null
+++ b/sys-apps/dbus/files/digest-dbus-0.23.4-r1
@@ -0,0 +1 @@
+MD5 ecd20f2398ed46b2c96d7e30b1f914d4 dbus-0.23.4.tar.gz 1288374