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

Package-Manager: portage-2.2_rc33/cvs/Linux x86_64

10 files changed, 20 insertions, 659 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/Manifest b/sys-apps/dbus/Manifest
index cc924f2653b8..6c8bae84add2 100644
--- a/sys-apps/dbus/Manifest
+++ b/sys-apps/dbus/Manifest
@@ -1,22 +1,20 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
 AUX 30-dbus 243 RMD160 b5e7a813cd5d91f2ea60bb22260e432cbfb72fd9 SHA1 35ee3a5d3db9c7e372603ce916e17a41edd01d36 SHA256 a8e8fec9769cc5d46df8216f7d1e1f9df422c4e46f293fd70d4b017fb01d959d
-AUX dbus-1.0.1-fixfilecreation.patch 474 RMD160 63e1a6737519773dc85b64098577a97bae7ef6cc SHA1 a4748d3db24f425bd8ed2409bf225d01ced11640 SHA256 183ec284a385b3ef724abbcebd10e42765d81212d23e269c473fb3772f9ab2a3
-AUX dbus-1.1.20-fix-build.patch 392 RMD160 4a5f6d9ce7a4f8a8c3103c38dccfbf27a8383f2c SHA1 fdb4e94f7e0d58adea87412735ad1e955c780888 SHA256 78e3b41665daa172ff0f946db8d2c55d3c8dcad762733a2fba4ed6d7fcd29768
-AUX dbus-1.1.4-xdisplay_null.patch 421 RMD160 4be7aee34fc20c6d871e803b57e21e281af5bee5 SHA1 39464d340e56cafeeab96aa14881ce44a05c8e98 SHA256 176c826865d6479b37fc45879075ac2c7e810750fd78c7f1dffbd9e0082903e3
 AUX dbus-1.2.3-bsd.patch 1638 RMD160 9a134c5e1ccc1215d0579a02568a5707ad39e484 SHA1 061787f8131f33ccf07f11e04e6a327372de1c69 SHA256 0428d70451344153c6bf44f12d04fb7732070abf44d0d162ad995de5a9a24f1e
 AUX dbus-1.2.3-panic-from-dbus_signature_validate.patch 1064 RMD160 a7a587fb604f94f8d064c21d0adfae080edc1a80 SHA1 309faf628e3a207985c79afd2789b8cce696eed6 SHA256 455e2834b71878b3ea1ff9f0b678c8890b2c25f0c309c96c4a8e5551e23bca68
 AUX dbus.init-1.0 1152 RMD160 f0f409b59167beef2e2b8c14f701fbeaa54c3bc9 SHA1 b00e23868046c67eaec87220e92ffcea5d9dd911 SHA256 a2e13a025faa488ff35521188c0d44909bc82c55e8676a24a5a5179545303d98
-DIST dbus-1.0.2.tar.gz 1400278 RMD160 d5eddfb058c4c026d4a9f091ad90abcc6e54861a SHA1 2870efd6ea0b5b0d14e52195f560238a74bb1e0e SHA256 8a004125f58512a69575f21f105aead0d1217fce9cb54cbafeac06b4be28c6ca
-DIST dbus-1.1.20.tar.gz 1401902 RMD160 da06f0fca2e83e9ea3af6fa14045a69b97435221 SHA1 fff5db438483e6b4a3c40d430b20baa49ad2d58a SHA256 6f1fca18af9214e896c5c0a11f94fe05a0345c641ed57da886a93a4e3b33147e
-DIST dbus-1.1.4.tar.gz 1400585 RMD160 22d08a6c00ac3cd0bcf97d7733f39af36bcbfb0b SHA1 f246dfbc7dadb8a11a413f3376fdcd22e52eb1e4 SHA256 4f8ff9324a5d363833833333193a3e83c074a51ce82d8c66c2e304b0378c714d
-DIST dbus-1.2.1.tar.gz 1406833 RMD160 88b20e16251e10e205fece57e6b434a7aa43b615 SHA1 2c5b38d51b486e0143faf7749d298e07a8c71223 SHA256 8016540602189e1dca6aca6b7c0735706387e4f85ced75217c6a874980fd0e86
 DIST dbus-1.2.12.tar.gz 1574756 RMD160 779d76320f1343dae7447c82a683e372e6c11729 SHA1 13de8dc28c9edae7b9d2928ff691549bb2bef21a SHA256 b2ec81e7d9fa5e24f67baccfd9af2755a7797a65cb4c3cad10d023867f2bd220
 DIST dbus-1.2.3.tar.gz 1564475 RMD160 d1a207b2a4c744f27c9c01388e80cebdb61f43f0 SHA1 ceb8d496bc1a9c2dcdbe559515c01ec9c0cdcf81 SHA256 16ffaa4a8758f115cf02c78962b0849ed4d802872420fd460c433a9cd580ed1a
-EBUILD dbus-1.0.2-r2.ebuild 3315 RMD160 897430a26b2941864b9c147e7985ae0409ba7a9f SHA1 13dab850ec95a6bf04c80b2f176311f0837bad7c SHA256 9cdf0b987b6d5deb276272a7f746d2c303f3679ed8bcd14427aa336fedb24f4c
-EBUILD dbus-1.1.20.ebuild 3554 RMD160 6bcace0ca9b1bf5d4e1ff29d052757bc16205d1a SHA1 d25cd168bf6900e613a6c689708ae5d00fb23f78 SHA256 2ac1868bc5351b93c4159380b11ace2c34d6dac1ec23238839c337d6fddfcc97
-EBUILD dbus-1.1.4.ebuild 3524 RMD160 c1fd3577e80662406576e15e2e855844ed31ac9d SHA1 1f5f6a102163366660a0de6b5c34dda72470c8fc SHA256 f33d61b23351f541248d96a226d129ab32a30c563906e16c831495d070c10ba1
-EBUILD dbus-1.2.1.ebuild 3435 RMD160 8e1e26000f4756ceeca42c6122404072cfa1dffb SHA1 1c69fb0086b47831a9a76574781f1b3345570283 SHA256 b3c727a597ee5aa3d34b0317bfe07f197e884b0e21295d31c0627f6a349d5232
 EBUILD dbus-1.2.12.ebuild 3858 RMD160 e690a95d18c1b003f0555cd2ef59ae98aad7b16d SHA1 3aa70b1e08b7ac672fcf407755b4ab45e988f9d7 SHA256 507833339197a3b9fef81ef513be658f616a3d38e5a9b924cc24e332daa0121e
 EBUILD dbus-1.2.3-r1.ebuild 3752 RMD160 dc66d0b29adcde506e40b3240f4e19144f3ed159 SHA1 fc9c2db2f73605fbcc2807ee0bd886e86f8bb93d SHA256 09c62bdce60af40e79f88f6bc7110867f6f6d051b08aa5ed585a10570beeb2fc
-EBUILD dbus-1.2.3.ebuild 3433 RMD160 b1df4ee5dd0a0d158219d5b14e6149ea5e93660c SHA1 4436f736daf11501ffcf1d2a3ce77e890fe6f73c SHA256 77aa47cc1c15755f0f599da490157313aff699ea8e63e044c1dff6f048261395
-MISC ChangeLog 35007 RMD160 403e09d68f8d21e3ebea34c9f574021d04cb0113 SHA1 dc728df197afa535b83a2eb23905ea6ce217d97b SHA256 4f6a0cfd6bb0e214571a9e1922ab87c117ac465d2f19097aa5ae4493a591231c
+MISC ChangeLog 35353 RMD160 b8608ba1cadb8d15dbb391105a5f083786bda275 SHA1 e7dbcd9048d065051cf003a7238cb97850ea30f1 SHA256 9b9c3777c5fb9edb628a5a65895ae217e14d64d0f6d0d9b05fb267560b769eac
 MISC metadata.xml 285 RMD160 a557848c4782030e9eeb3dc1f06d98840ad7f73a SHA1 e0ba318a0e1a819cc360ea98cc3477dcf52a1526 SHA256 f0df8a3ebe8d22c87645cf66ed8c50c4e64ded6ad1e279e9912cb5074feb5a82
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.11 (GNU/Linux)
+
+iEYEARECAAYFAkpsOnMACgkQ1fmVwcYIWAZ00gCdHbWkxbFSChBHf8yWW2CHMAPo
+A1YAnjv+6djewHY0TH+bS5uJmCQc6Euw
+=xkjc
+-----END PGP SIGNATURE-----
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 ();
-