old

Package-Manager: portage-2.2.0_alpha155/cvs/Linux x86_64
RepoMan-Options: --force
Manifest-Sign-Key: 0x4868F14D

6 files changed, 20 insertions, 529 deletions

diff --git a/sys-apps/dbus/ChangeLog b/sys-apps/dbus/ChangeLog
index 30e63cf29950..e1a9edcac1f7 100644
--- a/sys-apps/dbus/ChangeLog
+++ b/sys-apps/dbus/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-apps/dbus
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/ChangeLog,v 1.364 2013/01/20 11:21:03 pinkbyte Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/ChangeLog,v 1.365 2013/01/20 13:30:07 ssuominen Exp $
+
+  20 Jan 2013; Samuli Suominen <ssuominen@gentoo.org> -files/dbus.init-1.0,
+  -files/dbus-1.4.0-asneeded.patch, -dbus-1.4.20.ebuild, -dbus-1.6.2.ebuild:
+  old
 
   20 Jan 2013; Sergey Popov <pinkbyte@gentoo.org> dbus-1.4.20.ebuild,
   dbus-1.6.2.ebuild, dbus-1.6.8.ebuild:
diff --git a/sys-apps/dbus/Manifest b/sys-apps/dbus/Manifest
index ac2d264b3770..fafbc74c46d0 100644
--- a/sys-apps/dbus/Manifest
+++ b/sys-apps/dbus/Manifest
@@ -1,14 +1,22 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX 80-dbus 341 SHA256 76ce25ce8769cdfcb0d7b7e52e5a7e6474448fc34e8ad9393afac1eca1e07fd2 SHA512 fa019d903e5412d0c47dade4299995e9baa8b86d74ebc0b42967137762bc476628af57f8a6c354660fce731c33a49a66027cd8b5a25be4d898b7d1662c600e89 WHIRLPOOL 74e9e79b86fc4802f34737bb47c3a71919f35fb2375119cdcd7fd6dae2de201e006fb4e6a978addd2300f7075180d4b088a69fa60d2ce4d689b6239b4a1307b1
-AUX dbus-1.4.0-asneeded.patch 3696 SHA256 f785afd7943b3220ebcf2603b1c059a2dec46bdbfba376e60d8373ba3f933562 SHA512 4e1a5a71082789255a16e2c2112329ca6ad42fcf36699439088b956cf31524ed1f8b84d3421c9181d8cedf6ea61d3d8f4a4b716f4540b06658a06f405c03c693 WHIRLPOOL 481a05aa3cc3698a132b66721261f0fdad17a49abd93f36a2772dc63fe667aa00f675975fc66022da17b226ca51b45019f4f7259c25572b35ca498cf2910fa5b
 AUX dbus-1.5.12-selinux-when-dropping-capabilities-only-include-AUDI.patch 1320 SHA256 ab3398f4fb46ec9a134581a825180422b2b8f5e8dd250bca3127c31a39d923a7 SHA512 e8cac05a0291f24fc3cd82cfd504a78b1d356a9ee613e226c3b16ccbfd8251afb036d4fb9da372a066e5bc9417fddbc3f10b68713620c4fd798069fdd8f6dbf8 WHIRLPOOL 9e30cbcba7ebe13cdc8a9e3ad0bb7d3d6e667dfba23a6cedfbacbbed34f6eb15bc6f0dcb42392f0c1a23ac891f0d820759f4201b8bac9b51d4241e74bed5ca2d
-AUX dbus.init-1.0 1176 SHA256 2db2b6ea36854997f93ee0d0dfc470a1d1c792d355944a1272ba45b219ab61dd SHA512 13080f848248a54f3e11c07410c691e8dc48bf52fda865d6ee6408228d863280dcb31baf08845f1fded8fb3fc8583d5a602cdf39d793c5b74a863fd1d3b44daa WHIRLPOOL dc02f700b7cf3c1ecb5b3b2921fe9827037f0824a01c6e69b8407e408027585b403b78457b937feb2240b1ca3dd294755b422103695dadcb7ba326bd418d7498
 AUX dbus.initd 1185 SHA256 98e37b8b6ed25004e48c5855d74c9361eea06d3fee13cefcc0ed10ccf452aa01 SHA512 7983e77015b46c204b10948a1fcedaae53a75848919961eb1ef8878bfa11c933256642c0e3f59163e72374ce1bd33b0338c787ce067c0982fcdf8a798b922a15 WHIRLPOOL 62ef5b9191a2bd3410c53ed63015e9968789f448e5959de2ebc2404bc13ce99c333546bf1eb335f826ef7ea143f70a53c2ecffd81b4e35fa51ba2e2bdf68879f
-DIST dbus-1.4.20.tar.gz 1895099 SHA256 103bdcd261a13140730b5fa69f56a98ab5c89ba3f0116ea62fcfd639520d5aaf SHA512 d6bad9df110a7b93f278577b9e45c0a9c07fbc2d6bb89fbf0c4af09d9dc8bab91b4e62aee0db32536b1c6194fc638e7a1c99f48a74e0cf55fcb1cc121bbe57f7 WHIRLPOOL 897fc3f5c8d946735380c8f9f08bf5de0e23f97f60008917b398bd5dc6bfd4c696fc4b3eeccb578e89dfd639aedb893c2bcef88b99e8e5bb052ad1d4037a6820
-DIST dbus-1.6.2.tar.gz 1927211 SHA256 2bf210e549fbf801fef32ba132284bcd10021d1d9e52fc29097fe1333b54c2ea SHA512 c53b3cc2251ccf88918f8080a922a10d6cb755900a78978df8ba5c19e100c94adafb8e0790d9a753c20d81e1fb5fda5d02b52653acedc5dddb60d8f65c061d7c WHIRLPOOL 02f4e046d345d604ffd11ec60bbf40ae4dcd15c6dfb9afbc61c3e93979ac2547f4e957378d475b989490daaf37074a1bae088f57e4df6258c745d43ec43b96e2
 DIST dbus-1.6.8.tar.gz 1929630 SHA256 fc1370ef38abeeb13f55c905ec002e60705fb0bfde3b8d21c8d6eb8056c11bac SHA512 eb26f1dfb6c6e3757a408a98e0f4012eda926e2f8ee7a2356ebd567a2e4a7d96effca7cec6e6b4f9e7bc578cbdd7b703d00158343a260859aff0718c76f296b0 WHIRLPOOL b614da2bc57376c8ad626ed2469e9a2cfcf7a2debba97187728048ad73e0c5075b290766d088e470b266fcad3e3cf2ec2c9c8477f1f7c5a232f1f74cadc83c1a
-EBUILD dbus-1.4.20.ebuild 5017 SHA256 d1a219680225274451954ceac6958ef52df54f51999221914f47b4457b1051b3 SHA512 775e71e5333b1a848b17acb2988c0d0e31f423ea0bca3ce9587b375d1ef6373a0256f792249c43ed3f261e8b3b883006d00ac87a496c634ac7691dd2cc6d885c WHIRLPOOL 7e5ff0a2eff98bb3a777a9a8ab86365fc09160b24105a78e92e45831efe29f0914ca92b21211c7c7069bdcd3e0b6405e2c888988d4ea74716b58b74ef85056da
-EBUILD dbus-1.6.2.ebuild 5134 SHA256 1a07af4f9a2fa84fa4e5eeb217a4326d5fdd55f1c8fd7c399ac294a81e64c899 SHA512 8ff452c34c6140541ea8e25b4ef6fe023e3e15f514655bad5b3ede92847f0eb09def0e6a414c2417b3467d97f7803a0644f39aa210368eda1548974c63a5163e WHIRLPOOL 5c542b01c09d303ff268cc935159dcfeeaaa1c2dbf682ef5129a77a1329e48467b79d017a57bdbc30ba0a7657206ee38f2a460515f3757ebff609915ef7df1bf
 EBUILD dbus-1.6.8-r1.ebuild 5208 SHA256 8b687bb32fd9acc1329455b4a918e0293490fea5c1f3b84a5bbdabb871494193 SHA512 f0ca13ef1bc9e9364546e0892b4d376b71107a06dc368ba5a4b2753435ead152ee876f137ba003975a88a922e64e51911aa23f34953dcf47bc036d7640b1a1ea WHIRLPOOL f28ffc0a3741de0d727e7253ce61d549aa729d4476786970bb5c8c73ddbfe28479d58be2598ee0d5f0a4813e7356f409d828fe4b4f0b830ac9c7ac2eac286f5e
 EBUILD dbus-1.6.8.ebuild 4977 SHA256 12c078f1279d359f21d808136dfd8e5e0877f57970ccadac069245f6054498f5 SHA512 92108bf767eb0ca035c229ba5785db26da5d0aa27dbb6dd3cc77ed0217313b7b193476b622a02824dc6580962805895670f9e82647da579ec6e84b438816a2ef WHIRLPOOL 9b3c06858526dab5fa21074d9217bbe395a35e4c42be04fb305f2adddb3ab7222384be25421840253dc3679bb72490bbdfa125926ad2c13bdf3bb4b21bd11323
-MISC ChangeLog 53989 SHA256 5a202dc93241434f69756cbead108ebabc0c92e17c224fce5598818ee02d037b SHA512 a6dc2405b58a99d830642e1bb6222ffbd3c0039ac18e4e812e1096d03e9a6188f23ac12c86540ab8cc3df733c936124bc85d4f69afadf207426b412bcd0e0474 WHIRLPOOL 2d6c8bc4263a977f3380e29e6699d311c22d26a0392b6fa62d2ffe6fa2f196d341a452ba18a4542d862d26447e54a3fcfa29726c33108f2c8ab5be45d40fb852
+MISC ChangeLog 54150 SHA256 a1f1bcbe8400cfe7edab0a8f4384d589cf9edfdf146db5462775211d42434f76 SHA512 3bf81584342c89ed383cc0355654853325af9ec391431858316584c42ed17ba1b8f8a390e96861c270776ecb501c802cd0b80458b3d3fb09b19f0310e1e50064 WHIRLPOOL df842fcc9fe212dfa76c8cbab7b4c2635f8e69b9f6f747e4e68138dd3f31257c5b8e5ad014fd2b2d5965da084b743100678bc6aabf50865e2c0d5811fd2ea0c2
 MISC metadata.xml 342 SHA256 5db8eac45a8872150729ee08297c2a19468336c3b9412e9f8e64ca2a2f5406c3 SHA512 01e10de9adb42a26339a096215305853c646c23c533df70ad044f92109d2138efe86465b00462d649f1d0e8ea1896320e09a571fcbe95318c5df9024d8f65b19 WHIRLPOOL 303cd9e4e6451ddf37da658766c877b960942f8a170948b60e6f4b1d72e7d3df5f4b4bf4fb92016caacaa611198e77aefaeedd5d3706c538b0bd0b5c086fabba
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.19 (GNU/Linux)
+
+iQEcBAEBCAAGBQJQ+/ECAAoJEEdUh39IaPFNJ1QH/2ggvsLSqbLXgDM2jxkU1FeX
+Gc6N/qtMeHfHwYDBpe/UVbSo6oc/qO86cQAHSXtfmHt39CMOre7qpis3JvdWNlSl
+bhvELSNmbZ1htf+xKVLMqVsaRd6TPw3EMn5dXzYol1HXCGMPridJof1x/nMqnELy
+01gEeNKJCYElUhS7OQstj5P0Oo/r+zhcayKsY9MhSk2xGiGQmo9Cok+Qo6bGtwFs
+2dNS414chMVwZZkEd3RMneyNkCG/rv/F63JJS2/1BpxAtx8/EHIGTIV0zCmCtTJ2
+8iBkCWa302morhWn+cjZE78aknOJC9cv1X3fM4UGOOmXYv6Wkhljms9Eov2ln0o=
+=GZ5u
+-----END PGP SIGNATURE-----
diff --git a/sys-apps/dbus/dbus-1.4.20.ebuild b/sys-apps/dbus/dbus-1.4.20.ebuild
deleted file mode 100644
index f270c97b2f8a..000000000000
--- a/sys-apps/dbus/dbus-1.4.20.ebuild
+++ /dev/null
@@ -1,185 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/dbus-1.4.20.ebuild,v 1.14 2013/01/20 11:21:03 pinkbyte Exp $
-
-EAPI=4
-inherit autotools eutils multilib flag-o-matic python systemd virtualx user
-
-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 ~amd64-fbsd ~x86-fbsd"
-IUSE="debug doc selinux static-libs test X"
-
-RDEPEND=">=dev-libs/expat-2
-	selinux? (
-		sec-policy/selinux-dbus
-		sys-libs/libselinux
-		)
-	X? (
-		x11-libs/libX11
-		x11-libs/libXt
-		)"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? (
-		app-doc/doxygen
-		app-text/docbook-xml-dtd:4.1.2
-		app-text/xmlto
-		)
-	test? (
-		>=dev-libs/glib-2.24
-		dev-lang/python:2.7
-		)"
-
-# 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
-
-	# FIXME: Test suite fails with Python 3.2 (last checked: 1.4.20)
-	if use test; then
-		python_set_active_version 2
-		python_pkg_setup
-	fi
-}
-
-src_prepare() {
-	# Tests were restricted because of this
-	sed -i \
-		-e 's/.*bus_dispatch_test.*/printf ("Disabled due to excess noise\\n");/' \
-		-e '/"dispatch"/d' \
-		bus/test-main.c || die
-
-	epatch \
-		"${FILESDIR}"/${PN}-1.4.0-asneeded.patch \
-		"${FILESDIR}"/${PN}-1.5.12-selinux-when-dropping-capabilities-only-include-AUDI.patch
-
-	# required for asneeded patch but also for bug 263909, cross-compile so
-	# don't remove eautoreconf
-	eautoreconf
-}
-
-src_configure() {
-	local myconf
-
-	# 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.
-	myconf=(
-		--disable-silent-rules
-		--disable-asserts
-		--disable-checks
-		--disable-embedded-tests
-		--disable-modular-tests
-		$(use_with X x)
-		$(use_enable debug verbose-mode)
-		$(use_enable kernel_linux inotify)
-		$(use_enable kernel_FreeBSD kqueue)
-		$(use_enable selinux)
-		$(use_enable selinux libaudit)
-		$(use_enable static-libs static)
-		--enable-shared
-		--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
-		"$(systemd_with_unitdir)"
-		--localstatedir=/var
-		--docdir=/usr/share/doc/${PF}
-		--htmldir=/usr/share/doc/${PF}/html
-		)
-
-	mkdir "${BD}"
-	cd "${BD}"
-	einfo "Running configure in ${BD}"
-	ECONF_SOURCE="${S}" econf "${myconf[@]}" \
-		$(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 "${myconf[@]}" \
-			$(use_enable test checks) \
-			$(use_enable test embedded-tests) \
-			$(use_enable test asserts) \
-			$(has_version dev-libs/dbus-glib && echo --enable-modular-tests)
-	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
-
-	if use test; then
-		cd "${TBD}"
-		einfo "Running make in ${TBD}"
-		emake
-	fi
-}
-
-src_test() {
-	cd "${TBD}"
-	DBUS_VERBOSE=1 Xemake -j1 check
-}
-
-src_install() {
-	newinitd "${FILESDIR}"/dbus.initd 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
-	fi
-
-	# needs to exist for dbus sessions to launch
-	keepdir /usr/share/dbus-1/services
-	keepdir /etc/dbus-1/system.d
-	keepdir /etc/dbus-1/session.d
-	keepdir /var/lib/dbus # See pkg_postinst() for symlink creation
-
-	dodoc AUTHORS ChangeLog HACKING NEWS README doc/TODO
-
-	cd "${BD}"
-	emake DESTDIR="${D}" install
-
-	find "${ED}" -type f -name '*.la' -exec rm -f {} +
-}
-
-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."
-	ewarn "Don't do this while X is running because it will restart your X as well."
-
-	# Ensure unique id is generated and put it in /etc wrt #370451 but symlink
-	# for DBUS_MACHINE_UUID_FILE (see tools/dbus-launch.c) and reverse
-	# dependencies with hardcoded paths (although the known ones got fixed already)
-	dbus-uuidgen --ensure="${EROOT}"/etc/machine-id
-	ln -sf "${EROOT}"/etc/machine-id "${EROOT}"/var/lib/dbus/machine-id
-}
diff --git a/sys-apps/dbus/dbus-1.6.2.ebuild b/sys-apps/dbus/dbus-1.6.2.ebuild
deleted file mode 100644
index 1223f7bb5eb9..000000000000
--- a/sys-apps/dbus/dbus-1.6.2.ebuild
+++ /dev/null
@@ -1,191 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/dbus-1.6.2.ebuild,v 1.6 2013/01/20 11:21:03 pinkbyte Exp $
-
-EAPI=4
-inherit autotools eutils linux-info flag-o-matic python systemd virtualx user
-
-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="|| ( AFL-2.1 GPL-2 )"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm hppa ~ia64 ~mips ppc ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd"
-IUSE="debug doc selinux static-libs systemd test X"
-
-RDEPEND=">=dev-libs/expat-2
-	selinux? (
-		sec-policy/selinux-dbus
-		sys-libs/libselinux
-		)
-	X? (
-		x11-libs/libX11
-		x11-libs/libXt
-		)"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	doc? (
-		app-doc/doxygen
-		app-text/docbook-xml-dtd:4.1.2
-		app-text/xmlto
-		)
-	test? (
-		>=dev-libs/glib-2.24
-		dev-lang/python:2.7
-		)"
-
-# 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
-
-	if use test; then
-		python_set_active_version 2
-		python_pkg_setup
-	fi
-
-	if use kernel_linux; then
-		CONFIG_CHECK="~EPOLL"
-		linux-info_pkg_setup
-	fi
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-1.5.12-selinux-when-dropping-capabilities-only-include-AUDI.patch
-
-	# Tests were restricted because of this
-	sed -i \
-		-e 's/.*bus_dispatch_test.*/printf ("Disabled due to excess noise\\n");/' \
-		-e '/"dispatch"/d' \
-		bus/test-main.c || die
-
-	# required for asneeded patch but also for bug 263909, cross-compile so
-	# don't remove eautoreconf
-	eautoreconf
-}
-
-src_configure() {
-	# so we can get backtraces from apps
-	append-flags -rdynamic
-
-	# temp. hack for stable wrt #416725#c5
-	local myconf=( --disable-systemd )
-	if use systemd && has_version sys-apps/systemd; then
-		myconf=( --enable-systemd )
-	fi
-
-	# libaudit is *only* used in DBus wrt SELinux support, so disable it, if
-	# not on an SELinux profile.
-	myconf+=(
-		--disable-silent-rules
-		--localstatedir=/var
-		--docdir=/usr/share/doc/${PF}
-		--htmldir=/usr/share/doc/${PF}/html
-		$(use_enable static-libs static)
-		$(use_enable debug verbose-mode)
-		--disable-asserts
-		--disable-checks
-		$(use_enable selinux)
-		$(use_enable selinux libaudit)
-		$(use_enable kernel_linux inotify)
-		$(use_enable kernel_FreeBSD kqueue)
-		--disable-embedded-tests
-		--disable-modular-tests
-		$(use_enable debug stats)
-		--with-xml=expat
-		--with-session-socket-dir=/tmp
-		--with-system-pid-file=/var/run/dbus.pid
-		--with-system-socket=/var/run/dbus/system_bus_socket
-		--with-dbus-user=messagebus
-		$(use_with X x)
-		"$(systemd_with_unitdir)"
-		)
-
-	mkdir "${BD}"
-	cd "${BD}"
-	einfo "Running configure in ${BD}"
-	ECONF_SOURCE="${S}" econf "${myconf[@]}" \
-		$(use_enable doc xml-docs) \
-		$(use_enable doc doxygen-docs)
-
-	if use test; then
-		mkdir "${TBD}"
-		cd "${TBD}"
-		einfo "Running configure in ${TBD}"
-		ECONF_SOURCE="${S}" econf "${myconf[@]}" \
-			$(use_enable test asserts) \
-			$(use_enable test checks) \
-			$(use_enable test embedded-tests) \
-			$(has_version dev-libs/dbus-glib && echo --enable-modular-tests)
-	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
-
-	if use test; then
-		cd "${TBD}"
-		einfo "Running make in ${TBD}"
-		emake
-	fi
-}
-
-src_test() {
-	cd "${TBD}"
-	DBUS_VERBOSE=1 Xemake -j1 check
-}
-
-src_install() {
-	newinitd "${FILESDIR}"/dbus.initd 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
-	fi
-
-	# needs to exist for dbus sessions to launch
-	keepdir /usr/share/dbus-1/services
-	keepdir /etc/dbus-1/{session,system}.d
-	# machine-id symlink from pkg_postinst()
-	keepdir /var/lib/dbus
-
-	dodoc AUTHORS ChangeLog HACKING NEWS README doc/TODO
-
-	cd "${BD}"
-	emake DESTDIR="${D}" install
-
-	find "${ED}" -type f -name '*.la' -exec rm -f {} +
-}
-
-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."
-	ewarn "Don't do this while X is running because it will restart your X as well."
-
-	# Ensure unique id is generated and put it in /etc wrt #370451 but symlink
-	# for DBUS_MACHINE_UUID_FILE (see tools/dbus-launch.c) and reverse
-	# dependencies with hardcoded paths (although the known ones got fixed already)
-	dbus-uuidgen --ensure="${EROOT}"/etc/machine-id
-	ln -sf "${EROOT}"/etc/machine-id "${EROOT}"/var/lib/dbus/machine-id
-}
diff --git a/sys-apps/dbus/files/dbus-1.4.0-asneeded.patch b/sys-apps/dbus/files/dbus-1.4.0-asneeded.patch
deleted file mode 100644
index baa71294dc71..000000000000
--- a/sys-apps/dbus/files/dbus-1.4.0-asneeded.patch
+++ /dev/null
@@ -1,94 +0,0 @@
-http://bugs.freedesktop.org/show_bug.cgi?id=23162
-
---- dbus/Makefile.am
-+++ dbus/Makefile.am
-@@ -277,7 +277,7 @@
- dbus_test_SOURCES=				\
- 	dbus-test-main.c
- 
--dbus_test_LDADD=libdbus-internal.la $(DBUS_TEST_LIBS)
-+dbus_test_LDADD=$(DBUS_TEST_LIBS) libdbus-internal.la
- dbus_test_LDFLAGS=@R_DYNAMIC_LDFLAG@
- 
- ## mop up the gcov files
---- test/Makefile.am
-+++ test/Makefile.am
-@@ -63,17 +63,17 @@
- 
- # When any programs are not linked to libdbus-internal, fix this.
- AM_CPPFLAGS=-DDBUS_STATIC_BUILD
--TEST_LIBS=$(top_builddir)/dbus/libdbus-internal.la $(DBUS_TEST_LIBS)
-+TEST_LIBS=$(DBUS_TEST_LIBS) $(top_builddir)/dbus/libdbus-internal.la
- 
--test_service_LDADD=libdbus-testutils.la $(TEST_LIBS)
-+test_service_LDADD=$(TEST_LIBS) libdbus-testutils.la
- test_service_LDFLAGS=@R_DYNAMIC_LDFLAG@
--test_names_LDADD=libdbus-testutils.la $(TEST_LIBS)
-+test_names_LDADD=$(TEST_LIBS) libdbus-testutils.la
- test_names_LDFLAGS=@R_DYNAMIC_LDFLAG@
- ## break_loader_LDADD= $(TEST_LIBS)
- ## break_loader_LDFLAGS=@R_DYNAMIC_LDFLAG@
--test_shell_service_LDADD=libdbus-testutils.la $(TEST_LIBS)
-+test_shell_service_LDADD=$(TEST_LIBS) libdbus-testutils.la
- test_shell_service_LDFLAGS=@R_DYNAMIC_LDFLAG@
--shell_test_LDADD=libdbus-testutils.la $(TEST_LIBS)
-+shell_test_LDADD=$(TEST_LIBS) libdbus-testutils.la
- shell_test_LDFLAGS=@R_DYNAMIC_LDFLAG@
- spawn_test_LDADD=$(TEST_LIBS)
- spawn_test_LDFLAGS=@R_DYNAMIC_LDFLAG@
---- test/name-test/Makefile.am
-+++ test/name-test/Makefile.am
-@@ -22,46 +22,46 @@
- test_pending_call_dispatch_SOURCES =		\
- 	test-pending-call-dispatch.c
- 
--test_pending_call_dispatch_LDADD=$(top_builddir)/dbus/libdbus-internal.la $(DBUS_TEST_LIBS)
-+test_pending_call_dispatch_LDADD=$(DBUS_TEST_LIBS) $(top_builddir)/dbus/libdbus-internal.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-internal.la $(DBUS_TEST_LIBS)
-+test_pending_call_timeout_LDADD=$(DBUS_TEST_LIBS) $(top_builddir)/dbus/libdbus-internal.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-internal.la $(DBUS_TEST_LIBS)
-+test_threads_init_LDADD=$(DBUS_TEST_LIBS) $(top_builddir)/dbus/libdbus-internal.la
- test_threads_init_LDFLAGS=@R_DYNAMIC_LDFLAG@
- 
- test_ids_SOURCES =            \
- 	test-ids.c
- 
--test_ids_LDADD=$(top_builddir)/dbus/libdbus-internal.la $(DBUS_TEST_LIBS)
-+test_ids_LDADD=$(DBUS_TEST_LIBS) $(top_builddir)/dbus/libdbus-internal.la
- test_ids_LDFLAGS=@R_DYNAMIC_LDFLAG@
- 
- test_shutdown_SOURCES =            \
- 	test-shutdown.c
- 
- test_shutdown_CFLAGS=
--test_shutdown_LDADD=$(top_builddir)/dbus/libdbus-internal.la ../libdbus-testutils.la $(DBUS_TEST_LIBS)
-+test_shutdown_LDADD=$(DBUS_TEST_LIBS) $(top_builddir)/dbus/libdbus-internal.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-internal.la ../libdbus-testutils.la $(DBUS_TEST_LIBS)
-+test_privserver_LDADD=$(DBUS_TEST_LIBS) $(top_builddir)/dbus/libdbus-internal.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-internal.la ../libdbus-testutils.la $(DBUS_TEST_LIBS)
-+test_privserver_client_LDADD=$(DBUS_TEST_LIBS) $(top_builddir)/dbus/libdbus-internal.la ../libdbus-testutils.la
- test_privserver_client_LDFLAGS=@R_DYNAMIC_LDFLAG@
- 
- endif
diff --git a/sys-apps/dbus/files/dbus.init-1.0 b/sys-apps/dbus/files/dbus.init-1.0
deleted file mode 100644
index 502f40fdc608..000000000000
--- a/sys-apps/dbus/files/dbus.init-1.0
+++ /dev/null
@@ -1,51 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License, v2 or later
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/files/dbus.init-1.0,v 1.5 2011/09/23 12:45:03 polynomial-c Exp $
-
-extra_started_commands="reload"
-
-depend() {
-	need localmount
-	after bootmisc
-}
-
-start() {
-	ebegin "Starting D-BUS system messagebus"
-
-	/usr/bin/dbus-uuidgen --ensure
-
-	# We need to test if /var/run/dbus exists, since script will fail if it does not
-	[ ! -e /var/run/dbus ] && mkdir /var/run/dbus 
-
-	start-stop-daemon --start --pidfile /var/run/dbus.pid --exec /usr/bin/dbus-daemon -- --system
-	eend $?
-}
-
-stop() {
-	local retval
-
-	ebegin "Stopping D-BUS system messagebus"
-
-	start-stop-daemon --stop --pidfile /var/run/dbus.pid
-	retval=$?
-
-	eend ${retval}
-
-	[ -S /var/run/dbus/system_bus_socket ] && rm -f /var/run/dbus/system_bus_socket
-
-	return ${retval}
-}
-
-reload() {
-	local retval
-
-	ebegin "Reloading D-BUS messagebus config"
-	
-	/usr/bin/dbus-send --print-reply --system --type=method_call \
-			--dest=org.freedesktop.DBus \
-			/ org.freedesktop.DBus.ReloadConfig > /dev/null
-	retval=$?
-	eend ${retval}
-	return ${retval}
-}