Version bump, remove old, bump to eapi4, don't install .c and .o files (bug #356529 by Alec M.), init script needs hostname (bug #356739 by Johan Myreen), libnl dep is no longer needed (bug #359105 by Yaroslav Isakov).

(Portage version: 2.1.9.43/cvs/Linux x86_64)

7 files changed, 15 insertions, 118 deletions

diff --git a/net-wireless/bluez/files/4.31-as_needed.patch b/net-wireless/bluez/files/4.31-as_needed.patch
deleted file mode 100644
index 99b8ce4c2321..000000000000
--- a/net-wireless/bluez/files/4.31-as_needed.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-diff -Naur bluez-4.31.orig/common/Makefile.am bluez-4.31/common/Makefile.am
---- bluez-4.31.orig/common/Makefile.am	2009-02-27 22:57:29.515330134 +0100
-+++ bluez-4.31/common/Makefile.am	2009-02-27 22:58:11.249328307 +0100
-@@ -4,6 +4,8 @@
- libhelper_a_SOURCES = oui.h oui.c textfile.h textfile.c logging.h logging.c \
- 		glib-helper.h glib-helper.c sdp-xml.h sdp-xml.c btio.h btio.c
- 
-+libhelper_a_LIBADD = @BLUEZ_LIBS@
-+
- noinst_PROGRAMS = test_textfile
- 
- test_textfile_LDADD = libhelper.a
-diff -Naur bluez-4.31.orig/test/Makefile.am bluez-4.31/test/Makefile.am
---- bluez-4.31.orig/test/Makefile.am	2009-02-27 22:57:29.518659538 +0100
-+++ bluez-4.31/test/Makefile.am	2009-02-27 23:07:09.294597176 +0100
-@@ -23,13 +23,13 @@
- 
- bdaddr_SOURCES = bdaddr.c
- 
--bdaddr_LDADD = @BLUEZ_LIBS@ $(top_builddir)/common/libhelper.a
-+bdaddr_LDADD = $(top_builddir)/common/libhelper.a @BLUEZ_LIBS@
- 
- lmptest_LDADD = @BLUEZ_LIBS@
- 
- agent_LDADD = @DBUS_LIBS@
- 
--btiotest_LDADD = @GLIB_LIBS@ @BLUEZ_LIBS@ $(top_builddir)/common/libhelper.a
-+btiotest_LDADD = @GLIB_LIBS@ $(top_builddir)/common/libhelper.a @BLUEZ_LIBS@
- 
- noinst_MANS = bdaddr.8
- 
diff --git a/net-wireless/bluez/files/4.34-conditional_libsbc.patch b/net-wireless/bluez/files/4.34-conditional_libsbc.patch
deleted file mode 100644
index e4924c79be87..000000000000
--- a/net-wireless/bluez/files/4.34-conditional_libsbc.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-The configure stuff is a inconsequent:
-- even if neither alsa nor gstreamer support is enabled, SBC_LIBS gets substituted by libsbc.la
-  which doesn't get build without alsa or gstreamer. Making this conditional helps.
-- ipctest needs both libipc.la and libsbc.la and fails if SBC_LIBS/SBC_CFLAGS are empty,
-  making the build conditional helps again.
---- acinclude.m4.orig	2009-04-06 16:26:14.570780241 +0200
-+++ acinclude.m4	2009-04-06 16:26:59.540779148 +0200
-@@ -330,8 +330,10 @@
- 	AC_SUBST([GDBUS_CFLAGS], ['-I$(top_srcdir)/gdbus'])
- 	AC_SUBST([GDBUS_LIBS], ['$(top_builddir)/gdbus/libgdbus.la'])
- 
--	AC_SUBST([SBC_CFLAGS], ['-I$(top_srcdir)/sbc'])
--	AC_SUBST([SBC_LIBS], ['$(top_builddir)/sbc/libsbc.la'])
-+	if (test "${alsa_enable}" = "yes" || test "${gstreamer_enable}" = "yes"); then
-+		AC_SUBST([SBC_CFLAGS], ['-I$(top_srcdir)/sbc'])
-+		AC_SUBST([SBC_LIBS], ['$(top_builddir)/sbc/libsbc.la'])
-+	fi
- 
- 	AM_CONDITIONAL(SNDFILE, test "${sndfile_enable}" = "yes" && test "${sndfile_found}" = "yes")
- 	AM_CONDITIONAL(NETLINK, test "${netlink_enable}" = "yes" && test "${netlink_found}" = "yes")
---- audio/Makefile.am.orig	2009-04-06 16:47:21.240681272 +0200
-+++ audio/Makefile.am	2009-04-06 17:42:27.240597715 +0200
-@@ -60,10 +60,16 @@
- 
- libipc_la_SOURCES = ipc.h ipc.c
- 
-+if AUDIOPLUGIN
-+if SBC
-+
- noinst_PROGRAMS = ipctest
- 
- ipctest_LDADD= libipc.la @SBC_LIBS@ @GLIB_LIBS@
- 
-+endif
-+endif
-+
- AM_CFLAGS = -fvisibility=hidden @SBC_CFLAGS@ \
- 		@BLUEZ_CFLAGS@ @DBUS_CFLAGS@ @GLIB_CFLAGS@ @GDBUS_CFLAGS@
- 
diff --git a/net-wireless/bluez/files/bluetooth-conf.d b/net-wireless/bluez/files/bluetooth-conf.d
new file mode 100644
index 000000000000..b0cc744415ad
--- /dev/null
+++ b/net-wireless/bluez/files/bluetooth-conf.d
@@ -0,0 +1,7 @@
+# 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
index 6e19ffb0d03f..6339f99c738e 100644
--- a/net-wireless/bluez/files/bluetooth-init.d
+++ b/net-wireless/bluez/files/bluetooth-init.d
@@ -1,11 +1,11 @@
 #!/sbin/runscript
-# Copyright 1999-2008 Gentoo Foundation
+# 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.1 2010/09/07 11:00:27 pacho Exp $
+# $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
+	need dbus localmount hostname
 }
 
 start() {
diff --git a/net-wireless/bluez/files/bluez-4.62-makefile_ipctest.patch b/net-wireless/bluez/files/bluez-4.62-makefile_ipctest.patch
deleted file mode 100644
index 6304a6f0ac79..000000000000
--- a/net-wireless/bluez/files/bluez-4.62-makefile_ipctest.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-From f62006a86143f2c8556b4e6f3e74508db6b2aa5d Mon Sep 17 00:00:00 2001
-From: Vinicius Costa Gomes <vinicius.gomes@openbossa.org>
-Date: Mon, 8 Mar 2010 20:01:32 -0300
-Subject: [PATCH 1/1] Fix compilation when --enable-test is passed
-
-When --enable-test is passed along with --disable-alsa and
---disable-gstreamer, the SBC lib is not built, which breaks
-compilation of the ipctest test program.
----
- acinclude.m4 |    3 ++-
- 1 files changed, 2 insertions(+), 1 deletions(-)
-
-diff --git a/acinclude.m4 b/acinclude.m4
-index 2e4444d..f7bb047 100644
---- a/acinclude.m4
-+++ b/acinclude.m4
-@@ -316,7 +316,8 @@ AC_DEFUN([AC_ARG_BLUEZ], [
- 
- 	AM_CONDITIONAL(SNDFILE, test "${sndfile_enable}" = "yes" && test "${sndfile_found}" = "yes")
- 	AM_CONDITIONAL(USB, test "${usb_enable}" = "yes" && test "${usb_found}" = "yes")
--	AM_CONDITIONAL(SBC, test "${alsa_enable}" = "yes" || test "${gstreamer_enable}" = "yes")
-+	AM_CONDITIONAL(SBC, test "${alsa_enable}" = "yes" || test "${gstreamer_enable}" = "yes" ||
-+									test "${test_enable}" = "yes")
- 	AM_CONDITIONAL(ALSA, test "${alsa_enable}" = "yes" && test "${alsa_found}" = "yes")
- 	AM_CONDITIONAL(GSTREAMER, test "${gstreamer_enable}" = "yes" && test "${gstreamer_found}" = "yes")
- 	AM_CONDITIONAL(AUDIOPLUGIN, test "${audio_enable}" = "yes")
--- 
-1.7.0.2
-
diff --git a/net-wireless/bluez/files/bluez-alsa_location.patch b/net-wireless/bluez/files/bluez-alsa_location.patch
deleted file mode 100644
index 4d0712c67141..000000000000
--- a/net-wireless/bluez/files/bluez-alsa_location.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-bluez installs stuff into /etc/alsa, which is wrong since the
-correct location (also stated in alsa-lib configure.in) is
-/usr/share/alsa instead
-Upstream report: 
-http://permalink.gmane.org/gmane.linux.bluez.kernel/4739
---- Makefile.am~	2010-02-12 20:26:48.000000000 +0100
-+++ Makefile.am	2010-03-05 10:17:15.000000000 +0100
-@@ -241,7 +241,7 @@
- audio_libasound_module_ctl_bluetooth_la_CFLAGS = @ALSA_CFLAGS@
- 
- if CONFIGFILES
--alsaconfdir = $(sysconfdir)/alsa
-+alsaconfdir = $(datadir)/alsa
- 
- alsaconf_DATA = audio/bluetooth.conf
- endif
diff --git a/net-wireless/bluez/files/conf.d-hidd b/net-wireless/bluez/files/conf.d-hidd
new file mode 100644
index 000000000000..1677ef0f3556
--- /dev/null
+++ b/net-wireless/bluez/files/conf.d-hidd
@@ -0,0 +1,5 @@
+# Bluetooth hidd daemon configuraton file
+
+# Arguments to hidd
+HIDD_OPTIONS="--encrypt"
+