Clean up old revisions, notably for security issues, bug #271769.

(Portage version: 2.2_rc33/cvs/Linux x86_64)

9 files changed, 9 insertions, 646 deletions

diff --git a/sys-apps/dbus/ChangeLog b/sys-apps/dbus/ChangeLog
index afe4002b65bc..e49342435073 100644
--- a/sys-apps/dbus/ChangeLog
+++ b/sys-apps/dbus/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-apps/dbus
-# Copyright 2000-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/ChangeLog,v 1.234 2009/04/23 05:46:44 nirbheek Exp $
+# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/ChangeLog,v 1.235 2009/07/26 11:13:49 eva Exp $
+
+  26 Jul 2009; Gilles Dartiguelongue <eva@gentoo.org>
+  -files/dbus-1.0.1-fixfilecreation.patch, -dbus-1.0.2-r2.ebuild,
+  -dbus-1.1.4.ebuild, -files/dbus-1.1.4-xdisplay_null.patch,
+  -dbus-1.1.20.ebuild, -files/dbus-1.1.20-fix-build.patch,
+  -dbus-1.2.1.ebuild, -dbus-1.2.3.ebuild:
+  Clean up old revisions, notably for security issues, bug #271769.
 
   23 Apr 2009; Nirbheek Chauhan <nirbheek@gentoo.org> dbus-1.2.12:
   Fix bug 267125 (murphy's law causes a two-character change before cvs
diff --git a/sys-apps/dbus/dbus-1.0.2-r2.ebuild b/sys-apps/dbus/dbus-1.0.2-r2.ebuild
deleted file mode 100644
index a5b9f83fce11..000000000000
--- a/sys-apps/dbus/dbus-1.0.2-r2.ebuild
+++ /dev/null
@@ -1,122 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/dbus-1.0.2-r2.ebuild,v 1.17 2008/10/06 00:55:51 steev Exp $
-
-inherit eutils multilib flag-o-matic
-
-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"
-
-LICENSE="|| ( GPL-2 AFL-2.1 )"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 mips ppc ppc64 s390 sh sparc ~sparc-fbsd x86 ~x86-fbsd"
-IUSE="debug doc selinux X kernel_linux kernel_FreeBSD"
-
-RDEPEND="X? ( x11-libs/libXt x11-libs/libX11 )
-	selinux? ( sys-libs/libselinux
-				sec-policy/selinux-dbus )
-	>=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 dnotify issue with not detecting created files
-	epatch "${FILESDIR}"/${PN}-1.0.1-fixfilecreation.patch
-}
-
-src_compile() {
-	# so we can get backtraces from apps
-	append-flags -rdynamic
-
-	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)
-	if use X ; then
-		exeinto /etc/X11/xinit/xinitrc.d/
-		doexe "${FILESDIR}"/30-dbus
-	fi
-
-	# 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
-	keepdir /etc/dbus-1/system.d/
-
-	dodoc AUTHORS ChangeLog HACKING NEWS README doc/TODO
-	if use doc; then
-		dohtml doc/*html
-	fi
-}
-
-pkg_preinst() {
-	enewgroup messagebus
-	enewuser messagebus -1 "-1" -1 messagebus
-}
-
-pkg_postinst() {
-	# ensure we create the machine uuid here for people that don't use the
-	# system bus so it would never get created otherwise
-	if [[ ${ROOT} == "/" ]] ; then
-		/usr/bin/dbus-uuidgen --ensure
-	fi
-
-	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 "Some applications require a session bus in addition to the system"
-	elog "bus. Please see \`man dbus-launch\` for more information."
-	elog
-	ewarn
-	ewarn "You MUST run 'revdep-rebuild' after emerging this package"
-	ewarn
-}
diff --git a/sys-apps/dbus/dbus-1.1.20.ebuild b/sys-apps/dbus/dbus-1.1.20.ebuild
deleted file mode 100644
index 11ec0736c957..000000000000
--- a/sys-apps/dbus/dbus-1.1.20.ebuild
+++ /dev/null
@@ -1,125 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/dbus-1.1.20.ebuild,v 1.11 2008/10/06 00:55:51 steev Exp $
-
-inherit eutils multilib flag-o-matic
-
-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"
-
-LICENSE="|| ( GPL-2 AFL-2.1 )"
-SLOT="0"
-KEYWORDS="alpha amd64 arm hppa ia64 ~mips ppc ppc64 s390 sh sparc x86 ~x86-fbsd"
-IUSE="debug doc selinux X"
-
-RDEPEND="X? ( x11-libs/libXt x11-libs/libX11 )
-	selinux? ( sys-libs/libselinux
-				sec-policy/selinux-dbus )
-	>=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}"
-	# Patch to fix building without X useflag
-	epatch "${FILESDIR}/${P}-fix-build.patch"
-}
-
-src_compile() {
-	# so we can get backtraces from apps
-	append-flags -rdynamic
-
-	local myconf=""
-
-	hasq test ${FEATURES} && myconf="${myconf} --enable-tests=yes"
-	# libaudit is *only* used in DBus wrt SELinux support, so disable it, if
-	# not on an SELinux profile.
-	econf \
-		$(use_with X x) \
-		$(use_enable kernel_linux inotify) \
-		$(use_enable kernel_FreeBSD kqueue) \
-		$(use_enable selinux) \
-		$(use_enable selinux libaudit)	\
-		$(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() {
-	emake 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
-	# needs to exist for dbus sessions to launch
-
-	keepdir /usr/lib/dbus-1.0/services
-	keepdir /usr/share/dbus-1/services
-	keepdir /etc/dbus-1/system.d/
-	keepdir /etc/dbus-1/session.d/
-
-	dodoc AUTHORS ChangeLog HACKING NEWS README doc/TODO
-	if use doc; then
-		dohtml doc/*html
-	fi
-}
-
-pkg_preinst() {
-	enewgroup messagebus
-	enewuser messagebus -1 "-1" -1 messagebus
-}
-
-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 "Some applications require a session bus in addition to the system"
-	elog "bus. Please see \`man dbus-launch\` for more information."
-	elog
-	elog
-	ewarn "You MUST run 'revdep-rebuild' after emerging this package"
-	elog
-	ewarn "If you are currently running X with the hal useflag enabled"
-	ewarn "restarting the dbus service WILL restart X as well"
-	ebeep 5
-	elog
-	ewarn "You must restart D-Bus \`/etc/init.d/dbus restart\` to run"
-	ewarn "the new version of the daemon. For many people, this means"
-	ewarn "exiting X as well."
-
-}
diff --git a/sys-apps/dbus/dbus-1.1.4.ebuild b/sys-apps/dbus/dbus-1.1.4.ebuild
deleted file mode 100644
index 9b60140ffc78..000000000000
--- a/sys-apps/dbus/dbus-1.1.4.ebuild
+++ /dev/null
@@ -1,124 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/dbus-1.1.4.ebuild,v 1.8 2008/10/06 00:55:51 steev Exp $
-
-inherit eutils multilib flag-o-matic
-
-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"
-
-LICENSE="|| ( GPL-2 AFL-2.1 )"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="debug doc selinux X"
-
-RDEPEND="X? ( x11-libs/libXt x11-libs/libX11 )
-	selinux? ( sys-libs/libselinux
-				sec-policy/selinux-dbus )
-	>=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}"
-	# Patch that *should* fix dbus-launch hanging around after exiting X
-	if use X ; then
-		epatch "${FILESDIR}/${PN}-1.1.4-xdisplay_null.patch"
-	fi
-}
-
-src_compile() {
-	# so we can get backtraces from apps
-	append-flags -rdynamic
-
-	local myconf=""
-
-	hasq test ${FEATURES} && myconf="${myconf} --enable-tests=yes"
-	# libaudit is *only* used in DBus wrt SELinux support, so disable it, if
-	# not on an SELinux profile.
-	econf \
-		$(use_with X x) \
-		$(use_enable kernel_linux inotify) \
-		$(use_enable kernel_FreeBSD kqueue) \
-		$(use_enable selinux) \
-		$(use_enable selinux libaudit)	\
-		$(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() {
-	emake 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
-	# needs to exist for dbus sessions to launch
-
-	keepdir /usr/lib/dbus-1.0/services
-	keepdir /usr/share/dbus-1/services
-	keepdir /etc/dbus-1/system.d/
-	keepdir /etc/dbus-1/session.d/
-
-	dodoc AUTHORS ChangeLog HACKING NEWS README doc/TODO
-	if use doc; then
-		dohtml doc/*html
-	fi
-}
-
-pkg_preinst() {
-	enewgroup messagebus
-	enewuser messagebus -1 "-1" -1 messagebus
-}
-
-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 "Some applications require a session bus in addition to the system"
-	elog "bus. Please see \`man dbus-launch\` for more information."
-	elog
-	ewarn
-	ewarn "You MUST run 'revdep-rebuild' after emerging this package"
-	elog  "If you notice any issues, please rebuild sys-apps/hal"
-	ewarn
-	ewarn "If you are currently running X with the hal useflag enabled"
-	ewarn "restarting the dbus service WILL restart X as well"
-	ebeep 5
-	ewarn
-}
diff --git a/sys-apps/dbus/dbus-1.2.1.ebuild b/sys-apps/dbus/dbus-1.2.1.ebuild
deleted file mode 100644
index d7b927790032..000000000000
--- a/sys-apps/dbus/dbus-1.2.1.ebuild
+++ /dev/null
@@ -1,118 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/dbus-1.2.1.ebuild,v 1.2 2008/10/06 00:55:51 steev Exp $
-
-inherit eutils multilib flag-o-matic
-
-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"
-
-LICENSE="|| ( GPL-2 AFL-2.1 )"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~x86-fbsd"
-IUSE="debug doc selinux X"
-
-RDEPEND="X? ( x11-libs/libXt x11-libs/libX11 )
-	selinux? ( sys-libs/libselinux
-				sec-policy/selinux-dbus )
-	>=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() {
-	# so we can get backtraces from apps
-	append-flags -rdynamic
-
-	local myconf=""
-
-	hasq test ${FEATURES} && myconf="${myconf} --enable-tests=yes"
-	# libaudit is *only* used in DBus wrt SELinux support, so disable it, if
-	# not on an SELinux profile.
-	econf \
-		$(use_with X x) \
-		$(use_enable kernel_linux inotify) \
-		$(use_enable kernel_FreeBSD kqueue) \
-		$(use_enable selinux) \
-		$(use_enable selinux libaudit)	\
-		$(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() {
-	emake 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
-	# needs to exist for dbus sessions to launch
-
-	keepdir /usr/lib/dbus-1.0/services
-	keepdir /usr/share/dbus-1/services
-	keepdir /etc/dbus-1/system.d/
-	keepdir /etc/dbus-1/session.d/
-
-	dodoc AUTHORS ChangeLog HACKING NEWS README doc/TODO
-	if use doc; then
-		dohtml doc/*html
-	fi
-}
-
-pkg_preinst() {
-	enewgroup messagebus
-	enewuser messagebus -1 "-1" -1 messagebus
-}
-
-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 "Some applications require a session bus in addition to the system"
-	elog "bus. Please see \`man dbus-launch\` for more information."
-	elog
-	elog
-	ewarn "You MUST run 'revdep-rebuild' after emerging this package"
-	elog
-	ewarn "If you are currently running X with the hal useflag enabled"
-	ewarn "restarting the dbus service WILL restart X as well"
-	ebeep 5
-	elog
-	ewarn "You must restart D-Bus \`/etc/init.d/dbus restart\` to run"
-	ewarn "the new version of the daemon. For many people, this means"
-	ewarn "exiting X as well."
-
-}
diff --git a/sys-apps/dbus/dbus-1.2.3.ebuild b/sys-apps/dbus/dbus-1.2.3.ebuild
deleted file mode 100644
index 7c998d01033a..000000000000
--- a/sys-apps/dbus/dbus-1.2.3.ebuild
+++ /dev/null
@@ -1,118 +0,0 @@
-# Copyright 1999-2008 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/dbus-1.2.3.ebuild,v 1.4 2008/12/07 10:15:57 vapier Exp $
-
-inherit eutils multilib flag-o-matic
-
-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"
-
-LICENSE="|| ( GPL-2 AFL-2.1 )"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 arm ~hppa ~ia64 ~mips ~ppc ~ppc64 s390 sh ~sparc ~x86 -x86-fbsd"
-IUSE="debug doc selinux X"
-
-RDEPEND="X? ( x11-libs/libXt x11-libs/libX11 )
-	selinux? ( sys-libs/libselinux
-				sec-policy/selinux-dbus )
-	>=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() {
-	# so we can get backtraces from apps
-	append-flags -rdynamic
-
-	local myconf=""
-
-	hasq test ${FEATURES} && myconf="${myconf} --enable-tests=yes"
-	# libaudit is *only* used in DBus wrt SELinux support, so disable it, if
-	# not on an SELinux profile.
-	econf \
-		$(use_with X x) \
-		$(use_enable kernel_linux inotify) \
-		$(use_enable kernel_FreeBSD kqueue) \
-		$(use_enable selinux) \
-		$(use_enable selinux libaudit)	\
-		$(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() {
-	emake 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
-	# needs to exist for dbus sessions to launch
-
-	keepdir /usr/lib/dbus-1.0/services
-	keepdir /usr/share/dbus-1/services
-	keepdir /etc/dbus-1/system.d/
-	keepdir /etc/dbus-1/session.d/
-
-	dodoc AUTHORS ChangeLog HACKING NEWS README doc/TODO
-	if use doc; then
-		dohtml doc/*html
-	fi
-}
-
-pkg_preinst() {
-	enewgroup messagebus
-	enewuser messagebus -1 "-1" -1 messagebus
-}
-
-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 "Some applications require a session bus in addition to the system"
-	elog "bus. Please see \`man dbus-launch\` for more information."
-	elog
-	elog
-	ewarn "You MUST run 'revdep-rebuild' after emerging this package"
-	elog
-	ewarn "If you are currently running X with the hal useflag enabled"
-	ewarn "restarting the dbus service WILL restart X as well"
-	ebeep 5
-	elog
-	ewarn "You must restart D-Bus \`/etc/init.d/dbus restart\` to run"
-	ewarn "the new version of the daemon. For many people, this means"
-	ewarn "exiting X as well."
-
-}
diff --git a/sys-apps/dbus/files/dbus-1.0.1-fixfilecreation.patch b/sys-apps/dbus/files/dbus-1.0.1-fixfilecreation.patch
deleted file mode 100644
index 0dabf2cc68cd..000000000000
--- a/sys-apps/dbus/files/dbus-1.0.1-fixfilecreation.patch
+++ /dev/null
@@ -1,11 +0,0 @@
---- dbus-1.0.0/bus/dir-watch-dnotify.c.fixfilecreation	2006-11-22 14:24:01.000000000 +0100
-+++ dbus-1.0.0/bus/dir-watch-dnotify.c	2006-11-22 14:26:06.000000000 +0100
-@@ -57,7 +57,7 @@
-       goto out;
-     }
- 
--  if (fcntl (fd, F_NOTIFY, DN_DELETE|DN_RENAME|DN_MODIFY) == -1)
-+  if (fcntl (fd, F_NOTIFY, DN_CREATE|DN_DELETE|DN_RENAME|DN_MODIFY) == -1)
-     {
-       _dbus_warn ("Cannot setup D_NOTIFY for '%s' error '%s'\n", dir, _dbus_strerror (errno));
-       close (fd);
diff --git a/sys-apps/dbus/files/dbus-1.1.20-fix-build.patch b/sys-apps/dbus/files/dbus-1.1.20-fix-build.patch
deleted file mode 100644
index 87e810646c4e..000000000000
--- a/sys-apps/dbus/files/dbus-1.1.20-fix-build.patch
+++ /dev/null
@@ -1,14 +0,0 @@
-diff --git a/tools/dbus-launch.c b/tools/dbus-launch.c
-index 5d6e77e..6a10ffa 100644
---- a/tools/dbus-launch.c
-+++ b/tools/dbus-launch.c
-@@ -966,7 +966,9 @@ main (int argc, char **argv)
-       char write_pid_fd_as_string[MAX_FD_LEN];
-       char write_address_fd_as_string[MAX_FD_LEN];
- 
-+#ifdef DBUS_BUILD_X11
-       xdisplay = NULL;
-+#endif
- 
-       if (close_stderr)
- 	do_close_stderr ();
diff --git a/sys-apps/dbus/files/dbus-1.1.4-xdisplay_null.patch b/sys-apps/dbus/files/dbus-1.1.4-xdisplay_null.patch
deleted file mode 100644
index 5fa174172494..000000000000
--- a/sys-apps/dbus/files/dbus-1.1.4-xdisplay_null.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -ruN dbus-1.1.4.orig/tools/dbus-launch.c dbus-1.1.4/tools/dbus-launch.c
---- dbus-1.1.4.orig/tools/dbus-launch.c	2008-02-05 08:53:15.000000000 -0600
-+++ dbus-1.1.4/tools/dbus-launch.c	2008-02-05 08:54:04.000000000 -0600
-@@ -966,6 +966,8 @@
-       char write_pid_fd_as_string[MAX_FD_LEN];
-       char write_address_fd_as_string[MAX_FD_LEN];
- 
-+      xdisplay = NULL;
-+
-       if (close_stderr)
- 	do_close_stderr ();
-