old

Package-Manager: portage-2.2.10/cvs/Linux x86_64
Manifest-Sign-Key: 0x4868F14D

7 files changed, 14 insertions, 958 deletions

diff --git a/sys-apps/dbus/ChangeLog b/sys-apps/dbus/ChangeLog
index e4a04b4c9442..73e6cddd145a 100644
--- a/sys-apps/dbus/ChangeLog
+++ b/sys-apps/dbus/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-apps/dbus
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/ChangeLog,v 1.436 2014/07/24 12:15:40 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/ChangeLog,v 1.437 2014/07/24 12:17:54 ssuominen Exp $
+
+  24 Jul 2014; Samuli Suominen <ssuominen@gentoo.org> -dbus-1.6.18-r1.ebuild,
+  -dbus-1.8.0.ebuild, -dbus-1.8.2.ebuild, -dbus-1.8.4.ebuild,
+  -files/dbus-1.5.12-selinux-when-dropping-capabilities-only-include-AUDI.patch:
+  old
 
   24 Jul 2014; Samuli Suominen <ssuominen@gentoo.org>
   +files/dbus-1.8.6-enable-stats_compile_failure.patch, dbus-1.8.6.ebuild:
diff --git a/sys-apps/dbus/Manifest b/sys-apps/dbus/Manifest
index 640122e2e18b..a50d84cf4260 100644
--- a/sys-apps/dbus/Manifest
+++ b/sys-apps/dbus/Manifest
@@ -2,29 +2,20 @@
 Hash: SHA256
 
 AUX 80-dbus 341 SHA256 76ce25ce8769cdfcb0d7b7e52e5a7e6474448fc34e8ad9393afac1eca1e07fd2 SHA512 fa019d903e5412d0c47dade4299995e9baa8b86d74ebc0b42967137762bc476628af57f8a6c354660fce731c33a49a66027cd8b5a25be4d898b7d1662c600e89 WHIRLPOOL 74e9e79b86fc4802f34737bb47c3a71919f35fb2375119cdcd7fd6dae2de201e006fb4e6a978addd2300f7075180d4b088a69fa60d2ce4d689b6239b4a1307b1
-AUX dbus-1.5.12-selinux-when-dropping-capabilities-only-include-AUDI.patch 1320 SHA256 ab3398f4fb46ec9a134581a825180422b2b8f5e8dd250bca3127c31a39d923a7 SHA512 e8cac05a0291f24fc3cd82cfd504a78b1d356a9ee613e226c3b16ccbfd8251afb036d4fb9da372a066e5bc9417fddbc3f10b68713620c4fd798069fdd8f6dbf8 WHIRLPOOL 9e30cbcba7ebe13cdc8a9e3ad0bb7d3d6e667dfba23a6cedfbacbbed34f6eb15bc6f0dcb42392f0c1a23ac891f0d820759f4201b8bac9b51d4241e74bed5ca2d
 AUX dbus-1.8.6-enable-stats_compile_failure.patch 1227 SHA256 bcb6b8986c6c369be2f068e1fd0bdafc5e848babc02f0827776bc50aa6749211 SHA512 16e04822179f521d14e22fc07164bcba0e1e26473947c9d2795dd2b9457f2b451aa6571f40b61ee13b0e56d159f5a65261ed44f6c4abf80fd2b83076064f8606 WHIRLPOOL ba4c42c5c269336f9383cd435e195d24e74e49da202a5e3997e964bbe6cc214da2fcd87addc258a6e131cd8b9f011158e05283e66d85ca4ed72b2de014105d2b
 AUX dbus.initd 1185 SHA256 98e37b8b6ed25004e48c5855d74c9361eea06d3fee13cefcc0ed10ccf452aa01 SHA512 7983e77015b46c204b10948a1fcedaae53a75848919961eb1ef8878bfa11c933256642c0e3f59163e72374ce1bd33b0338c787ce067c0982fcdf8a798b922a15 WHIRLPOOL 62ef5b9191a2bd3410c53ed63015e9968789f448e5959de2ebc2404bc13ce99c333546bf1eb335f826ef7ea143f70a53c2ecffd81b4e35fa51ba2e2bdf68879f
-DIST dbus-1.6.18.tar.gz 1916553 SHA256 7085a0895a9eb11a952394cdbea6d8b4358e17cb991fed0e8fb85e2b9e686dcd SHA512 6fe295eaf4865de447d8a68c5f226dd94bb53f39d69a5752440c9dc8f244d23803937449540f632aa0c017d5ce43c6f9bc1a36cfc95519aed9df8ea30165b664 WHIRLPOOL 75d404f73fe893d83fde725d1564fc95046fdbd5d502b57c0cefef4a16d5128653397b8d7578d3839b23b7f53cb8b70729354805b240b8d5b308bb168afe1688
-DIST dbus-1.8.0.tar.gz 1860965 SHA256 769f8c7282b535ccbe610f63a5f14137a5549834b0b0c8a783e90891b8d70b13 SHA512 39b1c294abe25e80d741a294b67a9691337cc71f69f8db03e4e6588512a94de2b772b74ae5cb35fa91da812293f0cf392cb51823ebe3c21f7f9ea99287d0655f WHIRLPOOL bd1b33ba0aa30e9dcf9dd05fdc0cdb18d3d22cbf66d97c521a4def4ee7238681590233885bc93946dca7a7bf88ef905f8490ef949f4d864e850806e6e581aac1
-DIST dbus-1.8.2.tar.gz 1859949 SHA256 5689f7411165adc953f37974e276a3028db94447c76e8dd92efe910c6d3bae08 SHA512 44e07ba57d89be4af3e305afcc21ee437dfa86e2dc17c7c6c81bf4f29aa5de3269281f684fa9ac8a6021b6d2b1f1f6bd901c17f783a692eb6435c087bd62c54d WHIRLPOOL d28bfb11aee432395f294e23efc34582446d950f28326ae41f55daad19629f8fb7aabc54fcf3131f85d8845567688e2cbbbfe7c25a390cb302dcd287691515f7
-DIST dbus-1.8.4.tar.gz 1860286 SHA256 3ef63dc8d0111042071ee7f7bafa0650c6ce2d7be957ef0b7ec269495a651ff8 SHA512 9ed29c96917d374c6187574d8612246f39187ed7df7e1dc4752f841eadba59dcc451bdc530dc934dd72b26c69844318e8a55e8f9a60618248a022c358d139da0 WHIRLPOOL 5a3826c76b78af1b017042ca14745c125344ea2c4d2bc564196508a5173603327c2b47d88e9bf0d2ba063ab069c709461c0886b4dd7408cbf76324b919cac6a9
 DIST dbus-1.8.6.tar.gz 1861784 SHA256 eded83ca007b719f32761e60fd8b9ffd0f5796a4caf455b01b5a5ef740ebd23f SHA512 62f162bab8e6f6d84fdfa1335013e0bf186d70bac5c3242dc956a912b7e35759f28a2bcaca29e1f620a7a30fc3ccc48552ffa123d4b3a2b5109135ae7ff5d1aa WHIRLPOOL 610f8b705ac61429e58220a422782a080966bfb01c4c856c715cfbc5939e4120542d503b8d22d117e3ad7653f33cf9c2405637c778390746bf38a02cb69eb13b
-EBUILD dbus-1.6.18-r1.ebuild 6154 SHA256 f48ee0db5d89cad75e23eb20629dc023923e0fd79d2c91e85e3806d0668c68cb SHA512 9f00634cbd27047d2809231ef8ec999c3d66ffeb35fb52cf66149aacabfaf1978f594d2e4b088c22a6b8efa13eeb665c2756d9703e8f5f8028900ed008c8eb83 WHIRLPOOL abcf1f529cb83a5e3e884dd4c2feba00de8b6559c285564ccebe2b1537103021c48fefd1eb2130c0dcebebda73efadcdfcb5c459bfce9b2a2806663abcd04d76
-EBUILD dbus-1.8.0.ebuild 5904 SHA256 88d936e155a08496872ded12e5a9cc907b0217c032ea07ae91ee9af8605e355b SHA512 867bac4eba72edffa39cd1514529b58f1baa9e9847f0f4b6b5f1d298643e42015d87f2f818886faa46814bab6487b0cb6d0ab0a5ff7550ce8535ca9f19dde3d3 WHIRLPOOL 32521df6a33f56fdcfe669608b918ea62024e7726d96d7df58ea1d6188afcd51b707bd7f3932c71a37687877f9d3b0abd913edbac32cb9c3a6079a1436235a52
-EBUILD dbus-1.8.2.ebuild 5992 SHA256 ca9c38435ba78e0a6c236e9257e7d01d61b46295c0b7a2ac62408b2885fab38e SHA512 12ed23fc5f20d0498f4e2ac22eb0fecebe7069856d775224bcbd0f08c9609616d584e29959996e78feec4708622c1cf17dd4f153d47f24d9d438abce73da8c11 WHIRLPOOL 7555e57003c6d715cd98e0847f4067582902bc5859d61f162f0d6023b282888f7072179cd8d7af145852b5b2ccd04feff2ba69267dc484b2a9260b616706b5c9
-EBUILD dbus-1.8.4.ebuild 5988 SHA256 bc601fb259ca5bab039d33ec9b06741effd637ee8d24fbd13b419466e8ca6164 SHA512 94485ad1ea451d57a9f33a22ed0a46997be62d1f6e3d43ad757eb7f8216c0050b5d422e53d46d3e88126c28c9cdec398b354fe5e312e09caa8ac5eb7247985bb WHIRLPOOL e85d560cf7f4a4f5603e22d82574ba5e8250dcacd33dc919310330c06decfc5aa2518668010549b38d840a350de61ce5dbd2fcf6a3185aba5971da5955de8d08
 EBUILD dbus-1.8.6.ebuild 5964 SHA256 4f2389e7c43075fbaf464c19ef001930b8edc0ddd795ec089d47c75dcf7a6a64 SHA512 e00e496957d9268d8b55dcb2c5426099c71274b99b53ffcfc30df34ebe58ccf5922f8bd720a860e50007ec1d58a240a4d1a1baf5ed3cc2544d6fc3e5d7a9392f WHIRLPOOL 548b53cda08f6c87c05a2792498f62b8e49a6ab52e2da21063b403c4baaae6f81c3f1da6cd673e4e72e1639f2e3170b95057ba760b3524c3a40ef09768d5e416
-MISC ChangeLog 62856 SHA256 79bcf458d4f18bac7c0b1d4d730d357d4572e994b8c94772aa354ee7dc3853bd SHA512 1c9c07bc5d2703ea0f85de36325ee152b01a924fa9bfa3523054ada7f09840f734dc8fdfa979fbf39030153d0de040686393569479c1f09b7639792d02201762 WHIRLPOOL 39725d96116940b05765fe35aa2af9618f4e355c04d6567b5ae2ebd17653363aa18250df38f059a7eba7ed8b05465b26bcf548b1268a4fb459d0c2c32eb98d8c
+MISC ChangeLog 63084 SHA256 2f9c641746d0fcfa6b10a117e72ced1d80e49c91b28173d5cf25f14e74e23a69 SHA512 fa7dd19df81fdfca802b45f7a02e70e16ad4878070bb73798a4b08f9ab60e9a3fc70806fc4a8e08ec62c945cb168a1e38ca4268ca365dd7e6b7b9b25fa89dc6c WHIRLPOOL 39b9b7fda36230bfdadf63c35373b1d3fee4c33c82a11f7b7f23778e710b6170fa31d1bc16e1b695477c772d62e395176f81ac842864015be073c9c7b2b180df
 MISC metadata.xml 427 SHA256 d8fc8fedafc547578a85222cb60fb7eff3740c8ce101b22ba75aa3e5028135ce SHA512 2f8f64ded5050e87ce679d944dcf9c9a801ea03ee14471ab0702f10339f3f995701c313bfe10e7ab01f1bc784f04a5e6efbb29ea0b44513b9b3e384370956dc5 WHIRLPOOL 7a2add023434038b287c141213c2caf2adcc7ff5bcfb8025b2db0163bedd436fea64dd0e1a072f00232722738705fdc1f367e758d108373146d6fbea8803d5b2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQEcBAEBCAAGBQJT0PjtAAoJEEdUh39IaPFN+NIH/AvOKps1LB+mPycIRw0wuRBX
-UXazFln9g5ccSqXQ/VMCGegbHoehyPb73y2sJg90Z3/uraBOBoACkj2uPYknbo9P
-iEP1Uic6gWH0Exi3fE3tXG8acpo9A0XI//7pAcEbCRuZZk8TdUunnkmGiokdoEHs
-fNBx0ZRiupcOyw2l4CJGH6cbgM2+hFwUGyCHMPs8UWNgrnrW/p7h/jVfto1R7jnY
-msWtxrVb/qiMYcSL0B1+AOrE64BhGlxwVi7+TUFgxI3y83ZvogdZHsj81ml8nyVH
-UeLT4X11nuwY9LHFb/ZEivVtjP1EGJEvPRdYCqY7ytg1d68XOHgoTUJ/6XsVywY=
-=D2zt
+iQEcBAEBCAAGBQJT0PlyAAoJEEdUh39IaPFNeN8H/31Epw0MgfiLNuBTGxO0+y+N
+v0P6vqzbonhFAiOn6juA+VEqYBU5HKGz3wjb0rAhHItmRJ7NJfMcEwk01Fv/4gHf
+blwhj1uwLfrpBgtWx4T3Tset1jGpkqbja22W275foDeXdep4QWKweatQ8NpApFpW
+1Vuy7vdKzdjGF7J5xIW1g3Dh5vqRIKgbzBNqSBZ7KKqW76a2wcR4+n5vRDMUy0/a
+LZ65NFxowHkGdcSEE7in5Es0rHUX8FMn3krHYtqVq5C4l8ak6pniA9VBGqc8u8kq
+l1Aa3Ra+YoVGH1aEGHDyfmXP6dwLzNNvWdIBvABOM1ND5v/4UGE2lTqhOSe0Pgs=
+=dG6F
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/dbus/dbus-1.6.18-r1.ebuild b/sys-apps/dbus/dbus-1.6.18-r1.ebuild
deleted file mode 100644
index de1e0d97386a..000000000000
--- a/sys-apps/dbus/dbus-1.6.18-r1.ebuild
+++ /dev/null
@@ -1,231 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/dbus-1.6.18-r1.ebuild,v 1.16 2014/06/10 00:47:05 vapier Exp $
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-inherit autotools eutils linux-info flag-o-matic multilib-minimal python-any-r1 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 arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
-IUSE="debug doc selinux static-libs systemd test X"
-
-RDEPEND=">=dev-libs/expat-2
-	selinux? (
-		sec-policy/selinux-dbus
-		sys-libs/libselinux
-		)
-	systemd? ( sys-apps/systemd )
-	X? (
-		x11-libs/libX11
-		x11-libs/libXt
-		)
-	abi_x86_32? (
-		!<=app-emulation/emul-linux-x86-baselibs-20131008-r4
-		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
-	)"
-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
-		${PYTHON_DEPS}
-		)"
-
-# out of sources build dir for make check
-TBD=${WORKDIR}/${P}-tests-build
-
-pkg_setup() {
-	enewgroup messagebus
-	enewuser messagebus -1 -1 -1 messagebus
-
-	use test && python-any-r1_pkg_setup
-
-	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
-}
-
-multilib_src_configure() {
-	local docconf myconf
-
-	# so we can get backtraces from apps
-	case ${CHOST} in
-		*-mingw*)
-			# error: unrecognized command line option '-rdynamic' wrt #488036
-			;;
-		*)
-			append-flags -rdynamic
-			;;
-	esac
-
-	# libaudit is *only* used in DBus wrt SELinux support, so disable it, if
-	# not on an SELinux profile.
-	myconf=(
-		--disable-silent-rules
-		--localstatedir="${EPREFIX}/var"
-		--docdir="${EPREFIX}/usr/share/doc/${PF}"
-		--htmldir="${EPREFIX}/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)
-		$(use_enable systemd)
-		--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)"
-		)
-
-	if multilib_is_native_abi; then
-		docconf=(
-			$(use_enable doc xml-docs) \
-			$(use_enable doc doxygen-docs)
-		)
-	else
-		docconf=(
-			--disable-xml-docs
-			--disable-doxygen-docs
-		)
-		myconf+=(
-			--disable-selinux
-			--disable-libaudit
-			--disable-systemd
-			--without-x
-
-			# libxml is easier to fake since it uses pkg-config
-			--with-xml=libxml
-			LIBXML_CFLAGS=' '
-			LIBXML_LIBS=' '
-		)
-	fi
-
-	einfo "Running configure in ${BUILD_DIR}"
-	ECONF_SOURCE="${S}" econf "${myconf[@]}" "${docconf[@]}"
-
-	if multilib_is_native_abi && 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
-}
-
-multilib_src_compile() {
-	if multilib_is_native_abi; then
-		# after the compile, it uses a selinuxfs interface to
-		# check if the SELinux policy has the right support
-		use selinux && addwrite /selinux/access
-
-		einfo "Running make in ${BUILD_DIR}"
-		emake
-
-		if multilib_is_native_abi && use test; then
-			cd "${TBD}"
-			einfo "Running make in ${TBD}"
-			emake
-		fi
-	else
-		emake -C dbus libdbus-1.la
-	fi
-}
-
-src_test() {
-	cd "${TBD}"
-	DBUS_VERBOSE=1 Xemake -j1 check
-}
-
-multilib_src_install() {
-	if multilib_is_native_abi; then
-		emake DESTDIR="${D}" install
-	else
-		emake DESTDIR="${D}" install-pkgconfigDATA
-		emake DESTDIR="${D}" -C dbus \
-			install-libLTLIBRARIES install-dbusincludeHEADERS \
-			install-nodist_dbusarchincludeHEADERS
-	fi
-}
-
-multilib_src_install_all() {
-	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
-	prune_libtool_files --all
-}
-
-pkg_postinst() {
-	if [ "$(rc-config list default | grep dbus)" = "" ] ; then
-		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
-	fi
-
-	elog "Some applications require a session bus in addition to the system"
-	elog "bus. Please see \`man dbus-launch\` for more information."
-	elog
-
-	if [ "$(rc-status | grep dbus | grep started)" ] ; then
-		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."
-	fi
-
-	# 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.8.0.ebuild b/sys-apps/dbus/dbus-1.8.0.ebuild
deleted file mode 100644
index bbb6ec32e444..000000000000
--- a/sys-apps/dbus/dbus-1.8.0.ebuild
+++ /dev/null
@@ -1,222 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/dbus-1.8.0.ebuild,v 1.7 2014/06/10 00:47:05 vapier Exp $
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-inherit autotools eutils linux-info flag-o-matic multilib-minimal python-any-r1 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 ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
-IUSE="debug doc selinux static-libs systemd test X"
-
-RDEPEND=">=dev-libs/expat-2
-	selinux? (
-		sec-policy/selinux-dbus
-		sys-libs/libselinux
-		)
-	systemd? ( sys-apps/systemd:0= )
-	X? (
-		x11-libs/libX11
-		x11-libs/libXt
-		)
-	abi_x86_32? (
-		!<=app-emulation/emul-linux-x86-baselibs-20131008-r4
-		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
-	)"
-DEPEND="${RDEPEND}
-	app-text/xmlto
-	app-text/docbook-xml-dtd:4.4
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-	test? (
-		>=dev-libs/glib-2.24
-		${PYTHON_DEPS}
-		)"
-
-# out of sources build dir for make check
-TBD=${WORKDIR}/${P}-tests-build
-
-pkg_setup() {
-	enewgroup messagebus
-	enewuser messagebus -1 -1 -1 messagebus
-
-	use test && python-any-r1_pkg_setup
-
-	if use kernel_linux; then
-		CONFIG_CHECK="~EPOLL"
-		linux-info_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_user
-
-	# required for asneeded patch but also for bug 263909, cross-compile so
-	# don't remove eautoreconf
-	eautoreconf
-}
-
-multilib_src_configure() {
-	local docconf myconf
-
-	# so we can get backtraces from apps
-	case ${CHOST} in
-		*-mingw*)
-			# error: unrecognized command line option '-rdynamic' wrt #488036
-			;;
-		*)
-			append-flags -rdynamic
-			;;
-	esac
-
-	# libaudit is *only* used in DBus wrt SELinux support, so disable it, if
-	# not on an SELinux profile.
-	myconf=(
-		--localstatedir="${EPREFIX}/var"
-		--docdir="${EPREFIX}/usr/share/doc/${PF}"
-		--htmldir="${EPREFIX}/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)
-		$(use_enable systemd)
-		--disable-embedded-tests
-		--disable-modular-tests
-		$(use_enable debug stats)
-		--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)"
-		)
-
-	if multilib_is_native_abi; then
-		docconf=(
-			--enable-xml-docs
-			$(use_enable doc doxygen-docs)
-		)
-	else
-		docconf=(
-			--disable-xml-docs
-			--disable-doxygen-docs
-		)
-		myconf+=(
-			--disable-selinux
-			--disable-libaudit
-			--disable-systemd
-			--without-x
-		)
-	fi
-
-	einfo "Running configure in ${BUILD_DIR}"
-	ECONF_SOURCE="${S}" econf "${myconf[@]}" "${docconf[@]}"
-
-	if multilib_is_native_abi && 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
-}
-
-multilib_src_compile() {
-	if multilib_is_native_abi; then
-		# after the compile, it uses a selinuxfs interface to
-		# check if the SELinux policy has the right support
-		use selinux && addwrite /selinux/access
-
-		einfo "Running make in ${BUILD_DIR}"
-		emake
-
-		if multilib_is_native_abi && use test; then
-			cd "${TBD}"
-			einfo "Running make in ${TBD}"
-			emake
-		fi
-	else
-		emake -C dbus libdbus-1.la
-	fi
-}
-
-src_test() {
-	cd "${TBD}"
-	DBUS_VERBOSE=1 Xemake -j1 check
-}
-
-multilib_src_install() {
-	if multilib_is_native_abi; then
-		emake DESTDIR="${D}" install
-	else
-		emake DESTDIR="${D}" install-pkgconfigDATA
-		emake DESTDIR="${D}" -C dbus \
-			install-libLTLIBRARIES install-dbusincludeHEADERS \
-			install-nodist_dbusarchincludeHEADERS
-	fi
-}
-
-multilib_src_install_all() {
-	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
-	prune_libtool_files --all
-}
-
-pkg_postinst() {
-	if [ "$(rc-config list default | grep dbus)" = "" ] ; then
-		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
-	fi
-
-	elog "Some applications require a session bus in addition to the system"
-	elog "bus. Please see \`man dbus-launch\` for more information."
-	elog
-
-	if [ "$(rc-status | grep dbus | grep started)" ] ; then
-		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."
-	fi
-
-	# 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.8.2.ebuild b/sys-apps/dbus/dbus-1.8.2.ebuild
deleted file mode 100644
index 7cf23ceb39d6..000000000000
--- a/sys-apps/dbus/dbus-1.8.2.ebuild
+++ /dev/null
@@ -1,224 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/dbus-1.8.2.ebuild,v 1.3 2014/06/10 00:47:05 vapier Exp $
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-inherit autotools eutils linux-info flag-o-matic multilib-minimal python-any-r1 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 ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
-IUSE="debug doc selinux static-libs systemd test X"
-
-RDEPEND=">=dev-libs/expat-2
-	selinux? (
-		sec-policy/selinux-dbus
-		sys-libs/libselinux
-		)
-	systemd? ( sys-apps/systemd:0= )
-	X? (
-		x11-libs/libX11
-		x11-libs/libXt
-		)
-	abi_x86_32? (
-		!<=app-emulation/emul-linux-x86-baselibs-20131008-r4
-		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
-	)"
-DEPEND="${RDEPEND}
-	app-text/xmlto
-	app-text/docbook-xml-dtd:4.4
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-	test? (
-		>=dev-libs/glib-2.24
-		${PYTHON_DEPS}
-		)"
-
-# out of sources build dir for make check
-TBD=${WORKDIR}/${P}-tests-build
-
-pkg_setup() {
-	enewgroup messagebus
-	enewuser messagebus -1 -1 -1 messagebus
-
-	use test && python-any-r1_pkg_setup
-
-	if use kernel_linux; then
-		CONFIG_CHECK="~EPOLL"
-		linux-info_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_user
-
-	# required for asneeded patch but also for bug 263909, cross-compile so
-	# don't remove eautoreconf
-	eautoreconf
-}
-
-multilib_src_configure() {
-	local docconf myconf
-
-	# so we can get backtraces from apps
-	case ${CHOST} in
-		*-mingw*)
-			# error: unrecognized command line option '-rdynamic' wrt #488036
-			;;
-		*)
-			append-flags -rdynamic
-			;;
-	esac
-
-	# libaudit is *only* used in DBus wrt SELinux support, so disable it, if
-	# not on an SELinux profile.
-	myconf=(
-		--localstatedir="${EPREFIX}/var"
-		--docdir="${EPREFIX}/usr/share/doc/${PF}"
-		--htmldir="${EPREFIX}/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)
-		$(use_enable systemd)
-		--disable-embedded-tests
-		--disable-modular-tests
-		$(use_enable debug stats)
-		--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)"
-		)
-
-	if multilib_is_native_abi; then
-		docconf=(
-			--enable-xml-docs
-			$(use_enable doc doxygen-docs)
-		)
-	else
-		docconf=(
-			--disable-xml-docs
-			--disable-doxygen-docs
-		)
-		myconf+=(
-			--disable-selinux
-			--disable-libaudit
-			--disable-systemd
-			--without-x
-		)
-	fi
-
-	einfo "Running configure in ${BUILD_DIR}"
-	ECONF_SOURCE="${S}" econf "${myconf[@]}" "${docconf[@]}"
-
-	if multilib_is_native_abi && 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
-}
-
-multilib_src_compile() {
-	if multilib_is_native_abi; then
-		# after the compile, it uses a selinuxfs interface to
-		# check if the SELinux policy has the right support
-		use selinux && addwrite /selinux/access
-
-		einfo "Running make in ${BUILD_DIR}"
-		emake
-
-		if multilib_is_native_abi && use test; then
-			cd "${TBD}"
-			einfo "Running make in ${TBD}"
-			emake
-		fi
-	else
-		emake -C dbus libdbus-1.la
-	fi
-}
-
-src_test() {
-	cd "${TBD}"
-	DBUS_VERBOSE=1 Xemake -j1 check
-}
-
-multilib_src_install() {
-	if multilib_is_native_abi; then
-		emake DESTDIR="${D}" install
-	else
-		emake DESTDIR="${D}" install-pkgconfigDATA
-		emake DESTDIR="${D}" -C dbus \
-			install-libLTLIBRARIES install-dbusincludeHEADERS \
-			install-nodist_dbusarchincludeHEADERS
-	fi
-}
-
-multilib_src_install_all() {
-	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
-	# let the init script create the /var/run/dbus directory
-	rm -rf "${ED}"/var/run
-
-	dodoc AUTHORS ChangeLog HACKING NEWS README doc/TODO
-	prune_libtool_files --all
-}
-
-pkg_postinst() {
-	if [ "$(rc-config list default | grep dbus)" = "" ] ; then
-		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
-	fi
-
-	elog "Some applications require a session bus in addition to the system"
-	elog "bus. Please see \`man dbus-launch\` for more information."
-	elog
-
-	if [ "$(rc-status | grep dbus | grep started)" ] ; then
-		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."
-	fi
-
-	# 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.8.4.ebuild b/sys-apps/dbus/dbus-1.8.4.ebuild
deleted file mode 100644
index a4596590d522..000000000000
--- a/sys-apps/dbus/dbus-1.8.4.ebuild
+++ /dev/null
@@ -1,224 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/dbus-1.8.4.ebuild,v 1.5 2014/06/24 19:15:14 maekke Exp $
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-inherit autotools eutils linux-info flag-o-matic multilib-minimal python-any-r1 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 ~arm64 hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux"
-IUSE="debug doc selinux static-libs systemd test X"
-
-RDEPEND=">=dev-libs/expat-2
-	selinux? (
-		sec-policy/selinux-dbus
-		sys-libs/libselinux
-		)
-	systemd? ( sys-apps/systemd:0= )
-	X? (
-		x11-libs/libX11
-		x11-libs/libXt
-		)
-	abi_x86_32? (
-		!<=app-emulation/emul-linux-x86-baselibs-20131008-r4
-		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
-	)"
-DEPEND="${RDEPEND}
-	app-text/xmlto
-	app-text/docbook-xml-dtd:4.4
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-	test? (
-		>=dev-libs/glib-2.24
-		${PYTHON_DEPS}
-		)"
-
-# out of sources build dir for make check
-TBD=${WORKDIR}/${P}-tests-build
-
-pkg_setup() {
-	enewgroup messagebus
-	enewuser messagebus -1 -1 -1 messagebus
-
-	use test && python-any-r1_pkg_setup
-
-	if use kernel_linux; then
-		CONFIG_CHECK="~EPOLL"
-		linux-info_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_user
-
-	# required for asneeded patch but also for bug 263909, cross-compile so
-	# don't remove eautoreconf
-	eautoreconf
-}
-
-multilib_src_configure() {
-	local docconf myconf
-
-	# so we can get backtraces from apps
-	case ${CHOST} in
-		*-mingw*)
-			# error: unrecognized command line option '-rdynamic' wrt #488036
-			;;
-		*)
-			append-flags -rdynamic
-			;;
-	esac
-
-	# libaudit is *only* used in DBus wrt SELinux support, so disable it, if
-	# not on an SELinux profile.
-	myconf=(
-		--localstatedir="${EPREFIX}/var"
-		--docdir="${EPREFIX}/usr/share/doc/${PF}"
-		--htmldir="${EPREFIX}/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)
-		$(use_enable systemd)
-		--disable-embedded-tests
-		--disable-modular-tests
-		$(use_enable debug stats)
-		--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)"
-		)
-
-	if multilib_is_native_abi; then
-		docconf=(
-			--enable-xml-docs
-			$(use_enable doc doxygen-docs)
-		)
-	else
-		docconf=(
-			--disable-xml-docs
-			--disable-doxygen-docs
-		)
-		myconf+=(
-			--disable-selinux
-			--disable-libaudit
-			--disable-systemd
-			--without-x
-		)
-	fi
-
-	einfo "Running configure in ${BUILD_DIR}"
-	ECONF_SOURCE="${S}" econf "${myconf[@]}" "${docconf[@]}"
-
-	if multilib_is_native_abi && 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
-}
-
-multilib_src_compile() {
-	if multilib_is_native_abi; then
-		# after the compile, it uses a selinuxfs interface to
-		# check if the SELinux policy has the right support
-		use selinux && addwrite /selinux/access
-
-		einfo "Running make in ${BUILD_DIR}"
-		emake
-
-		if multilib_is_native_abi && use test; then
-			cd "${TBD}"
-			einfo "Running make in ${TBD}"
-			emake
-		fi
-	else
-		emake -C dbus libdbus-1.la
-	fi
-}
-
-src_test() {
-	cd "${TBD}"
-	DBUS_VERBOSE=1 Xemake -j1 check
-}
-
-multilib_src_install() {
-	if multilib_is_native_abi; then
-		emake DESTDIR="${D}" install
-	else
-		emake DESTDIR="${D}" install-pkgconfigDATA
-		emake DESTDIR="${D}" -C dbus \
-			install-libLTLIBRARIES install-dbusincludeHEADERS \
-			install-nodist_dbusarchincludeHEADERS
-	fi
-}
-
-multilib_src_install_all() {
-	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
-	# let the init script create the /var/run/dbus directory
-	rm -rf "${ED}"/var/run
-
-	dodoc AUTHORS ChangeLog HACKING NEWS README doc/TODO
-	prune_libtool_files --all
-}
-
-pkg_postinst() {
-	if [ "$(rc-config list default | grep dbus)" = "" ] ; then
-		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
-	fi
-
-	elog "Some applications require a session bus in addition to the system"
-	elog "bus. Please see \`man dbus-launch\` for more information."
-	elog
-
-	if [ "$(rc-status | grep dbus | grep started)" ] ; then
-		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."
-	fi
-
-	# 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.5.12-selinux-when-dropping-capabilities-only-include-AUDI.patch b/sys-apps/dbus/files/dbus-1.5.12-selinux-when-dropping-capabilities-only-include-AUDI.patch
deleted file mode 100644
index 45d610c5ef1d..000000000000
--- a/sys-apps/dbus/files/dbus-1.5.12-selinux-when-dropping-capabilities-only-include-AUDI.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-http://bugs.gentoo.org/405975
-
-From e1b83fb58eadfd02227673db9a7e2833d29b0c98 Mon Sep 17 00:00:00 2001
-From: Lennart Poettering <lennart@poettering.net>
-Date: Mon, 23 Apr 2012 00:32:43 +0200
-Subject: [PATCH] selinux: when dropping capabilities only include AUDIT caps
- if we have them
-
-When we drop capabilities we shouldn't assume we can keep
-CAP_AUDIT_WRITE unconditionally, since it will not be available when
-running in containers.
-
-This patch only adds CAP_AUDIT_WRITE to the list of caps we keep if we
-actually have it in the first place.
-
-This makes audit/selinux enabled D-Bus work in a Linux container.
----
- bus/selinux.c |    5 +++--
- 1 file changed, 3 insertions(+), 2 deletions(-)
-
-diff --git a/bus/selinux.c b/bus/selinux.c
-index 36287e9..1bfc791 100644
---- a/bus/selinux.c
-+++ b/bus/selinux.c
-@@ -1053,8 +1053,9 @@ _dbus_change_to_daemon_user  (const char    *user,
-       int rc;
- 
-       capng_clear (CAPNG_SELECT_BOTH);
--      capng_update (CAPNG_ADD, CAPNG_EFFECTIVE | CAPNG_PERMITTED,
--                    CAP_AUDIT_WRITE);
-+      if (capng_have_capability (CAPNG_PERMITTED, CAP_AUDIT_WRITE))
-+        capng_update (CAPNG_ADD, CAPNG_EFFECTIVE | CAPNG_PERMITTED,
-+                      CAP_AUDIT_WRITE);
-       rc = capng_change_id (uid, gid, CAPNG_DROP_SUPP_GRP);
-       if (rc)
-         {
--- 
-1.7.10
-