old

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

6 files changed, 13 insertions, 794 deletions

diff --git a/sys-apps/dbus/ChangeLog b/sys-apps/dbus/ChangeLog
index 3fab60bd1848..2c048e491895 100644
--- a/sys-apps/dbus/ChangeLog
+++ b/sys-apps/dbus/ChangeLog
@@ -1,6 +1,10 @@
 # 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.413 2014/03/14 22:13:56 mattst88 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/dbus/ChangeLog,v 1.414 2014/03/15 08:27:43 ssuominen Exp $
+
+  15 Mar 2014; Samuli Suominen <ssuominen@gentoo.org> -dbus-1.6.12.ebuild,
+  -dbus-1.6.14.ebuild, -dbus-1.6.16.ebuild, -dbus-1.6.18.ebuild:
+  old
 
   14 Mar 2014; Matt Turner <mattst88@gentoo.org> dbus-1.6.18-r1.ebuild:
   alpha stable, bug #496628.
diff --git a/sys-apps/dbus/Manifest b/sys-apps/dbus/Manifest
index f061b0cbffe6..41ded73274ff 100644
--- a/sys-apps/dbus/Manifest
+++ b/sys-apps/dbus/Manifest
@@ -4,33 +4,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.initd 1185 SHA256 98e37b8b6ed25004e48c5855d74c9361eea06d3fee13cefcc0ed10ccf452aa01 SHA512 7983e77015b46c204b10948a1fcedaae53a75848919961eb1ef8878bfa11c933256642c0e3f59163e72374ce1bd33b0338c787ce067c0982fcdf8a798b922a15 WHIRLPOOL 62ef5b9191a2bd3410c53ed63015e9968789f448e5959de2ebc2404bc13ce99c333546bf1eb335f826ef7ea143f70a53c2ecffd81b4e35fa51ba2e2bdf68879f
-DIST dbus-1.6.12.tar.gz 1933805 SHA256 f67a7abfd6d045c1e9eba2bba4199d301836bc0c6e8a727c765913aba780ee92 SHA512 860f3c86268857662bc397cd6fd0c163dfe38c77c28525c47226e22d890ec3c2df724f887f55f65a60b729e8eb5dce91ce8ecd045391d88acb1884b8dbf33c71 WHIRLPOOL 248872ad9636f60d5b4e19b5876ec1b675db02e7c755f19f3a1966aedcdeb834a092d6e678fe1ea7e06a4b5e33d2ac31739c12093c6aee8dea8147fd0d22716a
-DIST dbus-1.6.14.tar.gz 1946612 SHA256 5676011d5714682062c4cb0cdd3365c15025809bc26ddbec3e4edeea7867f56c SHA512 6c1070b95b509ae9245d7c04543ce938484ed1f81afdaccb65f1c71b396c8036c62a00afff56b618325c300834096e27e5afe58e53b7e4096dae42daf9034b5a WHIRLPOOL a67befaf2304c4efc71e1ddadf9280e748d1f1646a0734c3dac9fe4ec9c4f850b0a9b2f72ffbad4cb2389d0336622006c605b70acc716a85bd535ca22da02cab
-DIST dbus-1.6.16.tar.gz 1948266 SHA256 463f42873aafcde733de3105e6d166709a42bc961fb4e3ef27657dfd55813573 SHA512 818b7e68c80c15742329512c2b0b0e639386cd453acad5cdc34ab28d8c2eaa715538eae847345303ff968db28342966398fa03ba5f345c15431c65457b3ab1b5 WHIRLPOOL 83b3dcf90c2f2481a1fb6f67d64e9a9053d726af997c3def9a0c8187ce8f78e1ca977de6a8f2dcea8a5f5ce2d5f2def7cf2a5b6f4d4724d940521422ee6046f3
 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
-EBUILD dbus-1.6.12.ebuild 5192 SHA256 cd99facf8417cfa959ac2ffc26827908567bb7d4904a18d5324222348db3f33e SHA512 8fe5e1855ee89ef69f04f65d3329e36ceaf7c9f9e3e93ee2266f1116d62e16189f503e8a223c4a8e59475bed2373a0246e7a4986dc1448f7a916b4e584850aa9 WHIRLPOOL b11ffeac4cc939bd2f9904a888648be49806193cd5f2fdba124855c73845217715148f48d27b3629734e2f1b774500e23882593280c2c91fb317c1bacbb8d061
-EBUILD dbus-1.6.14.ebuild 5208 SHA256 c025094ec32771bf7fae724766762bdac4067762de655e7eed90b0865f1e9d5f SHA512 076e751485ca178eb2b936d21f02bded05dff733dc8a80970dc0de772a3cb5df539242de3e65a83fa06aad30acdb62b2dd777c586cb0b8bb9ba3f7d6bc0d0307 WHIRLPOOL b0a9045d16a98fde049100002fb28bc530de1d0084f8e34f7cf498e12b12e4a5be9a21b22272132bbfdb86e39105e406739e45458ccf1b1de4772c4d91609815
-EBUILD dbus-1.6.16.ebuild 5208 SHA256 6567b757a8f7a8d66ed997cd40ece027d84bbda6d4fe33923f2b4bf93d3fb435 SHA512 7ff0c4656b13933ad9d5617435eea2bf0b931a9865620c7f4424715986ebf61046b99d11db00418e2bc04dd329e102284beb43e607f11dd06a556b7519a45563 WHIRLPOOL 8bac7fae43bd024b71d71f2853b0d5ff17a1d69d2069b90b892cab3dac270d539b510952b386cc3217a7ebc1d8d2effdf14d5dc41c13f645770cead8546dca47
 EBUILD dbus-1.6.18-r1.ebuild 6152 SHA256 de28b2de655e8c336ae85e5d289c27425a5a732f360784b6845cb279c4e53c68 SHA512 c24ed8aee5acadb29a0d426c6eed86a625eaf1f60796bb1c4b4be842f1c60fab9043a098e5e883ccc2cb097fd90f1423a5b438d1ae9a8b5e26ea19b5378bb5e1 WHIRLPOOL dfccfab4d3846f3b191bb779fd59fa7370a57ac2795b2232c2ae6aaa6436b22e0912b3dfdf6e90d7b3ded9e46733acdb0e3d27a9e94660925fc5fb7de7a4fdcf
-EBUILD dbus-1.6.18.ebuild 5208 SHA256 8f3aca8aaf43dce68e40f2265555aa8406fcea01a726ee4334690a5fc188108c SHA512 bb64a6a3feef848008327dc301c56074623d95d2dd3152313c3fab112da1bb63ce529a243aeaa5bfca262b0f7aa69a561f02da7045bb0f28b63bee32d618b69d WHIRLPOOL 37c65bcc3016439fd8552d64d685bbf3709712c5de253f5b73a067767794856bb8d578a10e25d770bac91970c6b8b82767545e7edfac3e4871647a5edd12148f
 EBUILD dbus-1.8.0.ebuild 5899 SHA256 82835575362a225fffcb7c47f775ac5e0cc2e1f68b2cadc4374d448130310974 SHA512 3deb7ae686d0769122d8fef00c57c940a9abeecf32749b1a3ad0b2997f527ece9d6622a0f59c9cb36e84e7df002b5fb102993d4b1ed64a6f631a5201ca6a93cf WHIRLPOOL cf34830e2c951bfd9119a786ee5bc5922e5807adfa7eefd9940227afbfa111fd3c8eacc5ab9e799d006013e5684f2cfe616e23c48e3eb9e0689b156eb66034c3
-MISC ChangeLog 59851 SHA256 c708971cc84a16a640d01767acfc310a02d13633aa90501068b17b08f3cf3d71 SHA512 54d3dbe11bf5693c165d235a4f85a930a991039dfe63717a1399c87e6b9a1adfe0fdef00966e55743d179db97cecacadbed7124a5b3bf5fb960a975c1526205a WHIRLPOOL e29c1032a9114522d17566772c41cd6d0183255e0471f8cb9280c7cdfdd6d833b920d9188bda7de5ed51e18ebe20dda18117b3652ef09efb9ce078885d0bf33d
+MISC ChangeLog 59999 SHA256 827211300df9c618089fa578a7d3b7be3bd90cb7aff71682e9e68af8e728a319 SHA512 b3ae276d1940dfc77ba434b5ed0303b7fa80819b166ad28352d9c7fa6e8a57c6ba556bdfc93ba24883557841d2a22cad81a6a2ff1152a471cb9d35c10e987697 WHIRLPOOL 9668bd7cd4c4375bf325093c9eb44e6124ae4252dd73c8e62252a9a5cfeebbee6ef12b32e748834f431a971cc15cf63c7a7cfdf7fc3dbda1944f2005c9d06e13
 MISC metadata.xml 427 SHA256 d8fc8fedafc547578a85222cb60fb7eff3740c8ce101b22ba75aa3e5028135ce SHA512 2f8f64ded5050e87ce679d944dcf9c9a801ea03ee14471ab0702f10339f3f995701c313bfe10e7ab01f1bc784f04a5e6efbb29ea0b44513b9b3e384370956dc5 WHIRLPOOL 7a2add023434038b287c141213c2caf2adcc7ff5bcfb8025b2db0163bedd436fea64dd0e1a072f00232722738705fdc1f367e758d108373146d6fbea8803d5b2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQIcBAEBCAAGBQJTI39KAAoJEA/daC2XTKcqnZ8QAKXYjSeyo2ePBCVhYCovC1m4
-sEj4P6fByycQBjzI11wI07WMIlYOS+ZJJPCvSuiG1zjFAels73bJQEtzsOuZ+dOm
-GhqlwYWPurNFl8e7bmea6+nwPCsoJYt6fQAulp9hNCgwvHPg1agRo4rmVvlI779i
-jxxHBE4U8ohtaIDsJu0KryHquW0B3cPlQdEouqES+ldnU61Ulu1748TYWoxeNd4D
-qlcQyCwHDbpl0JZnbq4w5K0IY9FIb3qWK5F+f7AThhSGw9oNzdImXQpI3MaywTrO
-78tdNiYp96CDUohJfBt0NEROOxiEFzUUCAXdR6LnudRKp9O3FkU/nb78rWK7+pbs
-flLRkUZ16aKf3jMfc/B0eZD2uBVQ/Kv+PS5x+/nfAcHw2vcGaS1UUr3+kfYfrAVc
-oWFsfymChABFrUVg1pXh5yq2izxQsrBJ/tC3wUDBZANvdhX7tGkN8PrVkSeNc/Os
-tk9qhawRJili3Jg2Tehzxb+LrTTFd85mBuIMbxO1x6K1MSpqrnNwfqfoHDbCKeEA
-TM47ZPFj/8BF3JfbCstkegioOknt4NULgf6xv0tsv03Vwrx32fWlHz/ajPNIPVul
-VrOjborI+A4JH0qnFFxKiV2N5xRUYHB/VpeEfYSJyU2Mz18Cj2NRXIrsUXZRYtzm
-L/EQ1VQ4Zt2I7Fx9Tk9G
-=azhp
+iQEcBAEBCAAGBQJTJA4TAAoJEEdUh39IaPFN4aQH/iRIY2vRjAZeN9JsebUlmHm0
+Tw5qvNRQT+byOQLaO2QORxzUXF0StLljEyU/FOQ1bYkYwHee3v70lT2pVSwUtnNp
+SLsxwhfuv4wgHGnePltTSWmS6UAkKQsn72DKIyVxArr6zYw8Rvdck4b1Nuj8ipvl
+4TkxDGP0cJoWz/Phz1Ao33qseOPhUM07tG144X3b2hUhDmTU/YBwrzlkBT0Hxf51
+8VbVtQXhzNE9ZNdxr8YlFPG/mYCZ5eIF+DEi77SQ/0U2FSZ75fjFZgez1DiyObVd
+03lV03z9tRf0AiSFelouOvMJeaz55FYy8Uncas+Lp6SNImEgvvV1QoW5zerX7WQ=
+=g28e
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/dbus/dbus-1.6.12.ebuild b/sys-apps/dbus/dbus-1.6.12.ebuild
deleted file mode 100644
index e346c5f6ea40..000000000000
--- a/sys-apps/dbus/dbus-1.6.12.ebuild
+++ /dev/null
@@ -1,193 +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.12.ebuild,v 1.12 2013/07/04 13:40:03 ago Exp $
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-inherit autotools eutils linux-info flag-o-matic 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 hppa ia64 ~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
-		)"
-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 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
-
-	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
-}
-
-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
-		--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)"
-		)
-
-	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
-
-	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.6.14.ebuild b/sys-apps/dbus/dbus-1.6.14.ebuild
deleted file mode 100644
index 466a1ec05159..000000000000
--- a/sys-apps/dbus/dbus-1.6.14.ebuild
+++ /dev/null
@@ -1,193 +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.14.ebuild,v 1.1 2013/09/22 16:20:25 ssuominen Exp $
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-inherit autotools eutils linux-info flag-o-matic 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 ~hppa ~ia64 ~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
-		)"
-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 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
-
-	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
-}
-
-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
-		--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)"
-		)
-
-	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
-
-	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.6.16.ebuild b/sys-apps/dbus/dbus-1.6.16.ebuild
deleted file mode 100644
index 00d15c33bd1b..000000000000
--- a/sys-apps/dbus/dbus-1.6.16.ebuild
+++ /dev/null
@@ -1,193 +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.16.ebuild,v 1.1 2013/10/08 16:50:16 ssuominen Exp $
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-inherit autotools eutils linux-info flag-o-matic 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 ~hppa ~ia64 ~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
-		)"
-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 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
-
-	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
-}
-
-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
-		--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)"
-		)
-
-	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
-
-	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.6.18.ebuild b/sys-apps/dbus/dbus-1.6.18.ebuild
deleted file mode 100644
index efa0ce402454..000000000000
--- a/sys-apps/dbus/dbus-1.6.18.ebuild
+++ /dev/null
@@ -1,193 +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.18.ebuild,v 1.1 2013/11/02 07:04:07 ssuominen Exp $
-
-EAPI=5
-PYTHON_COMPAT=( python2_7 )
-inherit autotools eutils linux-info flag-o-matic 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 ~hppa ~ia64 ~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
-		)"
-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 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
-
-	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
-}
-
-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
-		--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)"
-		)
-
-	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
-
-	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
-}