compnerd got nutsy and messed up the digest. Also deleted 1 unnecessary patch.

Package-Manager: portage-2.1_pre2

6 files changed, 18 insertions, 187 deletions

diff --git a/sys-apps/dbus/ChangeLog b/sys-apps/dbus/ChangeLog
index a628b3f2974e..49484f2ffaad 100644
--- a/sys-apps/dbus/ChangeLog
+++ b/sys-apps/dbus/ChangeLog
@@ -1,6 +1,10 @@
 # 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.73 2005/12/30 08:30:35 compnerd Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/ChangeLog,v 1.74 2005/12/30 10:12:47 cardoe Exp $
+
+  30 Dec 2005; Doug Goldstein <cardoe@gentoo.org>
+  -files/dbus-0.23.2-abi_api.patch, -dbus-0.36.2.ebuild:
+  compnerd got nutsy and messed up the digest. Also deleted 1 unnecessary patch.
 
   30 Dec 2005; Saleem Abdulrasool <compnerd@gentoo.org>
   dbus-0.23.4-r1.ebuild:
diff --git a/sys-apps/dbus/Manifest b/sys-apps/dbus/Manifest
index efc6b7ebe4c3..d3fd073710bb 100644
--- a/sys-apps/dbus/Manifest
+++ b/sys-apps/dbus/Manifest
@@ -1,7 +1,9 @@
-MD5 ca3d280097a5bb5118e39e15a0f14601 ChangeLog 10720
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 08421fd03e5252e4bf581e0a6c4f3382 ChangeLog 10907
 MD5 fab22de6cb9a5cf7e0abedfe77c9b04a dbus-0.23-r3.ebuild 3246
 MD5 875fc457ed53bbfb5dd49110d43ed6f3 dbus-0.23.4-r1.ebuild 3448
-MD5 f127ffa8cdc75cbd0befadcb16d08401 dbus-0.36.2.ebuild 3620
 MD5 eaaed2cd9d845468bff2f444d0a4f4c7 dbus-0.50-r1.ebuild 3900
 MD5 7fd4127291f0f0e5365d66e5a9a10122 dbus-0.50-r2.ebuild 4335
 MD5 952c30c976278088e842f0986027b1b8 dbus-0.60-r1.ebuild 4222
@@ -11,15 +13,20 @@ MD5 768e500cfda89809161576ea2080a7aa files/dbus-0.23-dbus_session_connect.patch
 MD5 f3ab25d85c77b7f859d4d2cefc787aef files/dbus-0.23-fd_set.patch 293
 MD5 403b7724a698be1509916991e87224a4 files/dbus-0.23-pyexecdir.patch 1131
 MD5 db2189cd44431086b05de29565090861 files/dbus-0.23-qt.patch 816
-MD5 9308d3d8014ebf53a946c6219675ffc3 files/dbus-0.23.2-abi_api.patch 1893
 MD5 c66dfd4b07508de75f541b24035b74af files/dbus-0.23.2-python_api.patch 571
 MD5 038de28fe446b2303c072e96df531500 files/dbus-0.23.2-version_fix.patch 496
 MD5 4fd89997ba6101161202f761bb666167 files/dbus-dnotify_configure-01.diff 2197
 MD5 6f02f0df54613a9e34a452b1c8d92ecb files/dbus-dnotify_watchdirs-01.diff 1252
 MD5 b683f990bc7207366b4dac487a8d1416 files/digest-dbus-0.23-r3 62
-MD5 8b5d4ba2c8d4c1dd11c0ad0c85a39a08 files/digest-dbus-0.23.4-r1 63
-MD5 19d40bbc05e7cf89bf6d023540874468 files/digest-dbus-0.36.2 64
+MD5 8a28a6744a8a85a487c87eec1e1725b6 files/digest-dbus-0.23.4-r1 64
 MD5 ac15aecd52ac9b55048015edba699800 files/digest-dbus-0.50-r1 62
 MD5 ac15aecd52ac9b55048015edba699800 files/digest-dbus-0.50-r2 62
 MD5 d1d5323f6bb155eef5cf44b19078aa07 files/digest-dbus-0.60-r1 62
 MD5 41b60b877b1e6ea53476ff69c5ed77d3 metadata.xml 282
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.2 (GNU/Linux)
+
+iD8DBQFDtQhkBtvusYtCZMsRAlnbAKCHNQDRSQb+UKqsJqsaZVO5trTADACfaHkQ
+e2ZO2LeQG6jB/K6h75LEZz0=
+=om9+
+-----END PGP SIGNATURE-----
diff --git a/sys-apps/dbus/dbus-0.36.2.ebuild b/sys-apps/dbus/dbus-0.36.2.ebuild
deleted file mode 100644
index 4075434cb381..000000000000
--- a/sys-apps/dbus/dbus-0.36.2.ebuild
+++ /dev/null
@@ -1,140 +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.36.2.ebuild,v 1.5 2005/11/07 04:42:56 steev Exp $
-
-inherit eutils mono python multilib 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.6 )
-	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}
-
-	epatch ${FILESDIR}/${PN}-0.23-qt.patch
-	#add missing include (#78617)
-	epatch ${FILESDIR}/${PN}-0.23-fd_set.patch
-}
-
-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` \
-		--enable-glib \
-		--enable-verbose-mode \
-		--enable-checks \
-		--enable-asserts \
-		--with-system-pid-file=/var/run/dbus.pid \
-		--with-system-socket=/var/dbus/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
-	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
-	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-0.23.2-abi_api.patch b/sys-apps/dbus/files/dbus-0.23.2-abi_api.patch
deleted file mode 100644
index d65cbe6afa14..000000000000
--- a/sys-apps/dbus/files/dbus-0.23.2-abi_api.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-diff -Naur dbus-0.23.2.orig/dbus/dbus-pending-call.c dbus-0.23.2/dbus/dbus-pending-call.c
---- dbus-0.23.2.orig/dbus/dbus-pending-call.c	2005-02-28 13:43:54.850066742 +0100
-+++ dbus-0.23.2/dbus/dbus-pending-call.c	2005-02-28 13:44:50.266318842 +0100
-@@ -291,6 +291,24 @@
- }
- 
- /**
-+ * Gets the reply, or returns #NULL if none has been received yet. The
-+ * reference count is not incremented on the returned message, so you
-+ * have to keep a reference count on the pending call (or add one
-+ * to the message).
-+ *
-+ * @todo not thread safe? I guess it has to lock though it sucks
-+ * @todo maybe to make this threadsafe, it should be steal_reply(), i.e. only one thread can ever get the message
-+ * 
-+ * @param pending the pending call
-+ * @returns the reply message or #NULL.
-+ */
-+DBusMessage*
-+dbus_pending_call_get_reply (DBusPendingCall *pending)
-+{
-+  return pending->reply;
-+}
-+
-+/**
-  * Block until the pending call is completed.  The blocking is as with
-  * dbus_connection_send_with_reply_and_block(); it does not enter the
-  * main loop or process other messages, it simply waits for the reply
-diff -Naur dbus-0.23.2.orig/dbus/dbus-pending-call.h dbus-0.23.2/dbus/dbus-pending-call.h
---- dbus-0.23.2.orig/dbus/dbus-pending-call.h	2005-02-28 13:43:54.824066155 +0100
-+++ dbus-0.23.2/dbus/dbus-pending-call.h	2005-02-28 13:45:30.271222777 +0100
-@@ -42,6 +42,7 @@
- void         dbus_pending_call_cancel        (DBusPendingCall               *pending);
- dbus_bool_t  dbus_pending_call_get_completed (DBusPendingCall               *pending);
- DBusMessage* dbus_pending_call_steal_reply   (DBusPendingCall               *pending);
-+DBusMessage* dbus_pending_call_get_reply     (DBusPendingCall               *pending);
- void         dbus_pending_call_block         (DBusPendingCall               *pending);
- 
- dbus_bool_t dbus_pending_call_allocate_data_slot (dbus_int32_t     *slot_p);
diff --git a/sys-apps/dbus/files/digest-dbus-0.23.4-r1 b/sys-apps/dbus/files/digest-dbus-0.23.4-r1
index feb7f46a4ad8..1ec572380e0b 100644
--- a/sys-apps/dbus/files/digest-dbus-0.23.4-r1
+++ b/sys-apps/dbus/files/digest-dbus-0.23.4-r1
@@ -1 +1 @@
-MD5 ca7112aa5183afb1de5490a93eb93190 dbus-0.23.4.tar.gz 576000
+MD5 ecd20f2398ed46b2c96d7e30b1f914d4 dbus-0.23.4.tar.gz 1288374
diff --git a/sys-apps/dbus/files/digest-dbus-0.36.2 b/sys-apps/dbus/files/digest-dbus-0.36.2
deleted file mode 100644
index b17a4b115bf2..000000000000
--- a/sys-apps/dbus/files/digest-dbus-0.36.2
+++ /dev/null
@@ -1 +0,0 @@
-MD5 45468e46967d3e70f082d0d0e6049225 dbus-0.36.2.tar.gz 1601374