From: Doug Goldstein <cardoe@gentoo.org>
Date: Wed, 13 Dec 2006 00:23:52 +0000 (+0000)
Subject: Rev bump 1.0.2. Security fix for CVE-2006-6107. Gentoo bug #156681. fd.o bug #9142... 
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=021d9b6a303e3e2950190c9028993a06f54cecdf;p=gentoo.git

Rev bump 1.0.2. Security fix for CVE-2006-6107. Gentoo bug #156681. fd.o bug #9142. Removing prior vunerable versions (except current stable)
Package-Manager: portage-2.1.2_rc3-r2
---

diff --git a/sys-apps/dbus/Manifest b/sys-apps/dbus/Manifest
index be6366a0a0fd..65283f2e7c21 100644
--- a/sys-apps/dbus/Manifest
+++ b/sys-apps/dbus/Manifest
@@ -1,3 +1,6 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 30-dbus 243 RMD160 b5e7a813cd5d91f2ea60bb22260e432cbfb72fd9 SHA1 35ee3a5d3db9c7e372603ce916e17a41edd01d36 SHA256 a8e8fec9769cc5d46df8216f7d1e1f9df422c4e46f293fd70d4b017fb01d959d
 MD5 d14e59575f04e55d21a04907b6fd9f3c files/30-dbus 243
 RMD160 b5e7a813cd5d91f2ea60bb22260e432cbfb72fd9 files/30-dbus 243
@@ -34,10 +37,6 @@ AUX dbus-1.0.1-fixfilecreation.patch 474 RMD160 63e1a6737519773dc85b64098577a97b
 MD5 c2cbbace7965e670bb95daa896dcfee2 files/dbus-1.0.1-fixfilecreation.patch 474
 RMD160 63e1a6737519773dc85b64098577a97bae7ef6cc files/dbus-1.0.1-fixfilecreation.patch 474
 SHA256 183ec284a385b3ef724abbcebd10e42765d81212d23e269c473fb3772f9ab2a3 files/dbus-1.0.1-fixfilecreation.patch 474
-AUX dbus-1.0.1-pthread-holder-fix.diff 1452 RMD160 857f36030a5c1c5a07574cd668b2768e9dc97a47 SHA1 0a360cf98af768c4266d62ef4aa238b0a0245094 SHA256 22b258be44f2e64c975824a777fd70469235f31700b3c71956451b94c24fa8a1
-MD5 fc972b7f0c89bbae82c534e898300c82 files/dbus-1.0.1-pthread-holder-fix.diff 1452
-RMD160 857f36030a5c1c5a07574cd668b2768e9dc97a47 files/dbus-1.0.1-pthread-holder-fix.diff 1452
-SHA256 22b258be44f2e64c975824a777fd70469235f31700b3c71956451b94c24fa8a1 files/dbus-1.0.1-pthread-holder-fix.diff 1452
 AUX dbus.init-0.61 1377 RMD160 a6287fbad2c0b4532c7527895684aef82df46566 SHA1 6b3aee70b21ecd3dcbfe7df15e579e82f3415953 SHA256 c1dd746e70ec6e1a0d04ae39308f6341833ae4db2a2d0fc65e156279ff5eb5d4
 MD5 791bda1b16e54eba80a07d873dc97763 files/dbus.init-0.61 1377
 RMD160 a6287fbad2c0b4532c7527895684aef82df46566 files/dbus.init-0.61 1377
@@ -48,7 +47,7 @@ RMD160 36d603e1d3d004ac64b04b3fde79d73a28216f07 files/dbus.init-1.0 1141
 SHA256 d073c1f268a153f181ad80825aba65edb2a338d90f5aa1bd37d659e4250c0711 files/dbus.init-1.0 1141
 DIST dbus-0.61.tar.gz 1735729 RMD160 67306e1a632c1986460e8ead311ae642447cdcc3 SHA1 fdddc695dad64974fb4138fcb04a77a66f1f47f8 SHA256 45a6b655c0fdfffdabc49857cb19d1ea0c9a8923f76e5c165e01e18ce98da0ec
 DIST dbus-0.62.tar.gz 1737361 RMD160 d653b25726ec96eb324761ebf9efb4a50d1590c0 SHA1 45acea9bd19902791c6dbd8620256caf9d74a667 SHA256 884cc2083add655df57acc7bb144c61e9beeabf08ef76fa86929a58d7bc96707
-DIST dbus-1.0.1.tar.gz 1406595 RMD160 2270f27d9314f0e7b99540f0aa1902b8d0d7343d SHA1 1c8a72bc71a10899cd0cef4400f291ceb16fd703 SHA256 6e0730a39485fb502d640841f0f328c1a0212743f17b3fa61c78e6e32925f061
+DIST dbus-1.0.2.tar.gz 1400278 RMD160 d5eddfb058c4c026d4a9f091ad90abcc6e54861a SHA1 2870efd6ea0b5b0d14e52195f560238a74bb1e0e SHA256 8a004125f58512a69575f21f105aead0d1217fce9cb54cbafeac06b4be28c6ca
 EBUILD dbus-0.61-r1.ebuild 4176 RMD160 6b872a427b30aa833a3b31094bb18ea784db4f70 SHA1 4e39c72b6bfb850f20181b7b4111159a5f002331 SHA256 765a76fddace527bb6daf6c44c932e64fa6e78deda6cdc3292b96ec5c4264c90
 MD5 cbb340c4f87dd24ff5eac66e37c9c3b1 dbus-0.61-r1.ebuild 4176
 RMD160 6b872a427b30aa833a3b31094bb18ea784db4f70 dbus-0.61-r1.ebuild 4176
@@ -57,22 +56,14 @@ EBUILD dbus-0.62-r1.ebuild 4106 RMD160 1e68e4b4a1ef1450d008df839b407c93df35ce51
 MD5 fdd2bcbffb68cbd7daf024599b492782 dbus-0.62-r1.ebuild 4106
 RMD160 1e68e4b4a1ef1450d008df839b407c93df35ce51 dbus-0.62-r1.ebuild 4106
 SHA256 b709bd556c39d6e88045acc8efe02352eb8aad6b8947e0e089d90bf4df7eb3f1 dbus-0.62-r1.ebuild 4106
-EBUILD dbus-1.0.1-r1.ebuild 3358 RMD160 6f4831867a0b85d4dd307126105f2f670646d1e4 SHA1 423f56aa09609313260409cbaf1082c9b1051c92 SHA256 6bedb502658d5d4616865d5f20af3630f54ff3365371377d49170a98a826a5e8
-MD5 d6864c3920aa15110a6a75439d425bd3 dbus-1.0.1-r1.ebuild 3358
-RMD160 6f4831867a0b85d4dd307126105f2f670646d1e4 dbus-1.0.1-r1.ebuild 3358
-SHA256 6bedb502658d5d4616865d5f20af3630f54ff3365371377d49170a98a826a5e8 dbus-1.0.1-r1.ebuild 3358
-EBUILD dbus-1.0.1-r2.ebuild 3358 RMD160 450234f0d4b61ae0b326e65d3f6e75176eb71819 SHA1 b65d5150692acf0680fe2b667d014fc611b0ca18 SHA256 31859c32aac068a9b68a3c155fcd8545db809d7fff25dbc855716e1f7fce6791
-MD5 226b0a824c0b6cc8d4baef6c53fc664a dbus-1.0.1-r2.ebuild 3358
-RMD160 450234f0d4b61ae0b326e65d3f6e75176eb71819 dbus-1.0.1-r2.ebuild 3358
-SHA256 31859c32aac068a9b68a3c155fcd8545db809d7fff25dbc855716e1f7fce6791 dbus-1.0.1-r2.ebuild 3358
-EBUILD dbus-1.0.1.ebuild 3102 RMD160 7f706fe4e5562632013d37451659571e961bd345 SHA1 e1a8875ba5d2daba1d238252928eaa79eca6f9db SHA256 3d2184db88b553da8133f35cff021e5be306308b7a03a0167bb9aa0c15393d96
-MD5 c2c615188b6f44d24e189801d52eabc7 dbus-1.0.1.ebuild 3102
-RMD160 7f706fe4e5562632013d37451659571e961bd345 dbus-1.0.1.ebuild 3102
-SHA256 3d2184db88b553da8133f35cff021e5be306308b7a03a0167bb9aa0c15393d96 dbus-1.0.1.ebuild 3102
-MISC ChangeLog 23632 RMD160 e2ad0b98c53ff027e23f5eeda23e31738314896f SHA1 8ebcedc7d58607aeaea0c747dcb0e5f3761b7b36 SHA256 b2733f60f42121c99f9752e6e6caa3aa5e3ecef85a31887e3bfb8895c9408135
-MD5 4c99c94ffb06e54f4d605af2b82549ba ChangeLog 23632
-RMD160 e2ad0b98c53ff027e23f5eeda23e31738314896f ChangeLog 23632
-SHA256 b2733f60f42121c99f9752e6e6caa3aa5e3ecef85a31887e3bfb8895c9408135 ChangeLog 23632
+EBUILD dbus-1.0.2.ebuild 3257 RMD160 7b2d76da9c9b81cd80888dfd2e1fc0e864eff1f3 SHA1 f203f6dec6cc38fc7e8f9108888abba8b45c71d2 SHA256 d85bbe398560717ff5084988a9d221f3312a0f27add486a1ca135a0a53488fbb
+MD5 dbdbba227110346cc114e43b9cecd046 dbus-1.0.2.ebuild 3257
+RMD160 7b2d76da9c9b81cd80888dfd2e1fc0e864eff1f3 dbus-1.0.2.ebuild 3257
+SHA256 d85bbe398560717ff5084988a9d221f3312a0f27add486a1ca135a0a53488fbb dbus-1.0.2.ebuild 3257
+MISC ChangeLog 23990 RMD160 da7914efdb86ccf8a1b8a8b9b1fbb8ceb2c934a0 SHA1 17def06bb2ce6e87c9856da472b68db5404e9a4f SHA256 4ee9f4583cec546bbbc0251455a7f38ef216a1744a8b1d12f76a1fce72a3ce10
+MD5 99c5dc058cfad7371f98a92ffcc2639b ChangeLog 23990
+RMD160 da7914efdb86ccf8a1b8a8b9b1fbb8ceb2c934a0 ChangeLog 23990
+SHA256 4ee9f4583cec546bbbc0251455a7f38ef216a1744a8b1d12f76a1fce72a3ce10 ChangeLog 23990
 MISC metadata.xml 222 RMD160 cd880923dd3bbe29d863c21fdcc56700006a2bcc SHA1 d2b55bed5d827913edafe6777b37d03c352d9adf SHA256 3b1bdb4611693b7a059584a994f3760dce2f37a048d4c2c55c1756e17519e1cf
 MD5 d854e952b3179d33b2ece377ce9980f3 metadata.xml 222
 RMD160 cd880923dd3bbe29d863c21fdcc56700006a2bcc metadata.xml 222
@@ -83,12 +74,13 @@ SHA256 8ee10bf68b294a8eef518926360a7b538fa9dda198e47b1d9f6367b6de0cdbcd files/di
 MD5 e00700223b4c2566d3c5b60371b524ff files/digest-dbus-0.62-r1 232
 RMD160 020d50c35dbd8578464f56119db955bfb811d61c files/digest-dbus-0.62-r1 232
 SHA256 b249fe2b3ac0467d861e39cc171543bac5f489ec77b22ccf68b9ef09a8c68bbe files/digest-dbus-0.62-r1 232
-MD5 bab4ebd671999e500c31bd05e32fc296 files/digest-dbus-1.0.1 235
-RMD160 3429f1e05c33fc85515246a181c9fa3680258fdc files/digest-dbus-1.0.1 235
-SHA256 4cbf0ae7597954ff8a66c880022b416c7bc114a5075a130cb9da8c6de139cf0b files/digest-dbus-1.0.1 235
-MD5 bab4ebd671999e500c31bd05e32fc296 files/digest-dbus-1.0.1-r1 235
-RMD160 3429f1e05c33fc85515246a181c9fa3680258fdc files/digest-dbus-1.0.1-r1 235
-SHA256 4cbf0ae7597954ff8a66c880022b416c7bc114a5075a130cb9da8c6de139cf0b files/digest-dbus-1.0.1-r1 235
-MD5 bab4ebd671999e500c31bd05e32fc296 files/digest-dbus-1.0.1-r2 235
-RMD160 3429f1e05c33fc85515246a181c9fa3680258fdc files/digest-dbus-1.0.1-r2 235
-SHA256 4cbf0ae7597954ff8a66c880022b416c7bc114a5075a130cb9da8c6de139cf0b files/digest-dbus-1.0.1-r2 235
+MD5 497fe5e3a5dfd951a073118e2de14adb files/digest-dbus-1.0.2 235
+RMD160 a4e31868ed956d2fcdcd55cc71c7758d9d2bda8c files/digest-dbus-1.0.2 235
+SHA256 f398ccc18d90f59f55f826046878cb5dd08b0b1abe1c5fd016b6dacb54891b88 files/digest-dbus-1.0.2 235
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.6 (GNU/Linux)
+
+iD4DBQFFf0gEoeSe8B0zEfwRAv+3AJipYIt7QbOJK83eVva7Jc0luv0GAJ9ET2os
+eQu6vHBsVZQLZQhM698Y2w==
+=7zfy
+-----END PGP SIGNATURE-----
diff --git a/sys-apps/dbus/dbus-1.0.1-r1.ebuild b/sys-apps/dbus/dbus-1.0.1-r1.ebuild
deleted file mode 100644
index 7e33a2f71d0a..000000000000
--- a/sys-apps/dbus/dbus-1.0.1-r1.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# 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-1.0.1-r1.ebuild,v 1.2 2006/12/04 17:33:35 cardoe Exp $
-
-WANT_AUTOCONF=2.5
-inherit eutils multilib debug 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/dbus/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="|| ( GPL-2 AFL-2.1 )"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="doc selinux X"
-
-RDEPEND="X? ( x11-libs/libXt x11-libs/libX11 )
-	selinux? ( sys-libs/libselinux )
-	>=dev-libs/expat-1.95.8
-	!<sys-apps/dbus-0.91"
-
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	doc? (	app-doc/doxygen
-		app-text/xmlto )"
-
-src_unpack() {
-	unpack "${A}"
-	cd "${S}"
-
-	# fix assertion failure with pthreads
-	epatch "${FILESDIR}"/${PN}-1.0.1-pthread-holder-fix.diff
-
-	# fix dnotify issue with not detecting created files
-	epatch "${FILESDIR}"/${PN}-1.0.1-fixfilecreation.patch
-}
-
-src_compile() {
-	local myconf=""
-
-	hasq test ${FEATURES} && myconf="${myconf} --enable-tests=yes"
-
-	econf \
-		$(use_with X x) \
-		$(use_enable kernel_linux dnotify) \
-		$(use_enable kernel_FreeBSD kqueue) \
-		$(use_enable selinux) \
-		$(use_enable debug verbose-mode) \
-		$(use_enable debug asserts) \
-		--with-xml=expat \
-		--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 \
-		--localstatedir=/var \
-		$(use_enable doc doxygen-docs) \
-		--disable-xml-docs \
-		${myconf} \
-		|| die "econf failed"
-
-	# 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_test() {
-	DBUS_VERBOSE=1 make check || die "make check failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
-
-	# initscript
-	newinitd "${FILESDIR}"/dbus.init-1.0 dbus
-
-	# dbus X session script (#77504)
-	# turns out to only work for GDM. has been merged into other desktop
-	# (kdm and such scripts)
-	exeinto /etc/X11/xinit/xinitrc.d/
-	doexe "${FILESDIR}"/30-dbus
-
-	# needs to exist for the system socket
-	keepdir /var/run/dbus
-	# needs to exist for machine id
-	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
-	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_postinst() {
-	elog "To start the D-Bus system-wide messagebus by default"
-	elog "you should add it to the default runlevel :"
-	elog "\`rc-update add dbus default\`"
-	elog
-	elog "If dbus is already installed and running,"
-	elog "run etc-update and then run the following:"
-	elog "\`/etc/init.d/dbus reload\`"
-	elog "This will cause it to reload it's configs but"
-	elog "*not* run the newest version you just installed."
-	elog "You must tell it to restart for that to happen,"
-	elog "however not all apps can handle a D-Bus restart."
-	elog
-	ewarn
-	ewarn "You MUST run 'revdep-rebuild' after emerging this package"
-	ewarn
-}
diff --git a/sys-apps/dbus/dbus-1.0.1-r2.ebuild b/sys-apps/dbus/dbus-1.0.1-r2.ebuild
deleted file mode 100644
index 90aec7660373..000000000000
--- a/sys-apps/dbus/dbus-1.0.1-r2.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# 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-1.0.1-r2.ebuild,v 1.1 2006/12/04 17:33:35 cardoe Exp $
-
-WANT_AUTOCONF=2.5
-inherit eutils multilib debug 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/dbus/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="|| ( GPL-2 AFL-2.1 )"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="doc selinux X"
-
-RDEPEND="X? ( x11-libs/libXt x11-libs/libX11 )
-	selinux? ( sys-libs/libselinux )
-	>=dev-libs/expat-1.95.8
-	!<sys-apps/dbus-0.91"
-
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	doc? (	app-doc/doxygen
-		app-text/xmlto )"
-
-src_unpack() {
-	unpack "${A}"
-	cd "${S}"
-
-	# fix assertion failure with pthreads
-	epatch "${FILESDIR}"/${PN}-1.0.1-pthread-holder-fix.diff
-
-	# fix dnotify issue with not detecting created files
-	epatch "${FILESDIR}"/${PN}-1.0.1-fixfilecreation.patch
-}
-
-src_compile() {
-	local myconf=""
-
-	hasq test ${FEATURES} && myconf="${myconf} --enable-tests=yes"
-
-	econf \
-		$(use_with X x) \
-		$(use_enable kernel_linux dnotify) \
-		$(use_enable kernel_FreeBSD kqueue) \
-		$(use_enable selinux) \
-		$(use_enable debug verbose-mode) \
-		$(use_enable debug asserts) \
-		--with-xml=expat \
-		--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 \
-		--localstatedir=/var \
-		$(use_enable doc doxygen-docs) \
-		--disable-xml-docs \
-		${myconf} \
-		|| die "econf failed"
-
-	# 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_test() {
-	DBUS_VERBOSE=1 make check || die "make check failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
-
-	# initscript
-	newinitd "${FILESDIR}"/dbus.init-1.0 dbus
-
-	# dbus X session script (#77504)
-	# turns out to only work for GDM. has been merged into other desktop
-	# (kdm and such scripts)
-	exeinto /etc/X11/xinit/xinitrc.d/
-	doexe "${FILESDIR}"/30-dbus
-
-	# needs to exist for the system socket
-	keepdir /var/run/dbus
-	# needs to exist for machine id
-	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
-	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_postinst() {
-	elog "To start the D-Bus system-wide messagebus by default"
-	elog "you should add it to the default runlevel :"
-	elog "\`rc-update add dbus default\`"
-	elog
-	elog "If dbus is already installed and running,"
-	elog "run etc-update and then run the following:"
-	elog "\`/etc/init.d/dbus reload\`"
-	elog "This will cause it to reload it's configs but"
-	elog "*not* run the newest version you just installed."
-	elog "You must tell it to restart for that to happen,"
-	elog "however not all apps can handle a D-Bus restart."
-	elog
-	ewarn
-	ewarn "You MUST run 'revdep-rebuild' after emerging this package"
-	ewarn
-}
diff --git a/sys-apps/dbus/dbus-1.0.1.ebuild b/sys-apps/dbus/dbus-1.0.1.ebuild
deleted file mode 100644
index e9bef237d3c1..000000000000
--- a/sys-apps/dbus/dbus-1.0.1.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# 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-1.0.1.ebuild,v 1.2 2006/11/19 17:32:33 cardoe Exp $
-
-WANT_AUTOCONF=2.5
-inherit eutils multilib debug 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/dbus/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="|| ( GPL-2 AFL-2.1 )"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="doc selinux X"
-
-RDEPEND="X? ( x11-libs/libXt x11-libs/libX11 )
-	selinux? ( sys-libs/libselinux )
-	>=dev-libs/expat-1.95.8
-	!<sys-apps/dbus-0.91"
-
-DEPEND="${RDEPEND}
-	dev-util/pkgconfig
-	doc? (	app-doc/doxygen
-		app-text/xmlto )"
-
-src_compile() {
-	local myconf=""
-
-	hasq test ${FEATURES} && myconf="${myconf} --enable-tests=yes"
-
-	econf \
-		$(use_with X x) \
-		$(use_enable kernel_linux dnotify) \
-		$(use_enable kernel_FreeBSD kqueue) \
-		$(use_enable selinux) \
-		$(use_enable debug verbose-mode) \
-		$(use_enable debug asserts) \
-		--with-xml=expat \
-		--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 \
-		--localstatedir=/var \
-		$(use_enable doc doxygen-docs) \
-		--disable-xml-docs \
-		${myconf} \
-		|| die "econf failed"
-
-	# 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_test() {
-	DBUS_VERBOSE=1 make check || die "make check failed"
-}
-
-src_install() {
-	make DESTDIR="${D}" install || die "make install failed"
-
-	# initscript
-	newinitd "${FILESDIR}"/dbus.init-1.0 dbus
-
-	# dbus X session script (#77504)
-	# turns out to only work for GDM. has been merged into other desktop
-	# (kdm and such scripts)
-	exeinto /etc/X11/xinit/xinitrc.d/
-	doexe "${FILESDIR}"/30-dbus
-
-	# needs to exist for the system socket
-	keepdir /var/run/dbus
-	# needs to exist for machine id
-	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
-	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_postinst() {
-	elog "To start the D-Bus system-wide messagebus by default"
-	elog "you should add it to the default runlevel :"
-	elog "\`rc-update add dbus default\`"
-	elog
-	elog "If dbus is already installed and running,"
-	elog "run etc-update and then run the following:"
-	elog "\`/etc/init.d/dbus reload\`"
-	elog "This will cause it to reload it's configs but"
-	elog "*not* run the newest version you just installed."
-	elog "You must tell it to restart for that to happen,"
-	elog "however not all apps can handle a D-Bus restart."
-	elog
-	ewarn
-	ewarn "You MUST run 'revdep-rebuild' after emerging this package"
-	ewarn
-}
diff --git a/sys-apps/dbus/files/dbus-1.0.1-pthread-holder-fix.diff b/sys-apps/dbus/files/dbus-1.0.1-pthread-holder-fix.diff
deleted file mode 100644
index 4ac2260d3f37..000000000000
--- a/sys-apps/dbus/files/dbus-1.0.1-pthread-holder-fix.diff
+++ /dev/null
@@ -1,36 +0,0 @@
-Index: dbus-sysdeps-pthread.c
-===================================================================
-RCS file: /cvs/dbus/dbus/dbus/dbus-sysdeps-pthread.c,v
-retrieving revision 1.5
-diff -u -p -B -b -r1.5 dbus-sysdeps-pthread.c
---- dbus/dbus-sysdeps-pthread.c	28 Oct 2006 01:41:37 -0000	1.5
-+++ dbus/dbus-sysdeps-pthread.c	19 Nov 2006 12:40:47 -0000
-@@ -153,6 +153,7 @@ _dbus_pthread_mutex_lock (DBusMutex *mut
-         {
-           /* Wait for the lock */
-           PTHREAD_CHECK ("pthread_mutex_lock", pthread_mutex_lock (&pmutex->lock));
-+	  pmutex->holder = self;
-           _dbus_assert (pmutex->count == 0);
-         }
- 
-@@ -222,10 +223,11 @@ _dbus_pthread_condvar_wait (DBusCondVar 
-   _dbus_assert (pthread_equal (pmutex->holder, pthread_self ()));
- 
-   old_count = pmutex->count;
--  pmutex->count = 0;
-+  pmutex->count = 0;		/* allow other threads to lock */
-   PTHREAD_CHECK ("pthread_cond_wait", pthread_cond_wait (&pcond->cond, &pmutex->lock));
-   _dbus_assert (pmutex->count == 0);
-   pmutex->count = old_count;
-+  pmutex->holder = pthread_self(); /* other threads may have locked the mutex in the meantime */
- }
- 
- static dbus_bool_t
-@@ -264,6 +266,7 @@ _dbus_pthread_condvar_wait_timeout (DBus
- 
-   _dbus_assert (pmutex->count == 0);
-   pmutex->count = old_count;
-+  pmutex->holder = pthread_self(); /* other threads may have locked the mutex in the meantime */
-   
-   /* return true if we did not time out */
-   return result != ETIMEDOUT;
diff --git a/sys-apps/dbus/files/digest-dbus-1.0.1 b/sys-apps/dbus/files/digest-dbus-1.0.1
deleted file mode 100644
index 7660510d0186..000000000000
--- a/sys-apps/dbus/files/digest-dbus-1.0.1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 52c70d18fe0b398f5de3b8a18a589960 dbus-1.0.1.tar.gz 1406595
-RMD160 2270f27d9314f0e7b99540f0aa1902b8d0d7343d dbus-1.0.1.tar.gz 1406595
-SHA256 6e0730a39485fb502d640841f0f328c1a0212743f17b3fa61c78e6e32925f061 dbus-1.0.1.tar.gz 1406595
diff --git a/sys-apps/dbus/files/digest-dbus-1.0.1-r1 b/sys-apps/dbus/files/digest-dbus-1.0.1-r1
deleted file mode 100644
index 7660510d0186..000000000000
--- a/sys-apps/dbus/files/digest-dbus-1.0.1-r1
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 52c70d18fe0b398f5de3b8a18a589960 dbus-1.0.1.tar.gz 1406595
-RMD160 2270f27d9314f0e7b99540f0aa1902b8d0d7343d dbus-1.0.1.tar.gz 1406595
-SHA256 6e0730a39485fb502d640841f0f328c1a0212743f17b3fa61c78e6e32925f061 dbus-1.0.1.tar.gz 1406595
diff --git a/sys-apps/dbus/files/digest-dbus-1.0.1-r2 b/sys-apps/dbus/files/digest-dbus-1.0.1-r2
deleted file mode 100644
index 7660510d0186..000000000000
--- a/sys-apps/dbus/files/digest-dbus-1.0.1-r2
+++ /dev/null
@@ -1,3 +0,0 @@
-MD5 52c70d18fe0b398f5de3b8a18a589960 dbus-1.0.1.tar.gz 1406595
-RMD160 2270f27d9314f0e7b99540f0aa1902b8d0d7343d dbus-1.0.1.tar.gz 1406595
-SHA256 6e0730a39485fb502d640841f0f328c1a0212743f17b3fa61c78e6e32925f061 dbus-1.0.1.tar.gz 1406595