rev bump. dropped gcj support since the bindings are unmaintained and broken and were problematic. Fixed monodoc depends to only require monodoc rather then mono-tools as well.

(Portage version: 2.1_pre6-r2)

5 files changed, 261 insertions, 14 deletions

diff --git a/sys-apps/dbus/ChangeLog b/sys-apps/dbus/ChangeLog
index 828541cdaec8..941b4a8945ef 100644
--- a/sys-apps/dbus/ChangeLog
+++ b/sys-apps/dbus/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for sys-apps/dbus
 # Copyright 2000-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/ChangeLog,v 1.103 2006/03/10 00:32:44 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/ChangeLog,v 1.104 2006/03/14 06:41:06 cardoe Exp $
+
+*dbus-0.61 (14 Mar 2006)
+
+  14 Mar 2006; Doug Goldstein <cardoe@gentoo.org>
+  +files/dbus-0.61-mono-tools-update.diff, +dbus-0.61.ebuild:
+  rev bump. dropped gcj support since the bindings are unmaintained and broken
+  and were problematic. Fixed monodoc depends to only require monodoc rather
+  then mono-tools as well.
 
   10 Mar 2006; Michael Hanselmann <hansmi@gentoo.org> dbus-0.60-r4.ebuild:
   Stable on ppc.
diff --git a/sys-apps/dbus/Manifest b/sys-apps/dbus/Manifest
index 45209ed2d07a..0b5833a5da8e 100644
--- a/sys-apps/dbus/Manifest
+++ b/sys-apps/dbus/Manifest
@@ -1,9 +1,6 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
-MD5 73ec1c340ac49838653e10eb09fffdcf ChangeLog 14687
-RMD160 4214279f89263804ea89f3899a2435166d2e750c ChangeLog 14687
-SHA256 0f9368bf0457625c89d26cd54ca659c948876c134e9935a3697b043a898dd3be ChangeLog 14687
+MD5 f04360d9e7b1778f5c5a56966c542380 ChangeLog 15009
+RMD160 683471aaee9168bda4638b0efc358bce31c8b1cd ChangeLog 15009
+SHA256 ab7788a7655c7f9a73b4614f1c55baaca5cdd9180e11478fbee64580dd25deec ChangeLog 15009
 MD5 80bd8d05a4478ae3d83d952d19e928ac dbus-0.23.4-r1.ebuild 3647
 RMD160 ca03ac02fddf891a097814dac744774d2aaa3267 dbus-0.23.4-r1.ebuild 3647
 SHA256 d08b90313aab10d5a71e7e0858e3548983cb2dfc4bd7317dfb99a57c2a0faad0 dbus-0.23.4-r1.ebuild 3647
@@ -19,6 +16,9 @@ SHA256 7cb5970a6e0cd9f63b737fa544618e48a451d0664b4d1d6568e8a4f84f9e4925 dbus-0.6
 MD5 c002c05d2aaf3510f3f13c68b500ea26 dbus-0.60-r4.ebuild 4625
 RMD160 3add3d3700d3f42b90d89053181451f38b80d1a1 dbus-0.60-r4.ebuild 4625
 SHA256 4b9ab333b66e1cfdcb15dc20f6df9e72528942d7b83c1551a40cf23003ac2d4e dbus-0.60-r4.ebuild 4625
+MD5 43a9469380b052141ffcc4fabf8556ee dbus-0.61.ebuild 3685
+RMD160 12ded1ae91d60b03cd8e23b0d97371bb8c0019df dbus-0.61.ebuild 3685
+SHA256 a0d7fe793e87e08aa7837d5bda1c51e83cc02b0ab4f37e42478fffaf940dbc64 dbus-0.61.ebuild 3685
 MD5 d14e59575f04e55d21a04907b6fd9f3c files/30-dbus 243
 RMD160 b5e7a813cd5d91f2ea60bb22260e432cbfb72fd9 files/30-dbus 243
 SHA256 a8e8fec9769cc5d46df8216f7d1e1f9df422c4e46f293fd70d4b017fb01d959d files/30-dbus 243
@@ -64,6 +64,9 @@ SHA256 2493ebd9ea7b91eebb2d828efda70c08b087c3801e87eb077acb7cd0b2764766 files/db
 MD5 f1d9631e7b682986d77feccb080e46a4 files/dbus-0.60-qt.patch 453
 RMD160 d38dc02aefb3518900ff7140a47895c2a381e492 files/dbus-0.60-qt.patch 453
 SHA256 bdf3bbcba84a3c21e35785fbdf907ac501ec3bc3fe23e2d8ae94181dddff007a files/dbus-0.60-qt.patch 453
+MD5 95307718b51a47245f0aebcee2dc0467 files/dbus-0.61-mono-tools-update.diff 3628
+RMD160 b879be64e95be1d80bb97d9bc79bcdca9f42a06f files/dbus-0.61-mono-tools-update.diff 3628
+SHA256 47dcfafeff7ce3026797a0ff40cc32f1ca6453aa679c6d9548b0383c7ca18404 files/dbus-0.61-mono-tools-update.diff 3628
 MD5 4fd89997ba6101161202f761bb666167 files/dbus-dnotify_configure-01.diff 2197
 RMD160 7059f7b8bbad594567e364555bac550ecc203da4 files/dbus-dnotify_configure-01.diff 2197
 SHA256 e94b5c4a45791fc90a97f07bcbc1c16a50a633a0633e34bf9180533792564645 files/dbus-dnotify_configure-01.diff 2197
@@ -88,13 +91,9 @@ SHA256 36a3bbab5e321662fa0ad82c00e537aef0bc4f542c97547a5059f0fe1b5098b3 files/di
 MD5 d1d5323f6bb155eef5cf44b19078aa07 files/digest-dbus-0.60-r4 62
 RMD160 58388295ab4a0c797bc61c1261c6e0905ed7150e files/digest-dbus-0.60-r4 62
 SHA256 cfd4429324733e509efaea4fe88a934ab9bbcb927b6959f4373d14b2177fb15b files/digest-dbus-0.60-r4 62
+MD5 c58edabe96394082b354c8b061117b00 files/digest-dbus-0.61 232
+RMD160 857dde87b1e43ba473ece4ce9945c43eb8dcae25 files/digest-dbus-0.61 232
+SHA256 8ee10bf68b294a8eef518926360a7b538fa9dda198e47b1d9f6367b6de0cdbcd files/digest-dbus-0.61 232
 MD5 d854e952b3179d33b2ece377ce9980f3 metadata.xml 222
 RMD160 cd880923dd3bbe29d863c21fdcc56700006a2bcc metadata.xml 222
 SHA256 3b1bdb4611693b7a059584a994f3760dce2f37a048d4c2c55c1756e17519e1cf metadata.xml 222
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.2.2 (GNU/Linux)
-
-iD8DBQFEFjoX2+ySkm8kpY0RAg/SAJ49ia3JsEMy1hsTv2l3Ttubb2Gw3gCgqDhv
-04c4Mlr14FtTsPn/1wPp23A=
-=585Q
------END PGP SIGNATURE-----
diff --git a/sys-apps/dbus/dbus-0.61.ebuild b/sys-apps/dbus/dbus-0.61.ebuild
new file mode 100644
index 000000000000..ad41f2f4aab9
--- /dev/null
+++ b/sys-apps/dbus/dbus-0.61.ebuild
@@ -0,0 +1,134 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/dbus-0.61.ebuild,v 1.1 2006/03/14 06:41:06 cardoe Exp $
+
+inherit eutils mono python multilib debug qt3 autotools
+
+DESCRIPTION="A message bus system, a simple way for applications to talk to each other"
+HOMEPAGE="http://dbus.freedesktop.org/"
+SRC_URI="http://dbus.freedesktop.org/releases/${P}.tar.gz"
+
+SLOT="0"
+LICENSE="|| ( GPL-2 AFL-2.1 )"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sh ~sparc ~x86"
+IUSE="doc gtk mono python qt selinux X"
+
+RDEPEND=">=dev-libs/glib-2.6
+	X? ( || ( ( x11-libs/libXt x11-libs/libX11 ) virtual/x11 ) )
+	gtk? ( >=x11-libs/gtk+-2.6 )
+	mono? ( >=dev-lang/mono-0.95 )
+	python? ( >=dev-lang/python-2.4 >=dev-python/pyrex-0.9.3-r2 )
+	qt? ( $(qt_min_version 3.3) )
+	selinux? ( sys-libs/libselinux )
+	>=dev-libs/libxml2-2.6.21"
+	# expat code now sucks.. libxml2 is the default
+
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig
+	doc? (	app-doc/doxygen
+		app-text/xmlto
+		mono? ( >=dev-util/monodoc-1.1.10 ) )"
+
+pkg_setup() {
+	PKG_CONFIG_PATH="${QTDIR}/lib/pkgconfig"
+}
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	# Fix .pc file for QT
+	epatch "${FILESDIR}"/${PN}-0.60-qt-pc.patch
+
+	# Fix GLIB Declaration for ANSI C
+	epatch ${FILESDIR}/${PN}-0.60-decls-ansi-c.patch
+
+	#fix mono-tools depend
+	epatch ${FILESDIR}/${PN}-0.61-mono-tools-update.diff
+
+	eautoreconf
+}
+
+src_compile() {
+	local myconf=""
+
+	# Only enable mono-docs if both mono and doc is defined
+	use mono && myconf="${myconf} $(use_enable doc mono-docs)"
+
+	if use qt; then
+		myconf="${myconf} --enable-qt3=${QTDIR} QT_MOC=/usr/bin/moc --with-qt3-moc=${QTDIR}/bin/moc"
+	else
+		myconf="${myconf} --disable-qt --disable-qt3"
+	fi
+
+	econf \
+		$(use_with X x) \
+		$(use_enable gtk) \
+		$(use_enable python) \
+		$(use_enable mono) \
+		$(use_enable kernel_linux dnotify) \
+		--disable-gcj \
+		$(use_enable selinux) \
+		$(use_enable debug verbose-mode) \
+		$(use_enable debug checks) \
+		$(use_enable debug asserts) \
+		--enable-glib \
+		--with-xml=libxml \
+		--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
+
+	# 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_install() {
+	make DESTDIR="${D}" install || die "make install failed"
+
+	# initscript
+	newinitd "${FILESDIR}"/dbus.init-0.60 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" -1 messagebus || die "Problem adding messagebus user"
+}
+
+pkg_postrm() {
+	python_mod_cleanup "${ROOT}"/usr/lib/python*/site-packages/dbus
+}
+
+pkg_postinst() {
+	python_mod_optimize "${ROOT}"/usr/lib/python*/site-packages/dbus
+
+	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-0.61-mono-tools-update.diff b/sys-apps/dbus/files/dbus-0.61-mono-tools-update.diff
new file mode 100644
index 000000000000..63bfdcebe2f9
--- /dev/null
+++ b/sys-apps/dbus/files/dbus-0.61-mono-tools-update.diff
@@ -0,0 +1,103 @@
+--- configure.in	2006-03-14 00:56:19.000000000 -0500
++++ configure.in.new	2006-03-14 01:02:24.000000000 -0500
+@@ -290,7 +290,7 @@
+ AM_CONDITIONAL(DBUS_USE_CSC, test x$enable_mono = xyes)
+ 
+ #### Look for monodoc
+-MONODOC_REQUIRED_VERSION=0.16
++MONODOC_REQUIRED_VERSION=1.1.10
+ AC_SUBST(MONODOC_REQUIRED_VERSION)
+ PKG_CHECK_MODULES(MONODOC_DEPENDENCY, monodoc >= $MONODOC_REQUIRED_VERSION, have_monodoc=yes, have_monodoc=no)
+ 
+@@ -298,8 +298,9 @@
+     if test x$have_monodoc = xno ; then
+ 	AC_MSG_ERROR([Building Mono docs explicitly required, but monodoc not found])
+     else
+-        AC_PATH_PROG(MONODOC, monodoc, no)
+-        if test x$MONODOC = xno; then
++        AC_PATH_PROG(MONODOCER, monodocer, no)
++	AC_PATH_PROG(MDASSEMBLER, mdassembler, no)
++        if test x$MONODOCER = xno -o x$MDASSEMBLER = xno; then
+            AC_MSG_ERROR([Building Mono docs explicitly required, but monodoc not found])	
+ 	fi
+     fi
+@@ -308,19 +309,26 @@
+ if test x$enable_mono_docs = xauto ; then
+     if test x$have_monodoc = xno ; then
+         enable_mono_docs=no
+-	MONODOC=
++	MONODOCER=
++	MDASSEMBLER=
+     else
+-        AC_PATH_PROG(MONODOC, monodoc, no)
+-        if test x$MONODOC = xno; then
++        AC_PATH_PROG(MONODOCER, monodocer, no)
++	AC_PATH_PROG(MDASSEMBLER, mdassembler, no)
++        if test x$MONODOCER = xno -o x$MDASSEMBLER = xno; then
+            enable_mono_docs=no
+-           MONODOC=
++           MONODOCER=
++	   MDASSEMBLER=
+ 	else
+ 	   enable_mono_docs=yes
+         fi
+     fi
+ fi
+ 
+-AC_SUBST(MONODOC)
++MONODOC_SOURCESDIR=`pkg-config --variable=sourcesdir monodoc`
++
++AC_SUBST(MONODOCER)
++AC_SUBST(MDASSEMBLER)
++AC_SUBST(MONODOC_SOURCESDIR)
+ 
+ AM_CONDITIONAL(ENABLE_MONODOC, test "x$enable_mono_docs" = "xyes")
+ 
+--- mono/doc/Makefile.am	2006-02-10 16:47:10.000000000 -0500
++++ mono/doc/Makefile.am.new	2006-03-14 01:08:13.000000000 -0500
+@@ -1,34 +1,30 @@
+ if ENABLE_MONODOC
+ TARGETS = dbus-sharp-docs.zip dbus-sharp-docs.tree dbus-sharp-docs.source
+-DOCDIR = `$(MONODOC) --get-sourcesdir`
+ 
+ install-data-local:
+-	install -d -m 755 $(DESTDIR)/`monodoc --get-sourcesdir`
+-	install -m 644 $(srcdir)/dbus-sharp-docs.source $(DESTDIR)/`monodoc --get-sourcesdir`
+-	install -m 644 dbus-sharp-docs.tree $(DESTDIR)/`monodoc --get-sourcesdir`
+-	install -m 644 dbus-sharp-docs.zip $(DESTDIR)/`monodoc --get-sourcesdir`
++	install -d -m 755 $(DESTDIR)/$(MONODOC_SOURCESDIR)
++	install -m 644 $(srcdir)/dbus-sharp-docs.source $(DESTDIR)/$(MONODOC_SOURCESDIR)
++	install -m 644 dbus-sharp-docs.tree $(DESTDIR)/$(MONODOC_SOURCESDIR)
++	install -m 644 dbus-sharp-docs.zip $(DESTDIR)/$(MONODOC_SOURCESDIR)
+ 
+ uninstall-local:
+-	rm -f $(DESTDIR)/`monodoc --get-sourcesdir`/dbus-sharp-docs.source
+-	rm -f $(DESTDIR)/`monodoc --get-sourcesdir`/dbus-sharp-docs.tree
+-	rm -f $(DESTDIR)/`monodoc --get-sourcesdir`/dbus-sharp-docs.zip
++	rm -f $(DESTDIR)/$(MONODOC_SOURCESDIR)/dbus-sharp-docs.source
++	rm -f $(DESTDIR)/$(MONODOC_SOURCESDIR)/dbus-sharp-docs.tree
++	rm -f $(DESTDIR)/$(MONODOC_SOURCESDIR)/dbus-sharp-docs.zip
+ else
+ TARGETS = 
+-DOCDIR = $(datadir)
+ endif
+ 
+ noinst_DATA = $(TARGETS)
+ 
+-ASSEMBLER = $(MONODOC) --assemble
+-UPDATER = $(MONODOC) --update
+-
+ dbus-sharp-docs.zip: dbus-sharp-docs.tree
+ 
+ dbus-sharp-docs.tree: $(srcdir)/en/*/*.xml $(srcdir)/en/*.xml
+-	$(ASSEMBLER) --ecma $(srcdir)/en -o dbus-sharp-docs
++	$(MDASSEMBLER) --ecma $(srcdir)/en -o dbus-sharp-docs
+ 
+-update:
+-		$(UPDATER) ../dbus-sharp.dll -o ./en -f
++update: $(top_builddir)/mono/dbus-sharp.dll
++	$(MONODOCER) -assembly:$(top_builddir)/mono/dbus-sharp.dll \
++		-path:en -updateto:en -delete
+ 
+ CLEANFILES = dbus-sharp-docs.zip dbus-sharp-docs.tree
+ 
diff --git a/sys-apps/dbus/files/digest-dbus-0.61 b/sys-apps/dbus/files/digest-dbus-0.61
new file mode 100644
index 000000000000..3d8e00466423
--- /dev/null
+++ b/sys-apps/dbus/files/digest-dbus-0.61
@@ -0,0 +1,3 @@
+MD5 cfd4f26004e4304e0dace4d82894e50b dbus-0.61.tar.gz 1735729
+RMD160 67306e1a632c1986460e8ead311ae642447cdcc3 dbus-0.61.tar.gz 1735729
+SHA256 45a6b655c0fdfffdabc49857cb19d1ea0c9a8923f76e5c165e01e18ce98da0ec dbus-0.61.tar.gz 1735729