Drop old

(Portage version: 2.1.11.50/cvs/Linux x86_64, signed Manifest commit with key A188FBD4)

15 files changed, 10 insertions, 632 deletions

diff --git a/net-wireless/bluez/ChangeLog b/net-wireless/bluez/ChangeLog
index b20ffa538f7b..6b3fabd58f22 100644
--- a/net-wireless/bluez/ChangeLog
+++ b/net-wireless/bluez/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-wireless/bluez
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez/ChangeLog,v 1.158 2013/01/26 13:15:30 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez/ChangeLog,v 1.159 2013/02/12 19:32:03 pacho Exp $
+
+  12 Feb 2013; Pacho Ramos <pacho@gentoo.org> -bluez-4.101-r4.ebuild,
+  -bluez-4.99.ebuild, -files/bluetooth-conf.d, -files/bluetooth-init.d,
+  -files/bluetooth-init.d-r1, -files/bluez-4.18-udev.rules,
+  -files/bluez-4.18-udev.script, -files/bluez-4.67-udev.script,
+  -files/bluez-4.98-fix-header.patch, -files/bluez-4.98-fix-socket.patch,
+  -files/conf.d-dund, -files/conf.d-hidd, -files/init.d-dund,
+  -files/init.d-hidd:
+  Drop old
 
   26 Jan 2013; Agostino Sarubbo <ago@gentoo.org> bluez-4.101-r5.ebuild:
   Stable for ppc64, wrt bug #448908
diff --git a/net-wireless/bluez/bluez-4.101-r4.ebuild b/net-wireless/bluez/bluez-4.101-r4.ebuild
deleted file mode 100644
index 7a14f98cd710..000000000000
--- a/net-wireless/bluez/bluez-4.101-r4.ebuild
+++ /dev/null
@@ -1,153 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez/bluez-4.101-r4.ebuild,v 1.1 2012/12/02 09:42:12 ssuominen Exp $
-
-EAPI=5
-PYTHON_DEPEND="test-programs? 2:2.6"
-inherit eutils multilib python systemd user
-
-DESCRIPTION="Bluetooth Tools and System Daemons for Linux"
-HOMEPAGE="http://www.bluez.org/"
-SRC_URI="mirror://kernel/linux/bluetooth/${P}.tar.xz"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
-IUSE="alsa +consolekit cups debug gstreamer pcmcia readline selinux test-programs usb"
-
-CDEPEND="
-	>=dev-libs/glib-2.28
-	>=sys-apps/dbus-1.6
-	>=sys-apps/hwids-20121202.2
-	>=virtual/udev-171
-	alsa? (
-		media-libs/alsa-lib[alsa_pcm_plugins_extplug(+),alsa_pcm_plugins_ioplug(+)]
-		media-libs/libsndfile
-	)
-	cups? ( net-print/cups )
-	gstreamer? (
-		>=media-libs/gstreamer-0.10:0.10
-		>=media-libs/gst-plugins-base-0.10:0.10
-	)
-	readline? ( sys-libs/readline )
-	selinux? ( sec-policy/selinux-bluetooth )
-	usb? ( virtual/libusb:0 )
-"
-DEPEND="${CDEPEND}
-	sys-devel/flex
-	virtual/pkgconfig
-	test-programs? ( >=dev-libs/check-0.9.6 )
-"
-RDEPEND="${CDEPEND}
-	consolekit? ( || ( sys-auth/consolekit sys-apps/systemd ) )
-	test-programs? (
-		>=dev-python/dbus-python-1
-		dev-python/pygobject:2
-	)
-"
-
-DOCS=( AUTHORS ChangeLog README )
-
-pkg_setup() {
-	use consolekit || enewgroup plugdev
-	use test-programs && python_pkg_setup
-}
-
-src_prepare() {
-	epatch "${FILESDIR}"/${P}-network{1,2,3,4}.patch
-
-	# Use static group "plugdev" if there is no ConsoleKit (or systemd logind)
-	use consolekit || epatch "${FILESDIR}"/bluez-plugdev.patch
-
-	if use cups; then
-		sed -i \
-			-e "s:cupsdir = \$(libdir)/cups:cupsdir = `cups-config --serverbin`:" \
-			Makefile.{in,tools} || die
-	fi
-}
-
-src_configure() {
-	export ac_cv_header_readline_readline_h=$(usex readline)
-
-	# Missing flags: --enable-{sap,hidd,pand,dund,dbusoob,gatt}
-	# Keep this in ./configure --help order!
-	econf \
-		--localstatedir=/var \
-		--enable-network \
-		--enable-serial \
-		--enable-input \
-		--enable-audio \
-		--enable-service \
-		--enable-health \
-		--enable-pnat \
-		$(use_enable gstreamer) \
-		$(use_enable alsa) \
-		$(use_enable usb) \
-		--enable-tools \
-		--enable-bccmd \
-		$(use_enable pcmcia) \
-		--enable-hid2hci \
-		--enable-dfutool \
-		$(use_enable cups) \
-		$(use_enable test-programs test) \
-		--enable-datafiles \
-		$(use_enable debug) \
-		--enable-maemo6 \
-		--enable-wiimote \
-		--disable-hal \
-		--with-ouifile=/usr/share/misc/oui.txt \
-		--with-systemdunitdir="$(systemd_get_unitdir)"
-}
-
-src_install() {
-	default
-
-	if use test-programs; then
-		pushd test >/dev/null
-		dobin simple-agent simple-service monitor-bluetooth
-		newbin list-devices list-bluetooth-devices
-		rm test-textfile.{c,o} || die #356529
-		local b
-		for b in hsmicro hsplay test-*; do
-			newbin "${b}" bluez-"${b}"
-		done
-		insinto /usr/share/doc/${PF}/test-services
-		doins service-*
-		python_convert_shebangs -r 2 "${ED}"
-		popd >/dev/null
-	fi
-
-	insinto /etc/bluetooth
-	local d
-	for d in input audio network serial; do
-		doins ${d}/${d}.conf
-	done
-
-	newinitd "${FILESDIR}"/bluetooth-init.d-r2 bluetooth
-	newinitd "${FILESDIR}"/rfcomm-init.d rfcomm
-	newconfd "${FILESDIR}"/rfcomm-conf.d rfcomm
-
-	prune_libtool_files --all
-}
-
-pkg_postinst() {
-	udevadm control --reload-rules
-
-	has_version net-dialup/ppp || elog "To use dial up networking you must install net-dialup/ppp."
-
-	if use consolekit; then
-		elog "If you want to use rfcomm as a normal user, you need to add the user"
-		elog "to the uucp group."
-	else
-		elog "Since you have the consolekit use flag disabled, you will only be able to run"
-		elog "bluetooth clients as root. If you want to be able to run bluetooth clientes as "
-		elog "a regular user, you need to enable the consolekit use flag for this package or"
-		elog "to add the user to the plugdev group."
-	fi
-
-	if [ "$(rc-config list default | grep bluetooth)" = "" ]; then
-		elog "You will need to add bluetooth service to default runlevel"
-		elog "for getting your devices detected. For that please run:"
-		elog "'rc-update add bluetooth default'"
-	fi
-}
diff --git a/net-wireless/bluez/bluez-4.99.ebuild b/net-wireless/bluez/bluez-4.99.ebuild
deleted file mode 100644
index 54fe162a9ef9..000000000000
--- a/net-wireless/bluez/bluez-4.99.ebuild
+++ /dev/null
@@ -1,176 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez/bluez-4.99.ebuild,v 1.14 2012/12/11 09:44:00 ssuominen Exp $
-
-EAPI="4"
-PYTHON_DEPEND="test-programs? 2"
-
-inherit multilib eutils systemd python user
-
-DESCRIPTION="Bluetooth Tools and System Daemons for Linux"
-HOMEPAGE="http://www.bluez.org/"
-
-# Because of oui.txt changing from time to time without noticement, we need to supply it
-# ourselves instead of using http://standards.ieee.org/regauth/oui/oui.txt directly.
-# See bugs #345263 and #349473 for reference.
-OUIDATE="20120308"
-SRC_URI="mirror://kernel/linux/bluetooth/${P}.tar.xz
-	http://dev.gentoo.org/~pacho/bluez/oui-${OUIDATE}.txt.xz"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 arm hppa ppc ppc64 x86"
-IUSE="alsa caps +consolekit cups debug gstreamer pcmcia selinux test-programs usb readline"
-
-CDEPEND="
-	>=dev-libs/glib-2.14:2
-	sys-apps/dbus
-	~virtual/udev-171
-	alsa? (
-		media-libs/alsa-lib[alsa_pcm_plugins_extplug(+),alsa_pcm_plugins_ioplug(+)]
-		media-libs/libsndfile
-	)
-	caps? ( >=sys-libs/libcap-ng-0.6.2 )
-	cups? ( net-print/cups )
-	gstreamer? (
-		>=media-libs/gstreamer-0.10:0.10
-		>=media-libs/gst-plugins-base-0.10:0.10
-	)
-	selinux? ( sec-policy/selinux-bluetooth )
-	usb? ( virtual/libusb:0 )
-	readline? ( sys-libs/readline )
-"
-DEPEND="${CDEPEND}
-	virtual/pkgconfig
-	sys-devel/flex
-	test-programs? ( >=dev-libs/check-0.9.6 )
-"
-RDEPEND="${CDEPEND}
-	!net-wireless/bluez-libs
-	!net-wireless/bluez-utils
-	consolekit? (
-		|| ( sys-auth/consolekit
-			>=sys-apps/systemd-37 )
-	)
-	test-programs? (
-		dev-python/dbus-python
-		dev-python/pygobject:2
-	)
-"
-
-DOCS=( AUTHORS ChangeLog README )
-
-pkg_setup() {
-	if ! use consolekit; then
-		enewgroup plugdev
-	fi
-
-	if use test-programs; then
-		python_pkg_setup
-	fi
-}
-
-src_prepare() {
-	if ! use consolekit; then
-		# No consolekit for at_console etc, so we grant plugdev the rights
-		epatch	"${FILESDIR}/bluez-plugdev.patch"
-	fi
-
-	if use cups; then
-		sed -i \
-			-e "s:cupsdir = \$(libdir)/cups:cupsdir = `cups-config --serverbin`:" \
-			Makefile.tools Makefile.in || die
-	fi
-}
-
-src_configure() {
-	use readline || export ac_cv_header_readline_readline_h=no
-
-	econf \
-		--enable-hid2hci \
-		--enable-audio \
-		--enable-bccmd \
-		--enable-datafiles \
-		--enable-dfutool \
-		--enable-input \
-		--enable-network \
-		--enable-serial \
-		--enable-service \
-		--enable-tools \
-		--disable-hal \
-		--localstatedir=/var \
-		--with-systemdunitdir="$(systemd_get_unitdir)" \
-		$(use_enable alsa) \
-		$(use_enable caps capng) \
-		$(use_enable cups) \
-		$(use_enable debug) \
-		$(use_enable gstreamer) \
-		$(use_enable pcmcia) \
-		$(use_enable test-programs test) \
-		$(use_enable usb) \
-		--enable-health \
-		--enable-maemo6 \
-		--enable-pnat \
-		--enable-wiimote
-}
-
-src_install() {
-	default
-
-	if use test-programs ; then
-		cd "${S}/test"
-		dobin simple-agent simple-service monitor-bluetooth
-		newbin list-devices list-bluetooth-devices
-		rm test-textfile.{c,o} || die # bug #356529
-		for b in apitest hsmicro hsplay test-* ; do
-			newbin "${b}" "bluez-${b}"
-		done
-		insinto /usr/share/doc/${PF}/test-services
-		doins service-*
-
-		python_convert_shebangs -r 2 "${ED}"
-		cd "${S}"
-	fi
-
-	insinto /etc/bluetooth
-	doins \
-		input/input.conf \
-		audio/audio.conf \
-		network/network.conf \
-		serial/serial.conf
-
-	newinitd "${FILESDIR}/bluetooth-init.d-r1" bluetooth
-	newinitd "${FILESDIR}/rfcomm-init.d" rfcomm
-	newconfd "${FILESDIR}/rfcomm-conf.d" rfcomm
-
-	# Install oui.txt as requested in bug #283791 and approved by upstream
-	insinto /var/lib/misc
-	newins "${WORKDIR}/oui-${OUIDATE}.txt" oui.txt
-
-	find "${D}" -name "*.la" -delete
-}
-
-pkg_postinst() {
-	udevadm control --reload-rules && udevadm trigger --subsystem-match=bluetooth
-
-	if ! has_version "net-dialup/ppp"; then
-		elog "To use dial up networking you must install net-dialup/ppp."
-	fi
-
-	if use consolekit; then
-		elog "If you want to use rfcomm as a normal user, you need to add the user"
-		elog "to the uucp group."
-	else
-		elog "Since you have the consolekit use flag disabled, you will only be able to run"
-		elog "bluetooth clients as root. If you want to be able to run bluetooth clientes as "
-		elog "a regular user, you need to enable the consolekit use flag for this package or"
-		elog "to add the user to the plugdev group."
-	fi
-
-	if [ "$(rc-config list default | grep bluetooth)" = "" ] ; then
-		elog "You will need to add bluetooth service to default runlevel"
-		elog "for getting your devices detected from startup without needing"
-		elog "to reconnect them. For that please run:"
-		elog "'rc-update add bluetooth default'"
-	fi
-}
diff --git a/net-wireless/bluez/files/bluetooth-conf.d b/net-wireless/bluez/files/bluetooth-conf.d
deleted file mode 100644
index b0cc744415ad..000000000000
--- a/net-wireless/bluez/files/bluetooth-conf.d
+++ /dev/null
@@ -1,7 +0,0 @@
-# Bluetooth configuraton file
-
-# Bind rfcomm devices (allowed values are "true" and "false")
-RFCOMM_ENABLE=true
-
-# Config file for rfcomm
-RFCOMM_CONFIG="/etc/bluetooth/rfcomm.conf"
diff --git a/net-wireless/bluez/files/bluetooth-init.d b/net-wireless/bluez/files/bluetooth-init.d
deleted file mode 100644
index 6339f99c738e..000000000000
--- a/net-wireless/bluez/files/bluetooth-init.d
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez/files/bluetooth-init.d,v 1.2 2011/03/20 16:57:35 pacho Exp $
-
-depend() {
-	after coldplug
-	need dbus localmount hostname
-}
-
-start() {
-   	ebegin "Starting Bluetooth"
-
-	udevadm trigger --subsystem-match=bluetooth --action=add
-	eend $?
-
-	if [ "${RFCOMM_ENABLE}" = "true" -a -x /usr/bin/rfcomm ]; then
-		if [ -f "${RFCOMM_CONFIG}" ]; then
-			eindent
-			ebegin "Starting rfcomm"
-			/usr/bin/rfcomm -f "${RFCOMM_CONFIG}" bind all
-			eoutdent
-			eend $?
-		else
-			ewarn "Not enabling rfcomm because RFCOMM_CONFIG does not exists"
-		fi
-	fi
-}
-
-stop() {
-	ebegin "Shutting down Bluetooth"
-	eend 0
-}
diff --git a/net-wireless/bluez/files/bluetooth-init.d-r1 b/net-wireless/bluez/files/bluetooth-init.d-r1
deleted file mode 100644
index 9280f93bac89..000000000000
--- a/net-wireless/bluez/files/bluetooth-init.d-r1
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez/files/bluetooth-init.d-r1,v 1.1 2012/01/09 23:01:55 pacho Exp $
-
-depend() {
-	after coldplug
-	need dbus localmount hostname
-}
-
-start() {
-   	ebegin "Udev coldplug of bluetooth devices"
-	udevadm trigger --subsystem-match=bluetooth --action=add
-	eend $?
-}
-
-stop() {
-	return 0
-}
diff --git a/net-wireless/bluez/files/bluez-4.18-udev.rules b/net-wireless/bluez/files/bluez-4.18-udev.rules
deleted file mode 100644
index b3ccd5bbbaec..000000000000
--- a/net-wireless/bluez/files/bluez-4.18-udev.rules
+++ /dev/null
@@ -1,5 +0,0 @@
-# Start/Stop bluetooth service on device insertion. Gentoo specific.
-SUBSYSTEM=="bluetooth", KERNEL=="hci[0-9]*", RUN+="bluetooth.sh"
-
-# So that normal users can dial out.
-SUBSYSTEM=="tty", SUBSYSTEMS=="bluetooth", GROUP="uucp"
diff --git a/net-wireless/bluez/files/bluez-4.18-udev.script b/net-wireless/bluez/files/bluez-4.18-udev.script
deleted file mode 100644
index a532e2652cdb..000000000000
--- a/net-wireless/bluez/files/bluez-4.18-udev.script
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/bin/sh
-#
-# bluetooth.sh: udev external RUN script
-#
-# Copyright:
-#	2005-2006 Henrik Brix Andersen <brix@gentoo.org>
-#   2007      Petteri Räty <betelgeuse@gentoo.org>
-#   2008      Tiziano Müller <dev-zero@gentoo.org>
-# Distributed under the terms of the GNU General Public License v2
-
-script=/etc/init.d/bluetooth
-
-# Find out where sysfs is mounted. Exit if not available
-sysfs=`grep -F sysfs /proc/mounts | awk '{print $2}'`
-if [ "$sysfs" = "" ]; then
-	echo "sysfs is required"
-	exit 1
-fi
-
-if [ ! -d $sysfs/class/bluetooth/hci[0-9]* -a ! -d $sysfs/bus/bluetooth/devices/hci[0-9]* ]; then
-	if $script --quiet status; then
-		IN_HOTPLUG=1 $script --quiet stop
-	fi
-else
-	if ! $script --quiet status; then
-		IN_HOTPLUG=1 $script --quiet start
-	fi
-fi
diff --git a/net-wireless/bluez/files/bluez-4.67-udev.script b/net-wireless/bluez/files/bluez-4.67-udev.script
deleted file mode 100644
index b176611d9d6e..000000000000
--- a/net-wireless/bluez/files/bluez-4.67-udev.script
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/sh
-#
-# bluetooth.sh: udev external RUN script
-#
-# Copyright:
-#	2005-2006 Henrik Brix Andersen <brix@gentoo.org>
-#	2007      Petteri Räty <betelgeuse@gentoo.org>
-#	2008      Tiziano Müller <dev-zero@gentoo.org>
-#	2011	  Pacho Ramos <pacho@gentoo.org> 
-# Distributed under the terms of the GNU General Public License v2
-
-# Find out where sysfs is mounted. Exit if not available
-sysfs=`grep -F sysfs /proc/mounts | awk '{print $2}'`
-if [ "$sysfs" = "" ]; then
-	echo "sysfs is required"
-	exit 1
-fi
-
-if [ ! -d $sysfs/class/bluetooth/hci[0-9]* -a ! -d $sysfs/bus/bluetooth/devices/hci[0-9]* ]; then
-	udevadm trigger --subsystem-match=bluetooth --action=add
-fi
diff --git a/net-wireless/bluez/files/bluez-4.98-fix-header.patch b/net-wireless/bluez/files/bluez-4.98-fix-header.patch
deleted file mode 100644
index 5ca087df9ae1..000000000000
--- a/net-wireless/bluez/files/bluez-4.98-fix-header.patch
+++ /dev/null
@@ -1,71 +0,0 @@
-The compiler error is:
- /usr/include/bluetooth/bluetooth.h::131:9: error: invalid conversion from 'void*' to 'bt_get_le64(void*)::<anonymous struct>*'
- ...
-
-The reason is that C++, in contrast to C, does not allow conversion of
-void * to anything, and this code gets compiled as C++ when the app is
-written in C++. The macro with the assignment itself is older, but only
-recent Bluez starts to use it in inline functions, thus triggering the
-problem.
-
-This patch keeps the "struct __attribute__((packed))" magic and merely
-changes the typecast so that it works in C and C++. Like the existing
-macro this patch relies on support for typeof.
-
-The new variant of the code is in an ifdef and only used for C++
-to avoid unexpected regressions in C applications.
-
-Signed-off-by: Patrick Ohly <patrick.ohly@intel.com>
----
- lib/bluetooth.h |   30 ++++++++++++++++++++++++++++++
- 1 files changed, 30 insertions(+), 0 deletions(-)
-
-Index: bluez-4.98/lib/bluetooth.h
-===================================================================
---- bluez-4.98.orig/lib/bluetooth.h	2012-02-05 13:20:23.753659182 +0100
-+++ bluez-4.98/lib/bluetooth.h	2012-02-05 13:26:33.905473976 +0100
-@@ -109,6 +109,12 @@
- #endif
- 
- /* Bluetooth unaligned access */
-+#ifndef __cplusplus
-+/*
-+ * traditional code, doesn't work in C++ because
-+ * of the void * to struct pointer assignment
-+ */
-+
- #define bt_get_unaligned(ptr)			\
- ({						\
- 	struct __attribute__((packed)) {	\
-@@ -125,6 +131,31 @@
- 	__p->__v = (val);			\
- } while(0)
- 
-+#else /* __cplusplus */
-+
-+/*
-+ * modified code with typeof typecast, for C++;
-+ * the traditional code continues to be used for
-+ * C to avoid unexpected regressions with this
-+ * code here (it should work in C and C++, though)
-+ */
-+#define bt_get_unaligned(ptr)                  \
-+({                                             \
-+       struct __attribute__((packed)) {        \
-+               typeof(*(ptr)) __v;             \
-+       } *__p = (typeof(__p)) (ptr);           \
-+       __p->__v;                               \
-+})
-+
-+#define bt_put_unaligned(val, ptr)             \
-+do {                                           \
-+       struct __attribute__((packed)) {        \
-+               typeof(*(ptr)) __v;             \
-+       } *__p = (typeof(__p)) (ptr);           \
-+       __p->__v = (val);                       \
-+} while(0)
-+#endif /* __cplusplus */
-+
- #if __BYTE_ORDER == __LITTLE_ENDIAN
- static inline uint64_t bt_get_le64(void *ptr)
- {
\ No newline at end of file
diff --git a/net-wireless/bluez/files/bluez-4.98-fix-socket.patch b/net-wireless/bluez/files/bluez-4.98-fix-socket.patch
deleted file mode 100644
index 6f16c5fdf96e..000000000000
--- a/net-wireless/bluez/files/bluez-4.98-fix-socket.patch
+++ /dev/null
@@ -1,54 +0,0 @@
-diff --git a/audio/a2dp.c b/audio/a2dp.c
-index c4cdc62..2eebe6b 100644
---- a/audio/a2dp.c
-+++ b/audio/a2dp.c
-@@ -1441,9 +1441,9 @@ static struct a2dp_server *find_server(GSList *list, const bdaddr_t *src)
- 
- int a2dp_register(DBusConnection *conn, const bdaddr_t *src, GKeyFile *config)
- {
--	int sbc_srcs = 1, sbc_sinks = 1;
-+	int sbc_srcs = 0, sbc_sinks = 0;
- 	int mpeg12_srcs = 0, mpeg12_sinks = 0;
--	gboolean source = TRUE, sink = FALSE, socket = TRUE;
-+	gboolean source = TRUE, sink = FALSE, socket = FALSE;
- 	gboolean delay_reporting = FALSE;
- 	char *str;
- 	GError *err = NULL;
-@@ -1463,6 +1463,8 @@ int a2dp_register(DBusConnection *conn, const bdaddr_t *src, GKeyFile *config)
- 			source = TRUE;
- 		if (strstr(str, "Source"))
- 			sink = TRUE;
-+		if (strstr(str, "Socket"))
-+			socket = TRUE;
- 		g_free(str);
- 	}
- 
-@@ -1482,18 +1484,14 @@ int a2dp_register(DBusConnection *conn, const bdaddr_t *src, GKeyFile *config)
- 	}
- 
- 	/* Don't register any local sep if Socket is disabled */
--	if (socket == FALSE) {
--		sbc_srcs = 0;
--		sbc_sinks = 0;
--		mpeg12_srcs = 0;
--		mpeg12_sinks = 0;
-+	if (socket == FALSE)
- 		goto proceed;
--	}
- 
- 	str = g_key_file_get_string(config, "A2DP", "SBCSources", &err);
- 	if (err) {
- 		DBG("audio.conf: %s", err->message);
- 		g_clear_error(&err);
-+		sbc_srcs = 1;
- 	} else {
- 		sbc_srcs = atoi(str);
- 		g_free(str);
-@@ -1512,6 +1510,7 @@ int a2dp_register(DBusConnection *conn, const bdaddr_t *src, GKeyFile *config)
- 	if (err) {
- 		DBG("audio.conf: %s", err->message);
- 		g_clear_error(&err);
-+		sbc_sinks = 1;
- 	} else {
- 		sbc_sinks = atoi(str);
- 		g_free(str);
diff --git a/net-wireless/bluez/files/conf.d-dund b/net-wireless/bluez/files/conf.d-dund
deleted file mode 100644
index a199fc758fe3..000000000000
--- a/net-wireless/bluez/files/conf.d-dund
+++ /dev/null
@@ -1,4 +0,0 @@
-# Bluetooth DUN daemon configuraton file
-
-# Arguments to dund
-DUND_OPTIONS="--search --persist"
diff --git a/net-wireless/bluez/files/conf.d-hidd b/net-wireless/bluez/files/conf.d-hidd
deleted file mode 100644
index 1677ef0f3556..000000000000
--- a/net-wireless/bluez/files/conf.d-hidd
+++ /dev/null
@@ -1,5 +0,0 @@
-# Bluetooth hidd daemon configuraton file
-
-# Arguments to hidd
-HIDD_OPTIONS="--encrypt"
-
diff --git a/net-wireless/bluez/files/init.d-dund b/net-wireless/bluez/files/init.d-dund
deleted file mode 100644
index c8c86631fcb8..000000000000
--- a/net-wireless/bluez/files/init.d-dund
+++ /dev/null
@@ -1,25 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2010 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez/files/init.d-dund,v 1.1 2010/09/24 21:32:51 pacho Exp $
-
-depend() {
-	need bluetooth
-}
-
-start() {
-	local result service
-
-	ebegin "Starting dund"
-	start-stop-daemon --start --quiet \
-		--exec /usr/bin/dund -- ${DUND_OPTIONS}
-	result="$?"
-	eend ${result}
-}
-
-stop() {
-	ebegin "Stopping dund"
-	/usr/bin/dund -K
-	start-stop-daemon --stop --quiet --exec /usr/bin/dund
-	eend $?
-}
diff --git a/net-wireless/bluez/files/init.d-hidd b/net-wireless/bluez/files/init.d-hidd
deleted file mode 100644
index 39399a9184b3..000000000000
--- a/net-wireless/bluez/files/init.d-hidd
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/sbin/runscript
-# Copyright 1999-2007 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez/files/init.d-hidd,v 1.1 2010/09/07 11:00:27 pacho Exp $
-
-depend() {
-	need bluetooth
-}
-
-start() {
-	local result service
-
-	ebegin "Starting hidd"
-	start-stop-daemon --start --quiet \
-		--exec /usr/bin/hidd -- ${HIDD_OPTIONS} --server
-	result="$?"
-	service="/etc/bluetooth/input.service"
-	if [ ${result} -ne 0 ] && grep -q "Autostart=true" "${service}"; then
-		eerror "You have Autostart=true in ${service}."
-		eerror "Change this to false if you want to use hidd."
-	fi
-	eend ${result}
-}
-
-stop() {
-	ebegin "Stopping hidd"
-	hidd --killall
-	start-stop-daemon --stop --quiet --exec /usr/bin/hidd
-	eend $?
-}