new release 'n cleanup

18 files changed, 27 insertions, 1040 deletions

diff --git a/sys-apps/dbus/ChangeLog b/sys-apps/dbus/ChangeLog
index 9f3b311d4500..2cffbe804b5c 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.37 2005/02/27 19:22:12 weeve Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/ChangeLog,v 1.38 2005/03/02 23:49:25 foser Exp $
+
+*dbus-0.23.2 (03 Mar 2005)
+
+  03 Mar 2005; foser <foser@gentoo.org> dbus-0.23.2.ebuild :
+  New release (#81794)
+  Add patch to work around mono lib versioning problem (#81794)
 
   27 Feb 2005; Jason Wever <weeve@gentoo.org> dbus-0.23-r3.ebuild:
   Added ~sparc keyword.
diff --git a/sys-apps/dbus/dbus-0.22-r1.ebuild b/sys-apps/dbus/dbus-0.22-r1.ebuild
deleted file mode 100644
index e51762ec29e4..000000000000
--- a/sys-apps/dbus/dbus-0.22-r1.ebuild
+++ /dev/null
@@ -1,125 +0,0 @@
-# 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.22-r1.ebuild,v 1.7 2005/01/21 04:35:39 agriffis Exp $
-
-# because of the experimental nature debug by default
-inherit debug eutils mono python
-
-# FIXME : fix docs
-# FIXME : qt (#65504)
-#IUSE="X gtk qt python mono doc xml2"
-IUSE="X gtk python xml2"
-
-DESCRIPTION="A message bus system, a simple way for applications to talk to eachother"
-HOMEPAGE="http://www.freedesktop.org/software/dbus/"
-SRC_URI="http://www.freedesktop.org/software/dbus/releases/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="|| ( GPL-2 AFL-2.1 )"
-KEYWORDS="x86 ppc amd64 ia64"
-
-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 )"
-#	mono? ( >=dev-dotnet/mono-0.95 )"
-#	qt? ( >=x11-libs/qt-3 )
-
-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}/${P}-python_int64.patch
-
-}
-
-src_compile() {
-
-	local myconf
-
-	if use xml2; then
-		myconf="--with-xml=libxml";
-	else
-		myconf="--with-xml=expat";
-	fi
-
-	econf \
-		`use_enable X x` \
-		`use_enable gtk` \
-		`use_enable python` \
-		--disable-mono \
-		--disable-qt \
-		--enable-glib \
-		--enable-verbose-mode \
-		--enable-checks \
-		--enable-asserts \
-		--with-system-pid-file=/var/run/dbus.pid \
-		--with-system-socket=/var/lib/dbus/system_bus_socket \
-		--with-session-socket-dir=/tmp \
-		--disable-doxygen-docs \
-		--disable-xml-docs \
-		--disable-mono-docs \
-		${myconf} \
-		|| die
-
-#		`use_enable mono` \
-#		`use_enable qt` \
-#		`use_enable doc doxygen-docs` \
-#		`use_enable doc xml-docs` \
-
-	# do not build the mono examples, they need gtk-sharp
-	touch ${S}/mono/example/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
-
-	# needs to exist for the system socket
-	keepdir /var/lib/dbus
-
-	keepdir /usr/lib/dbus-1.0/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/dbus-0.22-r2.ebuild b/sys-apps/dbus/dbus-0.22-r2.ebuild
deleted file mode 100644
index 3845033e27b1..000000000000
--- a/sys-apps/dbus/dbus-0.22-r2.ebuild
+++ /dev/null
@@ -1,143 +0,0 @@
-# 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.22-r2.ebuild,v 1.6 2005/01/21 04:35:39 agriffis Exp $
-
-# because of the experimental nature debug by default
-inherit debug eutils mono python
-
-# FIXME : fix docs
-#IUSE="X gtk qt python mono doc xml2"
-IUSE="X gtk python mono xml2"
-
-DESCRIPTION="A message bus system, a simple way for applications to talk to eachother"
-HOMEPAGE="http://www.freedesktop.org/software/dbus/"
-SRC_URI="http://www.freedesktop.org/software/dbus/releases/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="|| ( GPL-2 AFL-2.1 )"
-KEYWORDS="~x86 ~ppc ~amd64 ppc64 ~ia64"
-
-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 )
-	!ppc64? (
-		mono? ( >=dev-dotnet/mono-0.95 )
-	)"
-
-#	qt? ( >=x11-libs/qt-3 )
-
-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}/${P}-python_int64.patch
-
-	local cs
-	# a few cvs patches for beagle
-	cd ${S}/mono
-	for cs in *.cs; do
-		einfo "Removing CR from ${cs}"
-		sed -e "s/\r//" ${cs} > ${cs}.new
-		mv ${cs}.new ${cs}
-	done;
-	epatch ${FILESDIR}/${P}-mono_bindings.patch
-	cd ${S}/bus
-	epatch ${FILESDIR}/${P}-bus_driver_know_thyself.patch
-	cd ${S}
-	epatch ${FILESDIR}/${P}-mono_service_owner.patch
-
-	cd ${S}
-	automake || die
-
-}
-
-src_compile() {
-
-	local myconf
-
-	if use xml2; then
-		myconf="--with-xml=libxml";
-	else
-		myconf="--with-xml=expat";
-	fi
-
-	econf \
-		`use_enable X x` \
-		`use_enable gtk` \
-		--disable-qt \
-		`use_enable python` \
-		`use_enable mono` \
-		--enable-glib \
-		--enable-verbose-mode \
-		--enable-checks \
-		--enable-asserts \
-		--with-system-pid-file=/var/run/dbus.pid \
-		--with-system-socket=/var/lib/dbus/system_bus_socket \
-		--with-session-socket-dir=/tmp \
-		--disable-doxygen-docs \
-		--disable-xml-docs \
-		--disable-mono-docs \
-		${myconf} \
-		|| die
-
-#		`use_enable qt` \
-#		`use_enable doc doxygen-docs` \
-#		`use_enable doc xml-docs` \
-
-	# do not build the mono examples, they need gtk-sharp
-	touch ${S}/mono/example/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
-
-	# needs to exist for the system socket
-	keepdir /var/lib/dbus
-
-	keepdir /usr/lib/dbus-1.0/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/dbus-0.22-r3.ebuild b/sys-apps/dbus/dbus-0.22-r3.ebuild
deleted file mode 100644
index faaecc675d45..000000000000
--- a/sys-apps/dbus/dbus-0.22-r3.ebuild
+++ /dev/null
@@ -1,143 +0,0 @@
-# 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.22-r3.ebuild,v 1.4 2005/01/21 04:35:39 agriffis Exp $
-
-# because of the experimental nature debug by default
-inherit debug eutils mono python
-
-# 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://www.freedesktop.org/software/dbus/"
-SRC_URI="http://www.freedesktop.org/software/dbus/releases/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="|| ( GPL-2 AFL-2.1 )"
-KEYWORDS="~x86 ~ppc ~amd64 ~ppc64 ~ia64"
-
-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 )
-	!ppc64? (
-		mono? ( >=dev-dotnet/mono-0.95 )
-	)
-	qt? ( >=x11-libs/qt-3 )"
-
-
-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}/${P}-python_int64.patch
-
-	local cs
-	# a few cvs patches for beagle
-	cd ${S}/mono
-	for cs in *.cs; do
-		einfo "Removing CR from ${cs}"
-		sed -e "s/\r//" ${cs} > ${cs}.new
-		mv ${cs}.new ${cs}
-	done;
-	epatch ${FILESDIR}/${P}-mono_bindings.patch
-	cd ${S}/bus
-	epatch ${FILESDIR}/${P}-bus_driver_know_thyself.patch
-	cd ${S}
-	epatch ${FILESDIR}/${P}-mono_service_owner.patch
-
-	epatch ${FILESDIR}/${P}-qt.patch
-
-	autoconf || die
-	automake || die
-}
-
-src_compile() {
-
-	local myconf
-
-	if use xml2; then
-		myconf="--with-xml=libxml";
-	else
-		myconf="--with-xml=expat";
-	fi
-
-	econf \
-		`use_enable 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-pid-file=/var/run/dbus.pid \
-		--with-system-socket=/var/lib/dbus/system_bus_socket \
-		--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/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
-
-	# needs to exist for the system socket
-	keepdir /var/lib/dbus
-
-	keepdir /usr/lib/dbus-1.0/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/dbus-0.23-r1.ebuild b/sys-apps/dbus/dbus-0.23-r1.ebuild
deleted file mode 100644
index 3fe330b63219..000000000000
--- a/sys-apps/dbus/dbus-0.23-r1.ebuild
+++ /dev/null
@@ -1,124 +0,0 @@
-# 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-r1.ebuild,v 1.3 2005/01/21 04:35:39 agriffis Exp $
-
-# because of the experimental nature debug by default
-inherit debug eutils mono python
-
-# 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"
-
-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 )
-	!ppc64? (
-		mono? ( >=dev-dotnet/mono-0.95 )
-	)
-	qt? ( >=x11-libs/qt-3 )"
-
-
-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}/${P}-qt.patch
-}
-
-src_compile() {
-
-	local myconf
-
-	if use xml2; then
-		myconf="--with-xml=libxml";
-	else
-		myconf="--with-xml=expat";
-	fi
-
-	econf \
-		`use_enable 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-pid-file=/var/run/dbus.pid \
-		--with-system-socket=/var/lib/dbus/system_bus_socket \
-		--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
-
-	# needs to exist for the system socket
-	keepdir /var/lib/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/dbus-0.23-r2.ebuild b/sys-apps/dbus/dbus-0.23.2.ebuild
index 6f8c35fe95c1..d792aeb9bb11 100644
--- a/sys-apps/dbus/dbus-0.23-r2.ebuild
+++ b/sys-apps/dbus/dbus-0.23.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.23-r2.ebuild,v 1.2 2005/02/08 05:04:53 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/dbus-0.23.2.ebuild,v 1.1 2005/03/02 23:49:25 foser Exp $
 
 # because of the experimental nature debug by default
 inherit debug eutils mono python multilib
@@ -15,7 +15,7 @@ SRC_URI="http://dbus.freedesktop.org/releases/${P}.tar.gz"
 
 SLOT="0"
 LICENSE="|| ( GPL-2 AFL-2.1 )"
-KEYWORDS="~x86 ~ppc ~amd64 ~ppc64 ~ia64"
+KEYWORDS="~x86 ~ppc ~amd64 ~ppc64 ~ia64 ~sparc"
 
 RDEPEND=">=dev-libs/glib-2
 	xml2? ( >=dev-libs/libxml2-2.6 )
@@ -24,10 +24,10 @@ RDEPEND=">=dev-libs/glib-2
 	gtk? ( >=x11-libs/gtk+-2 )
 	python? ( >=dev-lang/python-2.2
 		>=dev-python/pyrex-0.9 )
+	qt? ( >=x11-libs/qt-3 )
 	!ppc64? (
 		mono? ( >=dev-dotnet/mono-0.95 )
-	)
-	qt? ( >=x11-libs/qt-3 )"
+	)"
 
 
 DEPEND="${RDEPEND}
@@ -43,11 +43,11 @@ src_unpack() {
 	unpack ${A}
 	cd ${S}
 
-	epatch ${FILESDIR}/${P}-qt.patch
-	# fix security issue (#80601)
-	epatch ${FILESDIR}/${P}-dbus_session_connect.patch
+	epatch ${FILESDIR}/${PN}-0.23-qt.patch
 	# add missing include (#78617)
-	epatch ${FILESDIR}/${P}-fd_set.patch
+	epatch ${FILESDIR}/${PN}-0.23-fd_set.patch
+	# workaround mono lib versioning (#81794)
+	epatch ${FILESDIR}/${P}-version_fix.patch
 
 	# It stupidly tries to install python stuff to platform-independent
 	# libdir
diff --git a/sys-apps/dbus/files/dbus-0.22-bus_driver_know_thyself.patch b/sys-apps/dbus/files/dbus-0.22-bus_driver_know_thyself.patch
deleted file mode 100644
index 6edf75fb09c2..000000000000
--- a/sys-apps/dbus/files/dbus-0.22-bus_driver_know_thyself.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-Index: driver.c
-===================================================================
-RCS file: /cvs/dbus/dbus/bus/driver.c,v
-retrieving revision 1.53
-diff -u -p -r1.53 driver.c
---- driver.c	25 Aug 2004 08:03:12 -0000	1.53
-+++ driver.c	26 Aug 2004 16:38:11 -0000
-@@ -511,6 +511,7 @@ bus_driver_handle_service_exists (DBusCo
-   DBusMessage *reply;
-   DBusString service_name;
-   BusService *service;
-+  dbus_bool_t service_exists;
-   char *name;
-   dbus_bool_t retval;
-   BusRegistry *registry;
-@@ -525,9 +526,14 @@ bus_driver_handle_service_exists (DBusCo
-     return FALSE;
- 
-   retval = FALSE;
--  
--  _dbus_string_init_const (&service_name, name);
--  service = bus_registry_lookup (registry, &service_name);
-+
-+  if (strcmp (name, DBUS_SERVICE_ORG_FREEDESKTOP_DBUS) == 0) {
-+    service_exists = TRUE;
-+  } else {
-+    _dbus_string_init_const (&service_name, name);
-+    service = bus_registry_lookup (registry, &service_name);
-+    service_exists = service != NULL;
-+  }
-  
-   reply = dbus_message_new_method_return (message);
-   if (reply == NULL)
-@@ -537,7 +543,7 @@ bus_driver_handle_service_exists (DBusCo
-     }
- 
-   if (!dbus_message_append_args (reply,
--                                 DBUS_TYPE_BOOLEAN, service != NULL,
-+                                 DBUS_TYPE_BOOLEAN, service_exists,
-                                  0))
-     {
-       BUS_SET_OOM (error);
diff --git a/sys-apps/dbus/files/dbus-0.22-mono_bindings.patch b/sys-apps/dbus/files/dbus-0.22-mono_bindings.patch
deleted file mode 100644
index ea75c18f5fa5..000000000000
--- a/sys-apps/dbus/files/dbus-0.22-mono_bindings.patch
+++ /dev/null
@@ -1,197 +0,0 @@
-Index: BusDriver.cs
-===================================================================
-RCS file: BusDriver.cs
-diff -N BusDriver.cs
---- /dev/null	1 Jan 1970 00:00:00 -0000
-+++ BusDriver.cs	30 Aug 2004 16:17:20 -0000
-@@ -0,0 +1,39 @@
-+namespace DBus
-+{
-+
-+  using System;
-+
-+  public delegate void ServiceEventHandler (string serviceName);
-+
-+  [Interface ("org.freedesktop.DBus")]
-+  public abstract class BusDriver
-+  {
-+    [Method]
-+    public abstract string[] ListServices ();
-+
-+    [Method]
-+    public abstract string GetServiceOwner (string serviceName);
-+
-+    [Method]
-+    public abstract UInt32 GetConnectionUnixUser (string connectionName);
-+
-+
-+    [Signal]
-+    public virtual event ServiceEventHandler ServiceCreated;
-+
-+    [Signal]
-+    public virtual event ServiceEventHandler ServiceDeleted;
-+
-+
-+    static public BusDriver New (Connection connection)
-+    {
-+      Service service;
-+      service = Service.Get (connection, "org.freedesktop.DBus");
-+
-+      BusDriver driver;
-+      driver = (BusDriver) service.GetObject (typeof (BusDriver), "/org/freedesktop/DBus");
-+      
-+      return driver;
-+    }
-+  }
-+}
-Index: Connection.cs
-===================================================================
-RCS file: /cvs/dbus/dbus/mono/Connection.cs,v
-retrieving revision 1.8
-diff -u -p -r1.8 Connection.cs
---- Connection.cs	29 Aug 2004 18:14:30 -0000	1.8
-+++ Connection.cs	30 Aug 2004 16:17:20 -0000
-@@ -76,6 +76,14 @@ namespace DBus 
-       return new Connection(rawConnection);
-     }
- 
-+    public string BaseService
-+    {
-+      get
-+	{
-+	  return Marshal.PtrToStringAnsi (dbus_bus_get_base_service (RawConnection));
-+	}
-+    }
-+
-     public int Timeout
-     {
-       get
-@@ -182,5 +190,8 @@ namespace DBus 
-     
-     [DllImport ("dbus-1")]
-     private extern static void dbus_connection_disconnect (IntPtr ptr);
-+
-+    [DllImport ("dbus-1")]
-+    private extern static IntPtr dbus_bus_get_base_service (IntPtr ptr);
-   }
- }
-Index: Handler.cs
-===================================================================
-RCS file: /cvs/dbus/dbus/mono/Handler.cs,v
-retrieving revision 1.6
-diff -u -p -r1.6 Handler.cs
---- Handler.cs	7 Jun 2004 11:40:20 -0000	1.6
-+++ Handler.cs	30 Aug 2004 16:17:20 -0000
-@@ -177,11 +177,15 @@ namespace DBus
-       }
-       
-       MethodInfo method = interfaceProxy.GetMethod(methodCall.Key);
-+      
-+      Message.Push (methodCall);
- 
-       // Now call the method. FIXME: Error handling
-       object [] args = methodCall.Arguments.GetParameters(method);
-       object retVal = method.Invoke(this.handledObject, args);
- 
-+      Message.Pop ();
-+
-       // Create the reply and send it
-       MethodReturn methodReturn = new MethodReturn(methodCall);
-       methodReturn.Arguments.AppendResults(method, retVal, args);
-Index: Makefile.am
-===================================================================
-RCS file: /cvs/dbus/dbus/mono/Makefile.am,v
-retrieving revision 1.10
-diff -u -p -r1.10 Makefile.am
---- Makefile.am	17 Aug 2004 17:08:32 -0000	1.10
-+++ Makefile.am	30 Aug 2004 16:17:20 -0000
-@@ -9,6 +9,7 @@ ASSEMBLY_NAME=dbus-sharp
- DBUS_SHARP_FILES= 		\
- 	Arguments.cs		\
- 	Bus.cs			\
-+	BusDriver.cs		\
- 	Connection.cs		\
- 	Custom.cs		\
- 	DBusException.cs	\
-Index: Message.cs
-===================================================================
-RCS file: /cvs/dbus/dbus/mono/Message.cs,v
-retrieving revision 1.9
-diff -u -p -r1.9 Message.cs
---- Message.cs	29 Aug 2004 18:14:30 -0000	1.9
-+++ Message.cs	30 Aug 2004 16:17:20 -0000
-@@ -8,6 +8,25 @@ namespace DBus 
-   
-   public class Message 
-   {
-+    private static Stack stack = new Stack ();
-+	  
-+    static public Message Current {
-+      get 
-+	{
-+	  return stack.Count > 0 ? (Message) stack.Peek () : null;
-+	}
-+    }
-+
-+    static internal void Push (Message message)
-+    {
-+      stack.Push (message);
-+    }
-+
-+    static internal void Pop ()
-+    {
-+      stack.Pop ();
-+    }
-+	  
-     
-     /// <summary>
-     /// A pointer to the underlying Message structure
-@@ -294,6 +313,22 @@ namespace DBus 
- 	}
-     }
- 
-+    public string Sender 
-+    {
-+      get
-+	{
-+	  return Marshal.PtrToStringAnsi(dbus_message_get_sender(RawMessage));
-+	}
-+    }
-+
-+    public string Destination
-+    {
-+      get
-+	{
-+	  return Marshal.PtrToStringAnsi(dbus_message_get_destination(RawMessage));
-+	}
-+    }
-+	    
-     protected int Slot
-     {
-       get 
-@@ -373,5 +408,8 @@ namespace DBus 
- 
-     [DllImport("dbus-1")]
-     private extern static IntPtr dbus_message_get_destination(IntPtr rawMessage);
-+
-+    [DllImport("dbus-1")]
-+    private extern static IntPtr dbus_message_get_sender(IntPtr rawMessage);
-   }
- }
-Index: Service.cs
-===================================================================
-RCS file: /cvs/dbus/dbus/mono/Service.cs,v
-retrieving revision 1.6
-diff -u -p -r1.6 Service.cs
---- Service.cs	23 May 2004 21:33:14 -0000	1.6
-+++ Service.cs	30 Aug 2004 16:17:20 -0000
-@@ -128,7 +128,9 @@ namespace DBus
- 	// We're only interested in signals
- 	Signal signal = (Signal) message;
- 	if (SignalCalled != null) {
-+	  Message.Push (message);
- 	  SignalCalled(signal);
-+	  Message.Pop ();
- 	}
-       }
-       
diff --git a/sys-apps/dbus/files/dbus-0.22-mono_service_owner.patch b/sys-apps/dbus/files/dbus-0.22-mono_service_owner.patch
deleted file mode 100644
index 8b2b5c63539d..000000000000
--- a/sys-apps/dbus/files/dbus-0.22-mono_service_owner.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-===================================================================
-RCS file: /cvs/dbus/dbus/mono/BusDriver.cs,v
-retrieving revision 1.1
-retrieving revision 1.2
-diff -u -r1.1 -r1.2
---- dbus/dbus/mono/BusDriver.cs	2004/08/31 03:59:14	1.1
-+++ dbus/dbus/mono/BusDriver.cs	2004/09/29 01:46:45	1.2
-@@ -3,7 +3,9 @@
- 
-   using System;
- 
--  public delegate void ServiceEventHandler (string serviceName);
-+  public delegate void ServiceEventHandler (string serviceName,
-+					    string oldOwner,
-+					    string newOwner);
- 
-   [Interface ("org.freedesktop.DBus")]
-   public abstract class BusDriver
-@@ -19,11 +21,7 @@
- 
- 
-     [Signal]
--    public virtual event ServiceEventHandler ServiceCreated;
--
--    [Signal]
--    public virtual event ServiceEventHandler ServiceDeleted;
--
-+    public virtual event ServiceEventHandler ServiceOwnerChanged;
- 
-     static public BusDriver New (Connection connection)
-     {
diff --git a/sys-apps/dbus/files/dbus-0.22-python_int64.patch b/sys-apps/dbus/files/dbus-0.22-python_int64.patch
deleted file mode 100644
index b9532d4cc683..000000000000
--- a/sys-apps/dbus/files/dbus-0.22-python_int64.patch
+++ /dev/null
@@ -1,143 +0,0 @@
-Index: python/dbus_bindings.pyx.in
-===================================================================
-RCS file: /cvs/dbus/dbus/python/dbus_bindings.pyx.in,v
-retrieving revision 1.14
-diff -u -p -r1.14 dbus_bindings.pyx.in
---- python/dbus_bindings.pyx.in	28 Jul 2004 18:14:55 -0000	1.14
-+++ python/dbus_bindings.pyx.in	1 Sep 2004 17:20:43 -0000
-@@ -455,6 +455,10 @@ cdef class MessageIter:
-             retval = self.get_int32()
-         elif arg_type == TYPE_UINT32:
-             retval = self.get_uint32()
-+        elif arg_type == TYPE_INT64:
-+            retval = self.get_int64()
-+        elif arg_type == TYPE_UINT64:
-+            retval = self.get_uint64()
-         elif arg_type == TYPE_DOUBLE:
-             retval = self.get_double()
-         elif arg_type == TYPE_BYTE:
-@@ -474,6 +478,10 @@ cdef class MessageIter:
-                 retval = self.get_int32_array()
-             elif array_type == TYPE_UINT32:
-                 retval = self.get_uint32_array()
-+            elif array_type == TYPE_INT64:
-+                retval = self.get_int64_array()
-+            elif array_type == TYPE_UINT64:
-+                retval = self.get_uint64_array()
-             elif array_type == TYPE_DOUBLE:
-                 retval = self.get_double_array()
-             else:
-@@ -529,6 +537,12 @@ cdef class MessageIter:
-     def get_uint32(self):
-         return dbus_message_iter_get_uint32(self.iter)
- 
-+    def get_int64(self):
-+        return dbus_message_iter_get_int64(self.iter)
-+
-+    def get_uint64(self):
-+        return dbus_message_iter_get_uint64(self.iter)
-+
-     def get_double(self):
-         return dbus_message_iter_get_double(self.iter)
- 
-@@ -574,6 +588,26 @@ cdef class MessageIter:
-             python_list.append(retval[i])
-         return python_list
- 
-+    def get_int64_array(self):
-+        cdef int len
-+        cdef dbus_int64_t *retval
-+        cdef int i
-+        dbus_message_iter_get_int64_array(self.iter, &retval, <int*>&len)
-+        python_list = []
-+        for i from 0 <= i < len:
-+            python_list.append(retval[i])
-+        return python_list
-+
-+    def get_uint64_array(self):
-+        cdef int len
-+        cdef dbus_uint64_t *retval
-+        cdef int i
-+        dbus_message_iter_get_uint64_array(self.iter, &retval, <int*>&len)
-+        python_list = []
-+        for i from 0 <= i < len:
-+            python_list.append(retval[i])
-+        return python_list
-+
-     def get_double_array(self):
-         cdef int len
-         cdef double *retval
-@@ -615,6 +649,8 @@ cdef class MessageIter:
-             retval = self.append_boolean(value)
-         elif value_type == int:
-             retval = self.append_int32(value)
-+        elif value_type == long:
-+            retval = self.append_int64(value)
-         elif value_type == str:
-             retval = self.append_string(value)
-         elif value_type == float:
-@@ -631,6 +667,8 @@ cdef class MessageIter:
-                     self.append_string_array(value)
-                 elif list_type == int:
-                     self.append_int32_array(value)
-+                elif list_type == long:
-+                    self.append_int64_array(value)
-                 elif list_type == float:
-                     self.append_double_array(value)
-                 elif isinstance(value[0], ObjectPath):
-@@ -665,6 +703,12 @@ cdef class MessageIter:
-     def append_uint32(self, value):
-         return dbus_message_iter_append_uint32(self.iter, value)
- 
-+    def append_int64(self, value):
-+        return dbus_message_iter_append_int64(self.iter, value)
-+
-+    def append_uint64(self, value):
-+        return dbus_message_iter_append_uint64(self.iter, value)
-+
-     def append_double(self, value):
-         return dbus_message_iter_append_double(self.iter, value)
- 
-@@ -677,7 +721,8 @@ cdef class MessageIter:
-     def append_object_path(self, value):
-         return dbus_message_iter_append_object_path(self.iter, value)
- 
--    # FIXME: append_array, append_boolean_array, append_uint32_array
-+    # FIXME: append_array, append_boolean_array, append_uint32_array, 
-+    # append_uint64_array
- 
-     def append_dict(self, python_dict):
-         cdef DBusMessageIter c_dict_iter
-@@ -720,6 +765,19 @@ cdef class MessageIter:
-             value[i] = item
-         return dbus_message_iter_append_int32_array(self.iter, value, length)
- 
-+    def append_int64_array(self, python_list):
-+        cdef dbus_int64_t *value
-+        cdef int length
-+        cdef int i
-+        length = len(python_list)
-+        value = <dbus_int64_t*>malloc(length * sizeof(dbus_int64_t))
-+        for i from 0 <= i < length:
-+            item = python_list[i]
-+            if type(item) != int:
-+                raise TypeError
-+            value[i] = item
-+        return dbus_message_iter_append_int64_array(self.iter, value, length)
-+
-     def append_double_array(self, python_list):
-         cdef double *value
-         cdef int length
-@@ -855,6 +913,12 @@ cdef class Message:
-             elif type == TYPE_UINT32:
-                 num = iter.get_uint32()
-                 arg = 'uint32:%u\n' % (num)
-+            elif type == TYPE_INT64:
-+                num = iter.get_int64()
-+                arg = 'int64:%d\n' % (num)
-+            elif type == TYPE_UINT64:
-+                num = iter.get_uint64()
-+                arg = 'uint64:%u\n' % (num)
-             elif type == TYPE_DOUBLE:
-                 num = iter.get_double()
-                 arg = 'double:%f\n' % (num)
diff --git a/sys-apps/dbus/files/dbus-0.22-qt.patch b/sys-apps/dbus/files/dbus-0.22-qt.patch
deleted file mode 100644
index 369c626f921d..000000000000
--- a/sys-apps/dbus/files/dbus-0.22-qt.patch
+++ /dev/null
@@ -1,78 +0,0 @@
---- configure.in.org	2004-12-13 14:08:57.676399648 +0100
-+++ configure.in	2004-12-13 14:09:31.113316464 +0100
-@@ -812,6 +812,7 @@
-         if test -f "$dir/qglobal.h"; then
-             have_qt=yes
-             DBUS_QT_CXXFLAGS="-I$dir"
-+			DBUS_QT_LIBS="-I$QTDIR/lib/libqt-mt.la"
-        fi
-     done
- fi
-@@ -821,18 +822,6 @@
-    AC_MSG_RESULT([not found])
- fi
- 
--dnl linking to kdecore will give us a bit of help from libtool
--if (! kde-config >& /dev/null); then
--    have_qt=no
--else
--    kdelibs=`kde-config --install lib --expandvars 2>/dev/null`
--    if test -z $kdelibs -o ! -f $kdelibs/libkdecore.la; then
--        have_qt=no
--    else
--        DBUS_QT_LIBS="$kdelibs/libkdecore.la"
--    fi
--fi
--
- if test x$have_qt = xno ; then
-     AC_MSG_WARN([Qt development libraries not found])
- fi
---- qt/connection.h	2004-08-10 05:03:37.000000000 +0200
-+++ /home/heino/connection.h	2004-12-13 14:07:26.804214320 +0100
-@@ -50,6 +50,7 @@
-     Message borrowMessage();
-     Message popMessage();
-     void stealBorrowMessage( const Message& );
-+    void dbus_connection_setup_with_qt_main (DBusConnection *connection);
- 
-   public slots:
-     void open( const QString& );
---- qt/connection.cpp	2004-05-04 07:35:48.000000000 +0200
-+++ /home/heino/connection.cpp	2004-12-13 14:07:11.503540376 +0100
-@@ -156,6 +156,13 @@
- {
- }
- 
-+void Connection::dbus_connection_setup_with_qt_main (DBusConnection *connection)
-+{
-+  d->setConnection( connection );
-+}
-+
-+
-+
- /////////////////////////////////////////////////////////
- 
- #include "connection.moc"
---- qt/integrator.cpp	2003-12-02 11:44:22.000000000 +0100
-+++ /home/heino/integrator.cpp	2004-12-13 14:07:38.260472704 +0100
-@@ -162,13 +162,18 @@
- 
- void Integrator::slotRead( int fd )
- {
--  Q_UNUSED( fd );
-+  QIntDictIterator<Watch>	it( m_watches );
-+  for ( ; it.current(); ++it )
-+    dbus_watch_handle ( it.current()->watch, DBUS_WATCH_READABLE );
-+
-   emit readReady();
- }
- 
- void Integrator::slotWrite( int fd )
- {
--  Q_UNUSED( fd );
-+  QIntDictIterator<Watch>       it( m_watches );
-+  for ( ; it.current(); ++it )
-+    dbus_watch_handle ( it.current()->watch, DBUS_WATCH_WRITABLE );
- }
- 
- void Integrator::slotTimeout( DBusTimeout *timeout )
diff --git a/sys-apps/dbus/files/dbus-0.23.2-version_fix.patch b/sys-apps/dbus/files/dbus-0.23.2-version_fix.patch
new file mode 100644
index 000000000000..87b464eae915
--- /dev/null
+++ b/sys-apps/dbus/files/dbus-0.23.2-version_fix.patch
@@ -0,0 +1,11 @@
+diff -uNr dbus-0.23/mono/AssemblyInfo.cs.in dbus-0.23.patched/mono/AssemblyInfo.cs.in
+--- dbus-0.23/mono/AssemblyInfo.cs.in	2004-09-20 13:24:38.000000000 +0200
++++ dbus-0.23.patched/mono/AssemblyInfo.cs.in	2005-02-15 23:06:29.650090128 +0100
+@@ -1,6 +1,6 @@
+ using System.Reflection;
+ using System.Runtime.CompilerServices;
+  
+-[assembly:AssemblyVersion("@VERSION@")]
++[assembly:AssemblyVersion("0.23")]
+ [assembly:AssemblyDelaySign(false)]
+ [assembly:AssemblyKeyFile("@srcdir@/dbus-sharp.snk")]
diff --git a/sys-apps/dbus/files/digest-dbus-0.22-r1 b/sys-apps/dbus/files/digest-dbus-0.22-r1
deleted file mode 100644
index d2af6e21be95..000000000000
--- a/sys-apps/dbus/files/digest-dbus-0.22-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 6b1c2476ea8b82dd9fb7f29ef857cb9f dbus-0.22.tar.gz 1248780
diff --git a/sys-apps/dbus/files/digest-dbus-0.22-r2 b/sys-apps/dbus/files/digest-dbus-0.22-r2
deleted file mode 100644
index d2af6e21be95..000000000000
--- a/sys-apps/dbus/files/digest-dbus-0.22-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 6b1c2476ea8b82dd9fb7f29ef857cb9f dbus-0.22.tar.gz 1248780
diff --git a/sys-apps/dbus/files/digest-dbus-0.22-r3 b/sys-apps/dbus/files/digest-dbus-0.22-r3
deleted file mode 100644
index d2af6e21be95..000000000000
--- a/sys-apps/dbus/files/digest-dbus-0.22-r3
+++ /dev/null
@@ -1 +0,0 @@
-MD5 6b1c2476ea8b82dd9fb7f29ef857cb9f dbus-0.22.tar.gz 1248780
diff --git a/sys-apps/dbus/files/digest-dbus-0.23-r1 b/sys-apps/dbus/files/digest-dbus-0.23-r1
deleted file mode 100644
index 729896ce139d..000000000000
--- a/sys-apps/dbus/files/digest-dbus-0.23-r1
+++ /dev/null
@@ -1 +0,0 @@
-MD5 56a6a06144bd349f21afbd4cc386a60f dbus-0.23.tar.gz 1280646
diff --git a/sys-apps/dbus/files/digest-dbus-0.23-r2 b/sys-apps/dbus/files/digest-dbus-0.23-r2
deleted file mode 100644
index 729896ce139d..000000000000
--- a/sys-apps/dbus/files/digest-dbus-0.23-r2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 56a6a06144bd349f21afbd4cc386a60f dbus-0.23.tar.gz 1280646
diff --git a/sys-apps/dbus/files/digest-dbus-0.23.2 b/sys-apps/dbus/files/digest-dbus-0.23.2
new file mode 100644
index 000000000000..8f47cf24de43
--- /dev/null
+++ b/sys-apps/dbus/files/digest-dbus-0.23.2
@@ -0,0 +1 @@
+MD5 654a2207203636dca0007de384cf0893 dbus-0.23.2.tar.gz 1285494