Version bump, drop old

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

10 files changed, 77 insertions, 535 deletions

diff --git a/net-wireless/bluez/ChangeLog b/net-wireless/bluez/ChangeLog
index 958b1d147e6b..3e6f64ed72ab 100644
--- a/net-wireless/bluez/ChangeLog
+++ b/net-wireless/bluez/ChangeLog
@@ -1,6 +1,16 @@
 # ChangeLog for net-wireless/bluez
 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez/ChangeLog,v 1.185 2014/01/19 10:31:05 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez/ChangeLog,v 1.186 2014/02/09 09:10:28 pacho Exp $
+
+*bluez-5.14 (09 Feb 2014)
+
+  09 Feb 2014; Pacho Ramos <pacho@gentoo.org> +bluez-5.14.ebuild,
+  +files/0001-Allow-using-obexd-without-systemd-in-the-user-sessio.patch,
+  -bluez-4.101-r6.ebuild, -bluez-4.101-r7.ebuild, -bluez-5.12.ebuild,
+  -files/bluez-4.101-mgmt-update.patch, -files/bluez-4.101-network1.patch,
+  -files/bluez-4.101-network2.patch, -files/bluez-4.101-network3.patch,
+  -files/bluez-4.101-network4.patch:
+  Version bump, drop old
 
   19 Jan 2014; Agostino Sarubbo <ago@gentoo.org> bluez-4.101-r8.ebuild:
   Stable for ppc64, wrt bug #496866
diff --git a/net-wireless/bluez/bluez-4.101-r6.ebuild b/net-wireless/bluez/bluez-4.101-r6.ebuild
deleted file mode 100644
index fa20cfc3da18..000000000000
--- a/net-wireless/bluez/bluez-4.101-r6.ebuild
+++ /dev/null
@@ -1,156 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez/bluez-4.101-r6.ebuild,v 1.7 2013/09/25 17:21:36 ago Exp $
-
-EAPI=5
-PYTHON_COMPAT=( python{2_6,2_7} )
-inherit eutils multilib python-single-r1 readme.gentoo 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 cups debug gstreamer pcmcia readline selinux test-programs usb"
-
-REQUIRED_USE="test-programs? ( ${PYTHON_REQUIRED_USE} )"
-
-CDEPEND="
-	>=dev-libs/glib-2.28:2
-	>=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}
-	test-programs? (
-		>=dev-python/dbus-python-1
-		dev-python/pygobject:2
-		dev-python/pygobject:3
-		${PYTHON_DEPS}
-	)
-"
-
-DOCS=( AUTHORS ChangeLog README )
-
-DOC_CONTENTS="
-	If you want to use rfcomm as a normal user, you need to add the user
-	to the uucp group.
-"
-
-pkg_setup() {
-	enewgroup plugdev
-	use test-programs && python-single-r1_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)
-	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_fix_shebang "${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
-
-	readme.gentoo_create_doc
-
-	prune_libtool_files --modules
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-
-	udevadm control --reload-rules
-
-	has_version net-dialup/ppp || elog "To use dial up networking you must install net-dialup/ppp."
-
-	if ! has_version sys-auth/consolekit && ! has_version sys-apps/systemd; then
-		elog "Since you don't have sys-auth/consolekit neither sys-apps/systemd, you will only"
-		elog "be able to run 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
-}
diff --git a/net-wireless/bluez/bluez-4.101-r7.ebuild b/net-wireless/bluez/bluez-4.101-r7.ebuild
deleted file mode 100644
index 6671f7da5b45..000000000000
--- a/net-wireless/bluez/bluez-4.101-r7.ebuild
+++ /dev/null
@@ -1,163 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez/bluez-4.101-r7.ebuild,v 1.8 2013/12/22 13:22:03 ago Exp $
-
-EAPI=5
-PYTHON_COMPAT=( python{2_6,2_7} )
-inherit autotools eutils multilib python-single-r1 readme.gentoo systemd user
-
-DESCRIPTION="Bluetooth Tools and System Daemons for Linux"
-HOMEPAGE="http://www.bluez.org/"
-SRC_URI="mirror://kernel/linux/bluetooth/${P}.tar.xz
-	http://dev.gentoo.org/~pacho/bluez/${P}-patches.tar.xz"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 arm hppa ppc ppc64 x86"
-IUSE="alsa cups debug gstreamer pcmcia readline selinux test-programs usb"
-
-REQUIRED_USE="test-programs? ( ${PYTHON_REQUIRED_USE} )"
-
-CDEPEND="
-	>=dev-libs/glib-2.28:2
-	>=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}
-	test-programs? (
-		>=dev-python/dbus-python-1
-		dev-python/pygobject:2
-		dev-python/pygobject:3
-		${PYTHON_DEPS}
-	)
-"
-
-DOCS=( AUTHORS ChangeLog README )
-
-DOC_CONTENTS="
-	If you want to use rfcomm as a normal user, you need to add the user
-	to the uucp group.
-"
-
-pkg_setup() {
-	enewgroup plugdev
-	use test-programs && python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	# Fedora patches
-	epatch "${WORKDIR}/${P}-patches"/*.patch
-
-	# Use static group "plugdev" if there is no ConsoleKit (or systemd logind)
-	epatch "${FILESDIR}"/bluez-plugdev.patch
-
-	sed -e "s/AM_CONFIG_HEADER/AC_CONFIG_HEADERS/" -i configure.ac || die
-
-	eautoreconf
-
-	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) \
-		$(use_enable usb cable) \
-		--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_fix_shebang "${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
-
-	readme.gentoo_create_doc
-
-	prune_libtool_files --modules
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-
-	udevadm control --reload-rules
-
-	has_version net-dialup/ppp || elog "To use dial up networking you must install net-dialup/ppp."
-
-	if ! has_version sys-auth/consolekit && ! has_version sys-apps/systemd; then
-		elog "Since you don't have sys-auth/consolekit neither sys-apps/systemd, you will only"
-		elog "be able to run 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
-}
diff --git a/net-wireless/bluez/bluez-5.12.ebuild b/net-wireless/bluez/bluez-5.14.ebuild
index eb19316ce4a4..64399c323689 100644
--- a/net-wireless/bluez/bluez-5.12.ebuild
+++ b/net-wireless/bluez/bluez-5.14.ebuild
@@ -1,6 +1,6 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez/bluez-5.12.ebuild,v 1.1 2013/12/23 23:05:20 eva Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez/bluez-5.14.ebuild,v 1.1 2014/02/09 09:10:28 pacho Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
@@ -14,7 +14,7 @@ SRC_URI="mirror://kernel/linux/bluetooth/${P}.tar.xz"
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0/3"
 KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
-IUSE="cups debug obex readline selinux systemd test"
+IUSE="cups debug +obex readline selinux systemd test"
 REQUIRED_USE="test? ( ${PYTHON_REQUIRED_USE} )"
 
 RDEPEND="
@@ -52,6 +52,9 @@ src_prepare() {
 	# Use static group "plugdev" if there is no ConsoleKit (or systemd logind)
 	epatch "${FILESDIR}"/bluez-plugdev.patch
 
+	# Fedora patch for better compat with non-full systemd setups
+	epatch "${FILESDIR}"/0001-Allow-using-obexd-without-systemd-in-the-user-sessio.patch
+
 	if use cups; then
 		sed -i \
 			-e "s:cupsdir = \$(libdir)/cups:cupsdir = `cups-config --serverbin`:" \
@@ -64,9 +67,9 @@ src_configure() {
 	export ac_cv_header_readline_readline_h=$(usex readline)
 
 	# Missing flags: experimental (sap, nfc, ...)
-	# Keep this in ./configure --help order!
 	econf \
 		--localstatedir=/var \
+		--enable-experimental \
 		--enable-optimization \
 		$(use_enable debug) \
 		--enable-pie \
@@ -77,7 +80,7 @@ src_configure() {
 		--enable-monitor \
 		--enable-udev \
 		$(use_enable cups) \
-		--enable-obex \
+		$(use_enable obex) \
 		--enable-client \
 		$(use_enable systemd) \
 		$(systemd_with_unitdir) \
diff --git a/net-wireless/bluez/files/0001-Allow-using-obexd-without-systemd-in-the-user-sessio.patch b/net-wireless/bluez/files/0001-Allow-using-obexd-without-systemd-in-the-user-sessio.patch
new file mode 100644
index 000000000000..1ea3e6f3e0c1
--- /dev/null
+++ b/net-wireless/bluez/files/0001-Allow-using-obexd-without-systemd-in-the-user-sessio.patch
@@ -0,0 +1,58 @@
+From 3027cb7141fb65cf3eeda69c688db8c4045e2d3f Mon Sep 17 00:00:00 2001
+From: Giovanni Campagna <gcampagna-cNUdlRotFMnNLxjTenLetw@public.gmane.org>
+Date: Sat, 12 Oct 2013 17:45:25 +0200
+Subject: [PATCH] Allow using obexd without systemd in the user session
+
+Not all sessions run systemd --user (actually, the majority
+doesn't), so the dbus daemon must be able to spawn obexd
+directly, and to do so it needs the full path of the daemon.
+---
+ Makefile.obexd                      | 4 ++--
+ obexd/src/org.bluez.obex.service    | 4 ----
+ obexd/src/org.bluez.obex.service.in | 4 ++++
+ 3 files changed, 6 insertions(+), 6 deletions(-)
+ delete mode 100644 obexd/src/org.bluez.obex.service
+ create mode 100644 obexd/src/org.bluez.obex.service.in
+
+diff --git a/Makefile.obexd b/Makefile.obexd
+index 3760867..142e7c3 100644
+--- a/Makefile.obexd
++++ b/Makefile.obexd
+@@ -2,12 +2,12 @@
+ if SYSTEMD
+ systemduserunitdir = @SYSTEMD_USERUNITDIR@
+ systemduserunit_DATA = obexd/src/obex.service
++endif
+ 
+ dbussessionbusdir = @DBUS_SESSIONBUSDIR@
+ dbussessionbus_DATA = obexd/src/org.bluez.obex.service
+-endif
+ 
+-EXTRA_DIST += obexd/src/obex.service.in obexd/src/org.bluez.obex.service
++EXTRA_DIST += obexd/src/obex.service.in obexd/src/org.bluez.obex.service.in
+ 
+ obex_plugindir = $(libdir)/obex/plugins
+ 
+diff --git a/obexd/src/org.bluez.obex.service b/obexd/src/org.bluez.obex.service
+deleted file mode 100644
+index a538088..0000000
+--- a/obexd/src/org.bluez.obex.service
++++ /dev/null
+@@ -1,4 +0,0 @@
+-[D-BUS Service]
+-Name=org.bluez.obex
+-Exec=/bin/false
+-SystemdService=dbus-org.bluez.obex.service
+diff --git a/obexd/src/org.bluez.obex.service.in b/obexd/src/org.bluez.obex.service.in
+new file mode 100644
+index 0000000..9c815f2
+--- /dev/null
++++ b/obexd/src/org.bluez.obex.service.in
+@@ -0,0 +1,4 @@
++[D-BUS Service]
++Name=org.bluez.obex
++Exec=@libexecdir@/obexd
++SystemdService=dbus-org.bluez.obex.service
+-- 
+1.8.3.1
+
diff --git a/net-wireless/bluez/files/bluez-4.101-mgmt-update.patch b/net-wireless/bluez/files/bluez-4.101-mgmt-update.patch
deleted file mode 100644
index c7523e6a2ff6..000000000000
--- a/net-wireless/bluez/files/bluez-4.101-mgmt-update.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From d22d083d6dd681f8d25eb806d4ec91853475ee06 Mon Sep 17 00:00:00 2001
-From: Gustavo Padovan <gustavo@padovan.org>
-Date: Thu, 5 Apr 2012 16:22:55 -0300
-Subject: [PATCH] mgmt: update mgmt control channel id
-
-kernel side has updated its control channel id from 1 to 3.
----
- lib/hci.h |    2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/lib/hci.h b/lib/hci.h
-index 887a860..f7be92d 100644
---- a/lib/hci.h
-+++ b/lib/hci.h
-@@ -2288,8 +2288,8 @@ struct sockaddr_hci {
- #define HCI_DEV_NONE	0xffff
- 
- #define HCI_CHANNEL_RAW		0
--#define HCI_CHANNEL_CONTROL	1
- #define HCI_CHANNEL_MONITOR	2
-+#define HCI_CHANNEL_CONTROL	3
- 
- struct hci_filter {
- 	uint32_t type_mask;
--- 
-1.7.6.5
-
diff --git a/net-wireless/bluez/files/bluez-4.101-network1.patch b/net-wireless/bluez/files/bluez-4.101-network1.patch
deleted file mode 100644
index cf75d07bfe5f..000000000000
--- a/net-wireless/bluez/files/bluez-4.101-network1.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-X-Git-Url: http://git.kernel.org/?p=bluetooth%2Fbluez.git;a=blobdiff_plain;f=profiles%2Fnetwork%2Fserver.c;h=8ae608cdb6e699ad78cd7476e26c60f8883a214f;hp=480c7e2c5f6ab1cc7c494a3bcc37d1a0026a0ce4;hb=2b44cd2fba6e9a8590f30e68db0f6b92e8fcdb94;hpb=04be4fe0c0126f8816d55a7d3a8ff9e6dd27f73f
-
-diff --git a/profiles/network/server.c b/profiles/network/server.c
-index 480c7e2..8ae608c 100644
---- a/profiles/network/server.c
-+++ b/profiles/network/server.c
-@@ -301,7 +301,10 @@ static uint16_t bnep_setup_chk(uint16_t dst_role, uint16_t src_role)
- static uint16_t bnep_setup_decode(struct bnep_setup_conn_req *req,
- 				uint16_t *dst_role, uint16_t *src_role)
- {
-+	const uint8_t bt_base[] = { 0x00, 0x00, 0x10, 0x00, 0x80, 0x00,
-+				0x00, 0x80, 0x5F, 0x9B, 0x34, 0xFB };
- 	uint8_t *dest, *source;
-+	uint32_t val;
- 
- 	dest = req->service;
- 	source = req->service + req->uuid_size;
-@@ -311,10 +314,27 @@ static uint16_t bnep_setup_decode(struct bnep_setup_conn_req *req,
- 		*dst_role = bt_get_be16(dest);
- 		*src_role = bt_get_be16(source);
- 		break;
--	case 4: /* UUID32 */
- 	case 16: /* UUID128 */
--		*dst_role = bt_get_be32(dest);
--		*src_role = bt_get_be32(source);
-+		/* Check that the bytes in the UUID, except the service ID
-+		 * itself, are correct. The service ID is checked in
-+		 * bnep_setup_chk(). */
-+		if (memcmp(&dest[4], bt_base, sizeof(bt_base)) != 0)
-+			return BNEP_CONN_INVALID_DST;
-+		if (memcmp(&source[4], bt_base, sizeof(bt_base)) != 0)
-+			return BNEP_CONN_INVALID_SRC;
-+
-+		/* Intentional no-break */
-+
-+	case 4: /* UUID32 */
-+		val = bt_get_be32(dest);
-+		if (val > 0xffff)
-+			return BNEP_CONN_INVALID_DST;
-+		*dst_role = val;
-+
-+		val = bt_get_be32(source);
-+		if (val > 0xffff)
-+			return BNEP_CONN_INVALID_SRC;
-+		*src_role = val;
- 		break;
- 	default:
- 		return BNEP_CONN_INVALID_SVC;
diff --git a/net-wireless/bluez/files/bluez-4.101-network2.patch b/net-wireless/bluez/files/bluez-4.101-network2.patch
deleted file mode 100644
index 807eb1912b96..000000000000
--- a/net-wireless/bluez/files/bluez-4.101-network2.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-X-Git-Url: http://git.kernel.org/?p=bluetooth%2Fbluez.git;a=blobdiff_plain;f=network%2Fconnection.c;h=59423a900b2fba9ec99115dec421a3113bc2d834;hp=544ec3a9c643bc8fada6d683d428a8165a4b052f;hb=57170b311f1468330f4a9961dc0b3ac45f97bc13;hpb=c1d662075288d475ee6e1740d39ac84fe806542a
-
-diff --git a/network/connection.c b/network/connection.c
-index 544ec3a..59423a9 100644
---- a/network/connection.c
-+++ b/network/connection.c
-@@ -554,7 +554,9 @@ static void path_unregister(void *data)
- 
- static const GDBusMethodTable connection_methods[] = {
- 	{ GDBUS_ASYNC_METHOD("Connect",
--			NULL, NULL, connection_connect) },
-+				GDBUS_ARGS({"uuid", "s"}),
-+				GDBUS_ARGS({"interface", "s"}),
-+				connection_connect) },
- 	{ GDBUS_METHOD("Disconnect",
- 			NULL, NULL, connection_disconnect) },
- 	{ GDBUS_METHOD("GetProperties",
diff --git a/net-wireless/bluez/files/bluez-4.101-network3.patch b/net-wireless/bluez/files/bluez-4.101-network3.patch
deleted file mode 100644
index 7f9afb01c78a..000000000000
--- a/net-wireless/bluez/files/bluez-4.101-network3.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From b57c64f1aa5c51dd785f2572636b8c41ada06d72 Mon Sep 17 00:00:00 2001
-From: Pavel Raiskup <praiskup@redhat.com>
-Date: Tue, 30 Aug 2011 15:10:46 +0200
-Subject: [PATCH 1/1] network: NULL dereference fix
-
-Variable ifindex dereferenced on line 242 before null check on line 249.
----
- network/common.c |    4 +++-
- 1 files changed, 3 insertions(+), 1 deletions(-)
-
-diff --git a/network/common.c b/network/common.c
-index 4704072..a223685 100644
---- a/network/common.c
-+++ b/network/common.c
-@@ -240,13 +240,15 @@ int bnep_if_down(const char *devname)
- 
- int bnep_add_to_bridge(const char *devname, const char *bridge)
- {
--	int ifindex = if_nametoindex(devname);
-+	int ifindex;
- 	struct ifreq ifr;
- 	int sk, err;
- 
- 	if (!devname || !bridge)
- 		return -EINVAL;
- 
-+	ifindex = if_nametoindex(devname);
-+
- 	sk = socket(AF_INET, SOCK_STREAM, 0);
- 	if (sk < 0)
- 		return -1;
--- 
-1.7.7.6
-
diff --git a/net-wireless/bluez/files/bluez-4.101-network4.patch b/net-wireless/bluez/files/bluez-4.101-network4.patch
deleted file mode 100644
index a1166fa4e7af..000000000000
--- a/net-wireless/bluez/files/bluez-4.101-network4.patch
+++ /dev/null
@@ -1,84 +0,0 @@
-From a66a557038c0e3d21bc4f14090efb497558a12be Mon Sep 17 00:00:00 2001
-From: Lucas De Marchi <lucas.demarchi@profusion.mobi>
-Date: Tue, 26 Jun 2012 18:11:25 -0300
-Subject: [PATCH 1/1] Fix GDBus flags after conversion to macros
-
-Commit "aa3b9016bf444b60e1b7e1804dfc323a23a93c5a Convert GDBus methods
-to use macro helpers" converted the previous tables to use the new
-macros but some flags were lost.
----
- attrib/client.c   |    2 +-
- audio/control.c   |    2 +-
- audio/headset.c   |    2 +-
- audio/transport.c |    2 +-
- src/manager.c     |    2 +-
- 5 files changed, 5 insertions(+), 5 deletions(-)
-
-diff --git a/attrib/client.c b/attrib/client.c
-index 8d119df..b3e3abe 100644
---- a/attrib/client.c
-+++ b/attrib/client.c
-@@ -519,7 +519,7 @@ static const GDBusMethodTable char_methods[] = {
- 	{ GDBUS_METHOD("GetProperties",
- 			NULL, GDBUS_ARGS({ "properties", "a{sv}" }),
- 			get_properties) },
--	{ GDBUS_METHOD("SetProperty",
-+	{ GDBUS_ASYNC_METHOD("SetProperty",
- 			GDBUS_ARGS({ "name", "s" }, { "value", "v" }), NULL,
- 			set_property) },
- 	{ }
-diff --git a/audio/control.c b/audio/control.c
-index c5a6a58..187f838 100644
---- a/audio/control.c
-+++ b/audio/control.c
-@@ -198,7 +198,7 @@ static DBusMessage *control_get_properties(DBusConnection *conn,
- }
- 
- static const GDBusMethodTable control_methods[] = {
--	{ GDBUS_ASYNC_METHOD("IsConnected",
-+	{ GDBUS_DEPRECATED_METHOD("IsConnected",
- 				NULL, GDBUS_ARGS({ "connected", "b" }),
- 				control_is_connected) },
- 	{ GDBUS_METHOD("GetProperties",
-diff --git a/audio/headset.c b/audio/headset.c
-index 729e4dc..b9c6265 100644
---- a/audio/headset.c
-+++ b/audio/headset.c
-@@ -2094,7 +2094,7 @@ static const GDBusMethodTable headset_methods[] = {
- static const GDBusSignalTable headset_signals[] = {
- 	{ GDBUS_DEPRECATED_SIGNAL("Connected", NULL) },
- 	{ GDBUS_DEPRECATED_SIGNAL("Disconnected", NULL) },
--	{ GDBUS_DEPRECATED_SIGNAL("AnswerRequested", NULL) },
-+	{ GDBUS_SIGNAL("AnswerRequested", NULL) },
- 	{ GDBUS_DEPRECATED_SIGNAL("Stopped", NULL) },
- 	{ GDBUS_DEPRECATED_SIGNAL("Playing", NULL) },
- 	{ GDBUS_DEPRECATED_SIGNAL("SpeakerGainChanged",
-diff --git a/audio/transport.c b/audio/transport.c
-index b015625..832ad2a 100644
---- a/audio/transport.c
-+++ b/audio/transport.c
-@@ -959,7 +959,7 @@ static const GDBusMethodTable transport_methods[] = {
- 	{ GDBUS_ASYNC_METHOD("Release",
- 			GDBUS_ARGS({ "access_type", "s" }), NULL,
- 			release ) },
--	{ GDBUS_ASYNC_METHOD("SetProperty",
-+	{ GDBUS_METHOD("SetProperty",
- 			GDBUS_ARGS({ "name", "s" }, { "value", "v" }),
- 			NULL, set_property) },
- 	{ },
-diff --git a/src/manager.c b/src/manager.c
-index 385354d..7061f64 100644
---- a/src/manager.c
-+++ b/src/manager.c
-@@ -207,7 +207,7 @@ static const GDBusMethodTable manager_methods[] = {
- 			GDBUS_ARGS({ "pattern", "s" }),
- 			GDBUS_ARGS({ "adapter", "o" }),
- 			find_adapter) },
--	{ GDBUS_ASYNC_METHOD("ListAdapters",
-+	{ GDBUS_DEPRECATED_METHOD("ListAdapters",
- 			NULL, GDBUS_ARGS({ "adapters", "ao" }),
- 			list_adapters) },
- 	{ }
--- 
-1.7.7.6
-