sys-apps/dbus: Drop, patch applied upstream, bug #488036

9 files changed, 0 insertions, 346 deletions

diff --git a/metadata/md5-cache/sys-apps/dbus-1.6.18 b/metadata/md5-cache/sys-apps/dbus-1.6.18
deleted file mode 100644
index 4b7f8f41..00000000
--- a/metadata/md5-cache/sys-apps/dbus-1.6.18
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=>=dev-libs/expat-2 selinux? ( sec-policy/selinux-dbus sys-libs/libselinux ) systemd? ( sys-apps/systemd ) X? ( x11-libs/libX11 x11-libs/libXt ) 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.5-r2:2.7 ) ) || ( >=sys-devel/automake-1.12:1.12 >=sys-devel/automake-1.13:1.13 ) >=sys-devel/autoconf-2.68 sys-devel/libtool virtual/pkgconfig test? ( !prefix? ( x11-base/xorg-server[xvfb] ) x11-apps/xhost )
-DESCRIPTION=A message bus system, a simple way for applications to talk to each other
-EAPI=5
-HOMEPAGE=http://dbus.freedesktop.org/
-IUSE=debug doc selinux static-libs systemd test X test
-KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~arm-linux ~x86-linux
-LICENSE=|| ( AFL-2.1 GPL-2 )
-RDEPEND=>=dev-libs/expat-2 selinux? ( sec-policy/selinux-dbus sys-libs/libselinux ) systemd? ( sys-apps/systemd ) X? ( x11-libs/libX11 x11-libs/libXt )
-SLOT=0
-SRC_URI=http://dbus.freedesktop.org/releases/dbus/dbus-1.6.18.tar.gz
-_eclasses_=autotools	16761a2f972abd686713e5967ff3c754	eutils	4878e7f88afc0ba0866ac112190b0fd4	flag-o-matic	65cef1287b9d62b1a0f180765d1e0c69	libtool	5932e418cf62147cad2d902718aacc56	linux-info	a9cbd6bbe2b28166e403321882f3c73c	multilib	892e597faee02a5b94eb02ab512e7622	multiprocessing	67154e3c80516dc77f9f56956f5beebe	python-any-r1	08d3455b23110d650f173ab0a090818b	python-utils-r1	49ee0ca5e1019d8f256a23692dad2642	systemd	9f063b2cc19c5e8030911372aa246c4e	toolchain-funcs	51e6c948e72c43bcc8edc7544411c953	user	d0a4d0735a6c0183d707ca919bd72f28	versionator	a8a3963967d6140be9a14b08bb8f047f	virtualx	73cfc129b4b9ba23aed1abb10c825d86
-_md5_=96895119475bb29ef03a8285e283b7de
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index beb1905c..3bbc8a6a 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -96,7 +96,6 @@ net-wireless/hostapd:madwifi - Add support for madwifi (Atheros chipset)
 net-wireless/hostapd:wps - Add support for Wi-Fi Protected Setup
 sys-apps/busybox:floppyboot - Support floppydisk
 sys-apps/busybox:make-symlinks - Create all the appropriate symlinks in /bin and /sbin.
-sys-apps/dbus:systemd - Build with sys-apps/systemd at_console support
 www-apps/phabricator:highlight - Enable source code highlighting via dev-python/pygments
 www-apps/phabricator:mail - Update Differential and Maniphest by replying to messages and create Maniphest tasks via email
 www-apps/phabricator:mercurial - Support for dev-vcs/mercurial
diff --git a/sys-apps/dbus/ChangeLog b/sys-apps/dbus/ChangeLog
deleted file mode 100644
index 57f971e7..00000000
--- a/sys-apps/dbus/ChangeLog
+++ /dev/null
@@ -1,13 +0,0 @@
-*dbus-1.6.18 (30 Nov 2013)
-
-  30 Nov 2013; Bertrand Jacquin <beber@meleeweb.net> +dbus-1.6.18.ebuild,
-  -dbus-1.6.16.ebuild:
-  sys-apps/dbus: Refresh with upstream
-
-*dbus-1.6.16 (14 Oct 2013)
-
-  14 Oct 2013; Bertrand Jacquin <beber@meleeweb.net> +dbus-1.6.16.ebuild,
-  +files/80-dbus,
-  +files/dbus-1.5.12-selinux-when-dropping-capabilities-only-include-AUDI.patch,
-  +files/dbus.initd, +metadata.xml:
-  sys-apps/dbus: Remove -rdynamic for mingw platform, bug #488036
diff --git a/sys-apps/dbus/Manifest b/sys-apps/dbus/Manifest
deleted file mode 100644
index c74e1cf2..00000000
--- a/sys-apps/dbus/Manifest
+++ /dev/null
@@ -1,7 +0,0 @@
-AUX 80-dbus 341 SHA256 76ce25ce8769cdfcb0d7b7e52e5a7e6474448fc34e8ad9393afac1eca1e07fd2 WHIRLPOOL 74e9e79b86fc4802f34737bb47c3a71919f35fb2375119cdcd7fd6dae2de201e006fb4e6a978addd2300f7075180d4b088a69fa60d2ce4d689b6239b4a1307b1
-AUX dbus-1.5.12-selinux-when-dropping-capabilities-only-include-AUDI.patch 1320 SHA256 ab3398f4fb46ec9a134581a825180422b2b8f5e8dd250bca3127c31a39d923a7 WHIRLPOOL 9e30cbcba7ebe13cdc8a9e3ad0bb7d3d6e667dfba23a6cedfbacbbed34f6eb15bc6f0dcb42392f0c1a23ac891f0d820759f4201b8bac9b51d4241e74bed5ca2d
-AUX dbus.initd 1185 SHA256 441d76ab72e450f1ced10e25a5b59f422613cc2e3a5f65222d7f0ca149869b32 WHIRLPOOL bafd89f620061144c8bd4bb9112d3a0fe0e9532384b03a81258186e0f3306f7e6b45c23264c9ae794e9a2ae50a54474140119283223993890d6abb04ad09ecae
-DIST dbus-1.6.18.tar.gz 1916553 SHA256 7085a0895a9eb11a952394cdbea6d8b4358e17cb991fed0e8fb85e2b9e686dcd WHIRLPOOL 75d404f73fe893d83fde725d1564fc95046fdbd5d502b57c0cefef4a16d5128653397b8d7578d3839b23b7f53cb8b70729354805b240b8d5b308bb168afe1688
-EBUILD dbus-1.6.18.ebuild 5258 SHA256 6d79e70a23e27d4aa750672d8fb289106837fcdf386a3d4272197332bb84fbdd WHIRLPOOL e8177ccfefac55c147fef5d1fec70d26c3b567372754f09ff1a39380b3e5d23f64a61cddcc28dfe86a4f7076b6109087a14e77e84654abc9c2dadf837e5a1b60
-MISC ChangeLog 468 SHA256 8c36f39d0da8d9194fecde9b7a9b90a67712f75e700f520b81daf1fe59c9ff7f WHIRLPOOL c106c269978b25e39c51c969992861f6fc2a7a3e5a91a0cccc1e523e8e08eb09325a07359b28b3900251445db20f6bb4bc3eb3302f2d62f43d6f236139069067
-MISC metadata.xml 427 SHA256 d8fc8fedafc547578a85222cb60fb7eff3740c8ce101b22ba75aa3e5028135ce WHIRLPOOL 7a2add023434038b287c141213c2caf2adcc7ff5bcfb8025b2db0163bedd436fea64dd0e1a072f00232722738705fdc1f367e758d108373146d6fbea8803d5b2
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 9f1eb2e4..00000000
--- a/sys-apps/dbus/dbus-1.6.18.ebuild
+++ /dev/null
@@ -1,196 +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
-	case "${CHOST}" in
-		*-mingw*)	;;
-		*)			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)"
-		)
-
-	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/files/80-dbus b/sys-apps/dbus/files/80-dbus
deleted file mode 100644
index 5593e2cd..00000000
--- a/sys-apps/dbus/files/80-dbus
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/bash
-
-# launches a session dbus instance
-
-dbuslaunch="`which dbus-launch 2>/dev/null`"
-if [ -n "$dbuslaunch" ] && [ -x "$dbuslaunch" ] && [ -z "$DBUS_SESSION_BUS_ADDRESS" ]; then
-  if [ -n "$command" ]; then
-    command="$dbuslaunch --exit-with-session $command"
-  else
-    eval `$dbuslaunch --sh-syntax --exit-with-session`
-  fi
-fi
-
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 45d610c5..00000000
--- 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
-
diff --git a/sys-apps/dbus/files/dbus.initd b/sys-apps/dbus/files/dbus.initd
deleted file mode 100644
index 0410a1bd..00000000
--- a/sys-apps/dbus/files/dbus.initd
+++ /dev/null
@@ -1,50 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2013 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.initd,v 1.1 2011/11/05 13:56:10 ssuominen Exp $
-
-extra_started_commands="reload"
-
-depend() {
-	need localmount
-	after bootmisc
-}
-
-start() {
-	ebegin "Starting D-BUS system messagebus"
-	/usr/bin/dbus-uuidgen --ensure=/etc/machine-id
-
-	# 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}
-}
diff --git a/sys-apps/dbus/metadata.xml b/sys-apps/dbus/metadata.xml
deleted file mode 100644
index 70f327cf..00000000
--- a/sys-apps/dbus/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<herd>freedesktop</herd>
-	<maintainer>
-		<email>freedesktop-bugs@gentoo.org</email>
-	</maintainer>
-	<use>
-		<flag name='systemd'>Build with <pkg>sys-apps/systemd</pkg> at_console support</flag>
-	</use>
-	<upstream>
-		<remote-id type="cpe">cpe:/a:freedesktop:dbus</remote-id>
-	</upstream>
-</pkgmetadata>