punt prerels

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

6 files changed, 0 insertions, 631 deletions

diff --git a/sys-apps/dbus/Manifest b/sys-apps/dbus/Manifest
index 879cc2d4777e..fc3c811f745d 100644
--- a/sys-apps/dbus/Manifest
+++ b/sys-apps/dbus/Manifest
@@ -1,19 +1,13 @@
 AUX 30-dbus 243 RMD160 b5e7a813cd5d91f2ea60bb22260e432cbfb72fd9 SHA1 35ee3a5d3db9c7e372603ce916e17a41edd01d36 SHA256 a8e8fec9769cc5d46df8216f7d1e1f9df422c4e46f293fd70d4b017fb01d959d
 AUX 80-dbus 341 RMD160 3b7f55906289d91a1f0ed87edec7902ddac076c5 SHA1 df1f96934fbe164dc4f4e2e4d4b4cdeaf8cef2b5 SHA256 76ce25ce8769cdfcb0d7b7e52e5a7e6474448fc34e8ad9393afac1eca1e07fd2
 AUX dbus-1.2.24-thread-safety.patch 14117 RMD160 5333f686b14ac911bca8d4ade056d3afb7987421 SHA1 e69219e91516ca9d61cb6b88e9c84429839d79bb SHA256 dad08d5821a14ab7a40443045525cf3ef9a417b9195711956d563d843d0847b4
-AUX dbus-1.3.0-asneeded.patch 3655 RMD160 31d3eef602d1d95adfe548285e00c25699f5d027 SHA1 52a3b43fbc2596b2b05fabdd146e5afea9318c24 SHA256 02731d3576eea22a8596267dd7b96bc59980e5f74fdd87c96317843b5936b2af
-AUX dbus-1.3.0-no-cloexec.patch 578 RMD160 74403299da1ab2224738cd9770462cf5e1d037ee SHA1 5ff5856e4fc1a10bcdd841e2c0650e417badade6 SHA256 aba67f8431dd66619c0f6105b99fc887d0b0da90f86765ef56eb1919d822249e
 AUX dbus-1.4.0-asneeded.patch 4106 RMD160 acf22d2084cfa62de8a3fc0a4d2c71686fb44e1a SHA1 b175e1d81b8574994bd646024abbc6da53ce1dc5 SHA256 e5b4b0ceed3e069f142fb94be0466e5e802944d3187c285ed685aaf1e6d97509
 AUX dbus.init-1.0 1152 RMD160 f0f409b59167beef2e2b8c14f701fbeaa54c3bc9 SHA1 b00e23868046c67eaec87220e92ffcea5d9dd911 SHA256 a2e13a025faa488ff35521188c0d44909bc82c55e8676a24a5a5179545303d98
 DIST dbus-1.2.24.tar.gz 1673774 RMD160 2f51def784056bc16fbec2ddc3be22c022a94fb5 SHA1 9593717348ea36ba228b46f165bb67c127c12be8 SHA256 f12c748f4a703655e3d4c3db94cdf5a752a0cd0b36958c715804373bd3595c48
-DIST dbus-1.3.0.tar.gz 1517408 RMD160 ed823727c11a437e9a0d548b9c3d92a8fd4d386b SHA1 ebd23c65ebf5448efc6367da1414de212db38055 SHA256 fe32b49667894cf91b0a97503163be5c4814ecf67259e8feb26d1ba57cb03dae
 DIST dbus-1.4.0.tar.gz 1800347 RMD160 e3d44208f39d7c4a1bf916527dc121d3097a82d0 SHA1 4be3281005a9ef8f521f5547128c29a2632cb1d7 SHA256 c96d2f86d40e158e2bf405925a0a42cce0533a8466098e2f2238aa1614926652
 EBUILD dbus-1.2.24-r1.ebuild 3707 RMD160 811ff2f77ab26cf12cb3aabfbf4ff5caba283bf1 SHA1 66e8910d474d93523c4b43ca490ef62b5dece465 SHA256 b790060d03e5855ff3bdb2551de82859418e0a43be05098238a138715f515a73
 EBUILD dbus-1.2.24-r2.ebuild 4675 RMD160 3878f1edd150a5faebb5cd11424b6475e40f973b SHA1 aa23bc36f4aadb49a09e40e43586dc98d2373029 SHA256 6219b5c8e9ec336c3f6558945a7e4f789509f8f171c1b085b1de3aac83c1b5ad
 EBUILD dbus-1.2.24.ebuild 3679 RMD160 5d4063a79bddee8c3963d68487862bf3638acf0d SHA1 26f2043c6a5d92a567fc92b8dfcba1e6eeee7d09 SHA256 897662b0d33783ef5876b3db04739964d2425f5d24d6242f8ad9ab1680b421bc
-EBUILD dbus-1.3.0-r1.ebuild 4754 RMD160 5f261acbe477250af12fa0b76afcb77633680788 SHA1 aa13343c6a4042f500ee9d8cbffc5b5b60249dd8 SHA256 a0706084f2b840cf18a83e1ad3a685989991275e9429b846f2e4fbc60b06f7f6
-EBUILD dbus-1.3.0-r2.ebuild 4762 RMD160 00b94733ac9084930bdf149179db2b01d8007f4c SHA1 00bb61039a755b56360fb1a85762ded75d40bf46 SHA256 b144cf5436708831f86b133a2bf5e6f719b248be3925bebc3938e24a930cca58
-EBUILD dbus-1.3.0-r3.ebuild 4966 RMD160 2022524010dbc1eab69c0a0e4b0db811a2a0448f SHA1 8ba99da52a85ca69d0297f5a2017ff634a91d183 SHA256 7b658c681da0ce86b5ba4c844d338d28c286fbfde26e955bd0924f9d652da9de
 EBUILD dbus-1.4.0.ebuild 5057 RMD160 96c3fc2555f6f07ecd3f883c5965cce6e7705225 SHA1 f0263d18d14edbc0a8b18ed1d5a3ee95b2aa37a2 SHA256 38c06d04b2779e5320fb06be23c6616c4aa0a5ba1b39a2867c7ecfa76afecb9c
 MISC ChangeLog 40607 RMD160 025754d249d12a363a79f4abb4f8eecbb14ea271 SHA1 c7c5b630ce8906d29f772323f017e63624df6afa SHA256 f630bef514870f2fab527a6761cadbad65e99a1e0be6fc18c9bd928e8fbf1c5f
 MISC metadata.xml 285 RMD160 a557848c4782030e9eeb3dc1f06d98840ad7f73a SHA1 e0ba318a0e1a819cc360ea98cc3477dcf52a1526 SHA256 f0df8a3ebe8d22c87645cf66ed8c50c4e64ded6ad1e279e9912cb5074feb5a82
diff --git a/sys-apps/dbus/dbus-1.3.0-r1.ebuild b/sys-apps/dbus/dbus-1.3.0-r1.ebuild
deleted file mode 100644
index 5b29b47a5372..000000000000
--- a/sys-apps/dbus/dbus-1.3.0-r1.ebuild
+++ /dev/null
@@ -1,171 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/dbus-1.3.0-r1.ebuild,v 1.5 2010/04/20 11:36:30 ssuominen Exp $
-
-EAPI="2"
-
-inherit autotools 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 test 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
-		app-text/docbook-xml-dtd:4.1.2 )"
-
-# out of sources build directory
-BD=${WORKDIR}/${P}-build
-# out of sources build dir for make check
-TBD=${WORKDIR}/${P}-tests-build
-
-pkg_setup() {
-	enewgroup messagebus
-	enewuser messagebus -1 "-1" -1 messagebus
-}
-
-src_prepare() {
-	# Remove CFLAGS that is not supported by all gcc, bug #274456
-	sed 's/-Wno-pointer-sign//g' -i configure.in configure || die "sed failed"
-
-	# Tests were restricted because of this
-	sed -e 's/.*bus_dispatch_test.*/printf ("Disabled due to excess noise\\n");/' \
-		-e '/"dispatch"/d' -i "${S}/bus/test-main.c"
-	epatch "${FILESDIR}"/${P}-asneeded.patch
-	epatch "${FILESDIR}"/${P}-no-cloexec.patch
-	# required for asneeded patch but also for bug 263909, cross-compile so
-	# don't remove eautoreconf
-	eautoreconf
-}
-
-src_configure() {
-	local my_conf
-
-	# libaudit is *only* used in DBus wrt SELinux support, so disable it, if
-	# not on an SELinux profile.
-	my_conf="$(use_with X x)
-		$(use_enable debug verbose-mode)
-		$(use_enable debug asserts)
-		$(use_enable kernel_linux inotify)
-		$(use_enable kernel_FreeBSD kqueue)
-		$(use_enable selinux)
-		$(use_enable selinux libaudit)
-		--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"
-
-	mkdir "${BD}"
-	cd "${BD}"
-	einfo "Running configure in ${BD}"
-	ECONF_SOURCE="${S}" econf ${my_conf} \
-		$(use_enable doc doxygen-docs) \
-		$(use_enable doc xml-docs)
-
-	if use test; then
-		mkdir "${TBD}"
-		cd "${TBD}"
-		einfo "Running configure in ${TBD}"
-		ECONF_SOURCE="${S}" econf \
-			${my_conf} \
-			$(use_enable test checks) \
-			$(use_enable test tests) \
-			$(use_enable test asserts)
-	fi
-}
-
-src_compile() {
-	# after the compile, it uses a selinuxfs interface to
-	# check if the SELinux policy has the right support
-	use selinux && addwrite /selinux/access
-
-	cd "${BD}"
-	einfo "Running make in ${BD}"
-	emake || die "make failed"
-
-	if use doc; then
-		einfo "Building API documentation..."
-		doxygen || die "doxygen failed"
-	fi
-
-	if use test; then
-		cd "${TBD}"
-		einfo "Running make in ${TBD}"
-		emake || die "make failed"
-	fi
-}
-
-src_test() {
-	cd "${TBD}"
-	DBUS_VERBOSE=1 make check || die "make check failed"
-}
-
-src_install() {
-	# initscript
-	newinitd "${FILESDIR}"/dbus.init-1.0 dbus
-
-	if use X ; then
-		# 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 || die "doexe failed"
-	fi
-
-	# 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 || die "dodoc failed"
-
-	cd "${BD}"
-	# FIXME: split dtd's in dbus-dtd ebuild
-	emake DESTDIR="${D}" install || die "make install failed"
-	if use doc; then
-		dohtml doc/*.html doc/api/html/* || die "dohtml failed"
-	fi
-}
-
-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 "You must restart D-Bus \`/etc/init.d/dbus restart\` to run"
-	ewarn "the new version of the daemon."
-
-	if has_version "x11-base/xorg-server[hal]"; then
-		elog
-		ewarn "You are currently running X with the hal useflag enabled"
-		ewarn "restarting the dbus service WILL restart X as well"
-		ebeep 5
-	fi
-
-	# Ensure unique id is generated
-	dbus-uuidgen --ensure="${ROOT}"/var/lib/dbus/machine-id
-}
diff --git a/sys-apps/dbus/dbus-1.3.0-r2.ebuild b/sys-apps/dbus/dbus-1.3.0-r2.ebuild
deleted file mode 100644
index 28b45b880df4..000000000000
--- a/sys-apps/dbus/dbus-1.3.0-r2.ebuild
+++ /dev/null
@@ -1,171 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/dbus-1.3.0-r2.ebuild,v 1.1 2010/08/05 19:54:03 lack Exp $
-
-EAPI="2"
-
-inherit autotools 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 test 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
-		app-text/docbook-xml-dtd:4.1.2 )"
-
-# out of sources build directory
-BD=${WORKDIR}/${P}-build
-# out of sources build dir for make check
-TBD=${WORKDIR}/${P}-tests-build
-
-pkg_setup() {
-	enewgroup messagebus
-	enewuser messagebus -1 "-1" -1 messagebus
-}
-
-src_prepare() {
-	# Remove CFLAGS that is not supported by all gcc, bug #274456
-	sed 's/-Wno-pointer-sign//g' -i configure.in configure || die "sed failed"
-
-	# Tests were restricted because of this
-	sed -e 's/.*bus_dispatch_test.*/printf ("Disabled due to excess noise\\n");/' \
-		-e '/"dispatch"/d' -i "${S}/bus/test-main.c"
-	epatch "${FILESDIR}"/${P}-asneeded.patch
-	epatch "${FILESDIR}"/${P}-no-cloexec.patch
-	# required for asneeded patch but also for bug 263909, cross-compile so
-	# don't remove eautoreconf
-	eautoreconf
-}
-
-src_configure() {
-	local my_conf
-
-	# libaudit is *only* used in DBus wrt SELinux support, so disable it, if
-	# not on an SELinux profile.
-	my_conf="$(use_with X x)
-		$(use_enable debug verbose-mode)
-		$(use_enable debug asserts)
-		$(use_enable kernel_linux inotify)
-		$(use_enable kernel_FreeBSD kqueue)
-		$(use_enable selinux)
-		$(use_enable selinux libaudit)
-		--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"
-
-	mkdir "${BD}"
-	cd "${BD}"
-	einfo "Running configure in ${BD}"
-	ECONF_SOURCE="${S}" econf ${my_conf} \
-		$(use_enable doc doxygen-docs) \
-		$(use_enable doc xml-docs)
-
-	if use test; then
-		mkdir "${TBD}"
-		cd "${TBD}"
-		einfo "Running configure in ${TBD}"
-		ECONF_SOURCE="${S}" econf \
-			${my_conf} \
-			$(use_enable test checks) \
-			$(use_enable test tests) \
-			$(use_enable test asserts)
-	fi
-}
-
-src_compile() {
-	# after the compile, it uses a selinuxfs interface to
-	# check if the SELinux policy has the right support
-	use selinux && addwrite /selinux/access
-
-	cd "${BD}"
-	einfo "Running make in ${BD}"
-	emake || die "make failed"
-
-	if use doc; then
-		einfo "Building API documentation..."
-		doxygen || die "doxygen failed"
-	fi
-
-	if use test; then
-		cd "${TBD}"
-		einfo "Running make in ${TBD}"
-		emake || die "make failed"
-	fi
-}
-
-src_test() {
-	cd "${TBD}"
-	DBUS_VERBOSE=1 make check || die "make check failed"
-}
-
-src_install() {
-	# initscript
-	newinitd "${FILESDIR}"/dbus.init-1.0 dbus
-
-	if use X ; then
-		# dbus X session script (#77504)
-		# turns out to only work for GDM (and startx). has been merged into
-		# other desktop (kdm and such scripts)
-		exeinto /etc/X11/xinit/xinitrc.d/
-		doexe "${FILESDIR}"/80-dbus || die "doexe failed"
-	fi
-
-	# 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 || die "dodoc failed"
-
-	cd "${BD}"
-	# FIXME: split dtd's in dbus-dtd ebuild
-	emake DESTDIR="${D}" install || die "make install failed"
-	if use doc; then
-		dohtml doc/*.html doc/api/html/* || die "dohtml failed"
-	fi
-}
-
-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 "You must restart D-Bus \`/etc/init.d/dbus restart\` to run"
-	ewarn "the new version of the daemon."
-
-	if has_version "x11-base/xorg-server[hal]"; then
-		elog
-		ewarn "You are currently running X with the hal useflag enabled"
-		ewarn "restarting the dbus service WILL restart X as well"
-		ebeep 5
-	fi
-
-	# Ensure unique id is generated
-	dbus-uuidgen --ensure="${ROOT}"/var/lib/dbus/machine-id
-}
diff --git a/sys-apps/dbus/dbus-1.3.0-r3.ebuild b/sys-apps/dbus/dbus-1.3.0-r3.ebuild
deleted file mode 100644
index 3a143fe704d5..000000000000
--- a/sys-apps/dbus/dbus-1.3.0-r3.ebuild
+++ /dev/null
@@ -1,178 +0,0 @@
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/dbus-1.3.0-r3.ebuild,v 1.1 2010/09/09 23:09:05 eva Exp $
-
-EAPI="2"
-
-inherit autotools 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 test 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
-		app-text/docbook-xml-dtd:4.1.2 )"
-
-# out of sources build directory
-BD=${WORKDIR}/${P}-build
-# out of sources build dir for make check
-TBD=${WORKDIR}/${P}-tests-build
-
-pkg_setup() {
-	enewgroup messagebus
-	enewuser messagebus -1 "-1" -1 messagebus
-}
-
-src_prepare() {
-	# Remove CFLAGS that is not supported by all gcc, bug #274456
-	sed 's/-Wno-pointer-sign//g' -i configure.in configure || die "sed failed"
-
-	# Tests were restricted because of this
-	sed -e 's/.*bus_dispatch_test.*/printf ("Disabled due to excess noise\\n");/' \
-		-e '/"dispatch"/d' -i "${S}/bus/test-main.c" || die "sed failed"
-
-	# Thread safety patch, upstream #17754
-	epatch "${FILESDIR}/${PN}-1.2.24-thread-safety.patch"
-
-	epatch "${FILESDIR}"/${P}-asneeded.patch
-	epatch "${FILESDIR}"/${P}-no-cloexec.patch
-	# required for asneeded patch but also for bug 263909, cross-compile so
-	# don't remove eautoreconf
-	eautoreconf
-}
-
-src_configure() {
-	local my_conf
-
-	# so we can get backtraces from apps
-	append-flags -rdynamic
-
-	# libaudit is *only* used in DBus wrt SELinux support, so disable it, if
-	# not on an SELinux profile.
-	my_conf="$(use_with X x)
-		$(use_enable debug verbose-mode)
-		$(use_enable debug asserts)
-		$(use_enable kernel_linux inotify)
-		$(use_enable kernel_FreeBSD kqueue)
-		$(use_enable selinux)
-		$(use_enable selinux libaudit)
-		--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"
-
-	mkdir "${BD}"
-	cd "${BD}"
-	einfo "Running configure in ${BD}"
-	ECONF_SOURCE="${S}" econf ${my_conf} \
-		$(use_enable doc doxygen-docs) \
-		$(use_enable doc xml-docs)
-
-	if use test; then
-		mkdir "${TBD}"
-		cd "${TBD}"
-		einfo "Running configure in ${TBD}"
-		ECONF_SOURCE="${S}" econf \
-			${my_conf} \
-			$(use_enable test checks) \
-			$(use_enable test tests) \
-			$(use_enable test asserts)
-	fi
-}
-
-src_compile() {
-	# after the compile, it uses a selinuxfs interface to
-	# check if the SELinux policy has the right support
-	use selinux && addwrite /selinux/access
-
-	cd "${BD}"
-	einfo "Running make in ${BD}"
-	emake || die "make failed"
-
-	if use doc; then
-		einfo "Building API documentation..."
-		doxygen || die "doxygen failed"
-	fi
-
-	if use test; then
-		cd "${TBD}"
-		einfo "Running make in ${TBD}"
-		emake || die "make failed"
-	fi
-}
-
-src_test() {
-	cd "${TBD}"
-	DBUS_VERBOSE=1 make check || die "make check failed"
-}
-
-src_install() {
-	# initscript
-	newinitd "${FILESDIR}"/dbus.init-1.0 dbus || die "newinitd failed"
-
-	if use X ; then
-		# dbus X session script (#77504)
-		# turns out to only work for GDM (and startx). has been merged into
-		# other desktop (kdm and such scripts)
-		exeinto /etc/X11/xinit/xinitrc.d/
-		doexe "${FILESDIR}"/80-dbus || die "doexe failed"
-	fi
-
-	# 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 || die "dodoc failed"
-
-	cd "${BD}"
-	# FIXME: split dtd's in dbus-dtd ebuild
-	emake DESTDIR="${D}" install || die "make install failed"
-	if use doc; then
-		dohtml doc/*.html doc/api/html/* || die "dohtml failed"
-	fi
-}
-
-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 "You must restart D-Bus \`/etc/init.d/dbus restart\` to run"
-	ewarn "the new version of the daemon."
-
-	if has_version "x11-base/xorg-server[hal]"; then
-		elog
-		ewarn "You are currently running X with the hal useflag enabled"
-		ewarn "restarting the dbus service WILL restart X as well"
-		ebeep 5
-	fi
-
-	# Ensure unique id is generated
-	dbus-uuidgen --ensure="${ROOT}"/var/lib/dbus/machine-id
-}
diff --git a/sys-apps/dbus/files/dbus-1.3.0-asneeded.patch b/sys-apps/dbus/files/dbus-1.3.0-asneeded.patch
deleted file mode 100644
index 0f099cdccd95..000000000000
--- a/sys-apps/dbus/files/dbus-1.3.0-asneeded.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-diff -ur dbus-1.3.0.orig/dbus/Makefile.am dbus-1.3.0/dbus/Makefile.am
---- dbus-1.3.0.orig/dbus/Makefile.am	2008-04-04 19:32:04.000000000 +0300
-+++ dbus-1.3.0/dbus/Makefile.am	2009-08-05 20:15:21.000000000 +0300
-@@ -176,6 +176,7 @@
- libdbus_1_la_LDFLAGS= -export-symbols-regex "^[^_].*" -version-info $(LT_CURRENT):$(LT_REVISION):$(LT_AGE) -no-undefined @R_DYNAMIC_LDFLAG@ @PIC_LDFLAGS@
- 
- libdbus_convenience_la_LDFLAGS=@R_DYNAMIC_LDFLAG@
-+libdbus_convenience_la_LIBADD=$(DBUS_TEST_LIBS)
- 
- ## note that TESTS has special meaning (stuff to use in make check)
- ## so if adding tests not to be run in make check, don't add them to 
-@@ -194,7 +195,7 @@
- dbus_test_SOURCES=				\
- 	dbus-test-main.c
- 
--dbus_test_LDADD=libdbus-convenience.la $(DBUS_TEST_LIBS)
-+dbus_test_LDADD=$(DBUS_TEST_LIBS) libdbus-convenience.la
- dbus_test_LDFLAGS=@R_DYNAMIC_LDFLAG@
- 
- ## mop up the gcov files
-diff -ur dbus-1.3.0.orig/test/name-test/Makefile.am dbus-1.3.0/test/name-test/Makefile.am
---- dbus-1.3.0.orig/test/name-test/Makefile.am	2009-07-16 17:01:01.000000000 +0300
-+++ dbus-1.3.0/test/name-test/Makefile.am	2009-08-05 20:12:15.000000000 +0300
-@@ -21,52 +21,52 @@
- test_names_SOURCES=				\
- 	test-names.c
- 
--test_names_LDADD=$(top_builddir)/dbus/libdbus-convenience.la $(DBUS_TEST_LIBS)
-+test_names_LDADD=$(DBUS_TEST_LIBS) $(top_builddir)/dbus/libdbus-convenience.la
- test_names_LDFLAGS=@R_DYNAMIC_LDFLAG@
- 
- test_pending_call_dispatch_SOURCES =		\
- 	test-pending-call-dispatch.c
- 
--test_pending_call_dispatch_LDADD=$(top_builddir)/dbus/libdbus-convenience.la $(DBUS_TEST_LIBS)
-+test_pending_call_dispatch_LDADD=$(DBUS_TEST_LIBS) $(top_builddir)/dbus/libdbus-convenience.la
- test_pending_call_dispatch_LDFLAGS=@R_DYNAMIC_LDFLAG@
- 
- test_pending_call_timeout_SOURCES =		\
- 	test-pending-call-timeout.c
- 
--test_pending_call_timeout_LDADD=$(top_builddir)/dbus/libdbus-convenience.la $(DBUS_TEST_LIBS)
-+test_pending_call_timeout_LDADD=$(DBUS_TEST_LIBS) $(top_builddir)/dbus/libdbus-convenience.la
- test_pending_call_timeout_LDFLAGS=@R_DYNAMIC_LDFLAG@
- 
- test_threads_init_SOURCES =            \
- 	test-threads-init.c
- 
--test_threads_init_LDADD=$(top_builddir)/dbus/libdbus-convenience.la $(DBUS_TEST_LIBS)
-+test_threads_init_LDADD=$(DBUS_TEST_LIBS) $(top_builddir)/dbus/libdbus-convenience.la
- test_threads_init_LDFLAGS=@R_DYNAMIC_LDFLAG@
- 
- test_ids_SOURCES =            \
- 	test-ids.c
- 
--test_ids_LDADD=$(top_builddir)/dbus/libdbus-convenience.la $(DBUS_TEST_LIBS)
-+test_ids_LDADD=$(DBUS_TEST_LIBS) $(top_builddir)/dbus/libdbus-convenience.la
- test_ids_LDFLAGS=@R_DYNAMIC_LDFLAG@
- 
- test_shutdown_SOURCES =            \
- 	test-shutdown.c
- 
- test_shutdown_CFLAGS=
--test_shutdown_LDADD=$(top_builddir)/dbus/libdbus-convenience.la ../libdbus-testutils.la $(DBUS_TEST_LIBS)
-+test_shutdown_LDADD=$(DBUS_TEST_LIBS) $(top_builddir)/dbus/libdbus-convenience.la ../libdbus-testutils.la
- test_shutdown_LDFLAGS=@R_DYNAMIC_LDFLAG@
- 
- test_privserver_SOURCES =            \
- 	test-privserver.c
- 
- test_privserver_CFLAGS=
--test_privserver_LDADD=$(top_builddir)/dbus/libdbus-convenience.la ../libdbus-testutils.la $(DBUS_TEST_LIBS)
-+test_privserver_LDADD=$(DBUS_TEST_LIBS) $(top_builddir)/dbus/libdbus-convenience.la ../libdbus-testutils.la
- test_privserver_LDFLAGS=@R_DYNAMIC_LDFLAG@
- 
- test_privserver_client_SOURCES =            \
- 	test-privserver-client.c
- 
- test_privserver_client_CFLAGS=
--test_privserver_client_LDADD=$(top_builddir)/dbus/libdbus-convenience.la ../libdbus-testutils.la $(DBUS_TEST_LIBS)
-+test_privserver_client_LDADD=$(DBUS_TEST_LIBS) $(top_builddir)/dbus/libdbus-convenience.la ../libdbus-testutils.la
- test_privserver_client_LDFLAGS=@R_DYNAMIC_LDFLAG@
- 
- endif
diff --git a/sys-apps/dbus/files/dbus-1.3.0-no-cloexec.patch b/sys-apps/dbus/files/dbus-1.3.0-no-cloexec.patch
deleted file mode 100644
index ba76eec00ec4..000000000000
--- a/sys-apps/dbus/files/dbus-1.3.0-no-cloexec.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-commit a8cf509a06cdc42568e446dea8a54a398e1c003b
-Author: Benjamin Reed <rangerrick@befunk.com>
-Date:   Wed Jul 22 08:47:51 2009 -0400
-
-    Fix compilation on non-Linux: the F_DUPFD_CLOEXEC check was reversed
-    
-    Signed-off-by: Thiago Macieira <thiago@kde.org>
-
-diff --git a/dbus/dbus-sysdeps-unix.c b/dbus/dbus-sysdeps-unix.c
-index f0f1e70..e60e614 100644
---- a/dbus/dbus-sysdeps-unix.c
-+++ b/dbus/dbus-sysdeps-unix.c
-@@ -3043,7 +3043,7 @@ _dbus_dup(int        fd,
-     return -1;
-   }
- 
--#ifndef F_DUPFD_CLOEXEC
-+#ifdef F_DUPFD_CLOEXEC
-   if (!cloexec_done)
- #endif
-     {