Fixing up the initscript with a revbump; Minor cosmetic changes

Package-Manager: portage-2.0.53_rc7

5 files changed, 162 insertions, 15 deletions

diff --git a/sys-apps/dbus/ChangeLog b/sys-apps/dbus/ChangeLog
index f070525a1570..6fc71f037c0f 100644
--- a/sys-apps/dbus/ChangeLog
+++ b/sys-apps/dbus/ChangeLog
@@ -1,6 +1,13 @@
 # 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.58 2005/11/07 09:57:18 flameeyes Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/ChangeLog,v 1.59 2005/11/08 04:46:00 compnerd Exp $
+
+*dbus-0.50-r1 (08 Nov 2005)
+
+  08 Nov 2005; Saleem Abdulrasool <compnerd@gentoo.org> files/dbus,
+  +dbus-0.50-r1.ebuild:
+  Changing the initscript (with revbump).  Minor cosmetic changes (changed to
+  doinit).
 
   07 Nov 2005; Diego Pettenò <flameeyes@gentoo.org> dbus-0.50.ebuild:
   Don't enable dnotify for every system, but just when using Linux kernel, as
diff --git a/sys-apps/dbus/Manifest b/sys-apps/dbus/Manifest
index 7787599f5939..2d7454f9713f 100644
--- a/sys-apps/dbus/Manifest
+++ b/sys-apps/dbus/Manifest
@@ -1,16 +1,14 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 b8216cdaf737979a9611739977be23ec ChangeLog 8451
+MD5 d4220fcb7942650538b1f1bce7ec38b0 ChangeLog 8661
 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 f127ffa8cdc75cbd0befadcb16d08401 dbus-0.36.2.ebuild 3620
+MD5 36c0119912a6585c12c8ef05b9687074 dbus-0.50-r1.ebuild 3749
 MD5 0a1ae7c5d57aceed3246ab0627f0c356 dbus-0.50.ebuild 3767
 MD5 d14e59575f04e55d21a04907b6fd9f3c files/30-dbus 243
-MD5 6e8a551caef6f55569fa4724d3cf1fe0 files/dbus 663
+MD5 41552c39bbbe0027bee798f296c1a3f4 files/dbus 946
 MD5 768e500cfda89809161576ea2080a7aa files/dbus-0.23-dbus_session_connect.patch 1185
 MD5 f3ab25d85c77b7f859d4d2cefc787aef files/dbus-0.23-fd_set.patch 293
 MD5 403b7724a698be1509916991e87224a4 files/dbus-0.23-pyexecdir.patch 1131
@@ -27,11 +25,5 @@ MD5 8a28a6744a8a85a487c87eec1e1725b6 files/digest-dbus-0.23.4 64
 MD5 8a28a6744a8a85a487c87eec1e1725b6 files/digest-dbus-0.23.4-r1 64
 MD5 19d40bbc05e7cf89bf6d023540874468 files/digest-dbus-0.36.2 64
 MD5 ac15aecd52ac9b55048015edba699800 files/digest-dbus-0.50 62
+MD5 ac15aecd52ac9b55048015edba699800 files/digest-dbus-0.50-r1 62
 MD5 41b60b877b1e6ea53476ff69c5ed77d3 metadata.xml 282
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2 (GNU/Linux)
-
-iD8DBQFDbyUgj5H05b2HAEkRApnPAJ9sTp9v69Oq6ox7RJmPnnmRqP9+EwCgjab+
-ZmPajw7fqj1OLRYnb/URHY4=
-=Qt06
------END PGP SIGNATURE-----
diff --git a/sys-apps/dbus/dbus-0.50-r1.ebuild b/sys-apps/dbus/dbus-0.50-r1.ebuild
new file mode 100644
index 000000000000..b7e63709ded5
--- /dev/null
+++ b/sys-apps/dbus/dbus-0.50-r1.ebuild
@@ -0,0 +1,143 @@
+# 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-r1.ebuild,v 1.1 2005/11/08 04:46:00 compnerd Exp $
+
+inherit eutils mono python multilib autotools debug
+
+IUSE="X gtk qt python mono doc 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="~amd64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+
+RDEPEND=">=dev-libs/glib-2.6
+	xml2? ( dev-libs/libxml2 )
+	!xml2? ( dev-libs/expat )
+	X? ( || (
+		(
+		x11-libs/libXt
+		x11-libs/libX11
+		)
+	virtual/x11 ) )
+	gtk? ( >=x11-libs/gtk+-2 )
+	python? ( >=dev-lang/python-2.4
+		>=dev-python/pyrex-0.9.3-r2 )
+	qt? ( =x11-libs/qt-3* )
+	mono? ( >=dev-lang/mono-0.95 )"
+
+
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	doc? ( app-doc/doxygen
+		app-text/xmlto )
+	doc? ( mono? ( >=dev-util/monodoc-0.16 ) )"
+
+# needs gcj, we have no neat way of knowing if it was enabled
+# Can we just depend on the java virtual and use javac?
+#	java? ( sys-devel/gcc )
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	#add missing include (#78617)
+	epatch ${FILESDIR}/${PN}-0.23-fd_set.patch
+	# Fix dnotify support
+	epatch ${FILESDIR}/${PN}-dnotify_configure-01.diff
+	epatch ${FILESDIR}/${PN}-dnotify_watchdirs-01.diff
+	eautoreconf
+}
+
+src_compile() {
+	local myconf
+
+	# Choose which xml library to use
+	if use xml2; then
+		myconf="--with-xml=libxml"
+	else
+		myconf="--with-xml=expat"
+	fi
+
+	# Only enable mono-docs if both mono and doc is defined
+	if use mono; then
+		myconf="${myconf} `use_enable doc mono-docs`"
+	else
+		myconf="${myconf} --disable-mono-docs"
+	fi
+
+	# NOTE: I have disabled the xml docs because they are rather pointless
+	econf \
+		`use_with X x` \
+		`use_enable gtk` \
+		`use_enable qt` \
+		`use_enable python` \
+		`use_enable mono` \
+		`use_enable kernel_linux dnotify` \
+		--enable-glib \
+		--enable-verbose-mode \
+		--enable-checks \
+		--enable-asserts \
+		--with-system-pid-file=/var/run/dbus.pid \
+		--with-system-socket=/var/run/dbus/system_bus_socket \
+		--with-session-socket-dir=/tmp \
+		--with-dbus-user=messagebus \
+		`use_enable doc doxygen-docs` \
+		--disable-xml-docs \
+		${myconf} \
+		|| die "econf failed"
+
+	# Don't build the mono examples, they require 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.4/
+	addpredict /usr/lib64/python2.3/
+	addpredict /usr/lib64/python2.2/
+	addpredict /usr/lib64/python2.1/
+
+	emake
+}
+
+src_install() {
+	make DESTDIR=${D} install || die "make install failed"
+
+	# Backwards compatibility for old stuff
+	# we can remove this when dbi (plural of dbus)
+	# <0.30 aren't in the tree
+	dosym /usr/bin/dbus-daemon /usr/bin/dbus-daemon-1
+
+	# initscript
+	doinitd ${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
+	if use doc; then
+		dohtml doc/*html
+	fi
+}
+
+pkg_preinst() {
+	enewgroup messagebus || die "Problem adding messagebus group"
+	enewuser messagebus -1 "-1" /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/dbus b/sys-apps/dbus/files/dbus
index 3d58004b8412..4894e4944244 100644
--- a/sys-apps/dbus/files/dbus
+++ b/sys-apps/dbus/files/dbus
@@ -1,7 +1,7 @@
 #!/sbin/runscript
 # Copyright 1999-2004 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/files/dbus,v 1.5 2005/03/11 21:21:09 azarah Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/files/dbus,v 1.6 2005/11/08 04:46:00 compnerd Exp $
 
 start() {
 
@@ -25,7 +25,11 @@ stop() {
 	eend ${retval}
 
 	# This should vanish when baselayout-1.12.0 is marked stable.
-	rm -f /var/run/dbus.pid
+	[[ -f /var/run/dbus.pid ]] && rm -f /var/run/dbus.pid
+
+   # Changes to the system dbus socket run file force us to take care of both
+   [[ -f /var/lib/dbus/system_bus_socket ]] && rm -rf /var/lib/dbus/system_bus_socket
+   [[ -f /var/run/dbus/system_bus_socket ]] && rm -rf /var/run/dbus/system_bus_socket
 
 	return ${retval}
 
diff --git a/sys-apps/dbus/files/digest-dbus-0.50-r1 b/sys-apps/dbus/files/digest-dbus-0.50-r1
new file mode 100644
index 000000000000..47b94667d61c
--- /dev/null
+++ b/sys-apps/dbus/files/digest-dbus-0.50-r1
@@ -0,0 +1 @@
+MD5 1addd5b600a8a4550766005d1f59401b dbus-0.50.tar.gz 1610305