Apply Fedora patches including fixes and backports for bluez-4

Package-Manager: portage-2.2.7/cvs/Linux x86_64
Manifest-Sign-Key: 0xA188FBD4

3 files changed, 174 insertions, 16 deletions

diff --git a/net-wireless/bluez/ChangeLog b/net-wireless/bluez/ChangeLog
index 021ca746c4a2..7b436e2edd31 100644
--- a/net-wireless/bluez/ChangeLog
+++ b/net-wireless/bluez/ChangeLog
@@ -1,6 +1,11 @@
 # 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.168 2013/09/25 17:21:36 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez/ChangeLog,v 1.169 2013/10/03 06:11:45 pacho Exp $
+
+*bluez-4.101-r7 (03 Oct 2013)
+
+  03 Oct 2013; Pacho Ramos <pacho@gentoo.org> +bluez-4.101-r7.ebuild:
+  Apply Fedora patches including fixes and backports for bluez-4
 
   25 Sep 2013; Agostino Sarubbo <ago@gentoo.org> bluez-4.101-r6.ebuild:
   Stable for ppc, wrt bug #481828
diff --git a/net-wireless/bluez/Manifest b/net-wireless/bluez/Manifest
index 99ceaf77c0b8..e2d776e78ed1 100644
--- a/net-wireless/bluez/Manifest
+++ b/net-wireless/bluez/Manifest
@@ -1,5 +1,5 @@
 -----BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA512
+Hash: SHA256
 
 AUX bluetooth-init.d-r2 532 SHA256 cd8cc3763601470328709c961b0c68a311f6d4af302d46a880fb855ed9d04efe SHA512 a1a391ac545d69aa15a1f98349e68b06b3468759acef95ea82d7cdec58ba40c3d03bda87e0279d186440c84ea940ae09d075269f6cb6b27cf2ca1f2a329e842b WHIRLPOOL ae6b78b8f8d56a567a2d80693366ebc319447267345db373e3b01dcf2c58078cf1615529589f3c3fb1237f7c617583639f3ae501018d11a8eaf68186938bddd2
 AUX bluez-4.101-mgmt-update.patch 694 SHA256 b5312be11204fed9dd7eb4c3e81bc89506680336c31fa09fe3a0d8c912aa96ae SHA512 c313c39258a8571a76405b1b599f8d58ba5baf079288bbab0de1c9f4d1b8b643251049252c2b042839f559a20e9ed561bfe283f3726cd7cf3af56b57f632fe25 WHIRLPOOL a020a3fce6682c1517c8a2548c509c76efdd5b4df0f46648117bb8bb727a7d93fc186bdcc171b85cd27202dc5d0c9761860e0ee431351dfc831a392bf88181e9
@@ -10,25 +10,17 @@ AUX bluez-4.101-network4.patch 3002 SHA256 e942b805f73f283eaec153ada1f462deb1fcd
 AUX bluez-plugdev.patch 469 SHA256 ec3f06f24f530574edf5eef308afcf16bb7e0a88336a454a0b24698d2491f5f2 SHA512 b7e23b6f52e6f638e6d5deed4e901136c40bc1cbfb302ada8d85873e1792b4e3605802a2c5f786d5d6d53bf4651fc5b611396aaafe5eff90578650c448a5a7a2 WHIRLPOOL 6364590d80d811e55e2f696ba0b57c0173bac859e69de284bbcc3b511c7ea639d48dd7451e5a4abe8746b8c0986867cb680b291880e6a6ada03004e0c72c2583
 AUX rfcomm-conf.d 150 SHA256 672498957049fd301f9c9c1dc9fa49430e5e6d3c3f1f3cdce80df3af7d425d08 SHA512 a70aa0dbbabe7e29ee81540a6f98bf191a850da55a28f678975635caf34b363cf4d461a801b3484120ee28fdd21240bd456a4f5d706262700924bd2e9a0972fb WHIRLPOOL 4d8b1f17c87120fcc21eb49644b27813a9463d990d3533cd542710cd14981cb74528b978ca65001fa60153e05260a0ee0a7af1d2855b04484ec1f7318acda8f0
 AUX rfcomm-init.d 668 SHA256 4430703a9bec9a9482416b2d24aa47492264768a0b61356b361bbc8b1229a83e SHA512 8f14b4e05c9ecaf4586ed2fdc2d2519de6b613de62ae5c95508baa682630f3112c5b6db6850f76679afc49e06f2ad035d148fa30b9b980747b6fb423f7bebe88 WHIRLPOOL 59859206a2b21580b92e747f06188ec362b41e1b7aa988de86e133ed8ea619f1166547231b9851c2dbd9298c84a1f33d39bc08932cad403087b123d370332236
+DIST bluez-4.101-patches.tar.xz 12380 SHA256 ea4b837245080ebe904fe4f338cd3c8c1370e197cdfbcd42bd55430c940b5e13 SHA512 0ef3219ed923a0880b2fe7008c36c185ff631a8fe1b357cc3612888817d9a7eaa6624bd31ed00a8bbbb6739528cb777a0b9900a7db4930482d1cbc38417b89aa WHIRLPOOL b89729b2cb1ecd6c816210682605b275af396af056e85d9a8671192ede0470002c1f61931781f27ad988ce8bc137f69a6725008a5ea9fe743ae41bc2f5edc7e8
 DIST bluez-4.101.tar.xz 887236 SHA256 41f9578bef39b8c94a2d6ddeaa556afd22d136936d0f03100e422fe970a45a7d SHA512 c8a88fa6948e43c81687047856806c9dc576d3223371947b496f228dec2b2614d1c5a8ff587e9f26eec44843a50503c55861f9fa736fdba43b2364f663f0cb0d WHIRLPOOL 0c4f163e4f4d0ba8f7928f5330ac3fd5f204c299346c59e73b64ebb331b0887a2b01e8ed6f4e6ae91f826a0431df4f97fe3a0900fa6013ae66fd755aaa136196
 EBUILD bluez-4.101-r5.ebuild 4501 SHA256 20419090abd4ba10875530b810edc3e2dfffdb7601d9f6ee4c6bd7d3826cd8b9 SHA512 20b4feb8cd00e8465771d9a27d530b1bde2dc3bbf567c9b6eeb5dbf694c42e602e04d33bd789fa0692b5974b29823352c38983f39c062cd6585db65d58f68f8a WHIRLPOOL ba8d20a5034f31958ac3739410e2e9f7fa74b5e1ef8f994c49794ce88ff547b552549d493aad0bfde830acaee3666f2508512323808f24ce0f1aa93b87765f7b
 EBUILD bluez-4.101-r6.ebuild 4037 SHA256 50c82859fe02b84af633840b14e5bbb288bff24cd5752a847181180fd30978b1 SHA512 3937aa7156c24bb1260a298fe17404a3a0cebf329da0ce5d15b66cade34532b2469506fbfbff30f7a1687534eb97f3cb2314934e8d939e97bfb0543d4de3987e WHIRLPOOL 47a507a22e86bdec0042e47d45c32915fa50062c3b889e8e94e32e590bc7cf195be920d3a9c040713fd25ecd78246d689c1ecbda34d982092aa69fefc4fdc19d
-MISC ChangeLog 31844 SHA256 8e5784213f4844ffd299547ec883e9a0a879680ca228a0b64926e715ca8be7dc SHA512 30692f36f8024c7d742cad1a8e03288a2de6930be43843d21b1f9e50b4f7656ed5155eec7ec1679103d6aff8f5c1dc62132027bf6a27bea44fe2f4de6dda3cbb WHIRLPOOL 13cce406f72323a7e8f43daac6bd460f8c21a5eac470eb250eef0af90f6477c35be9d19b841d9652a03627cc2a76c364f516f8bf33a6abfc6453940a3213561f
+EBUILD bluez-4.101-r7.ebuild 4163 SHA256 ddd2aa068c27563fdd0a6c017e6b496d4948a3605b806e153218201d43cb07b0 SHA512 38fe317d9d245ff7b221bb8c4c915bd2e3231737d879423e900b7477ca5abff6ad4f9237086da8f55a509ed042ee8a72d74c1dc00758daa4065265be3d2be09b WHIRLPOOL d983774595175c7b4befc4daf40f0a8980a36ae3cdd8c3c738966c7793769c7a0fe98b70b3edbd67bf2d195ed6e49269b6def9b94612f620e569b2b4414f8f6e
+MISC ChangeLog 32013 SHA256 6c608908997946248d581604772223a944a5f8827b3dee7fee4af3c49aa66e0f SHA512 ad89ff56bd347601f950797b3f26462053f2ff73cafd12ff3aca541ef169b52cc46cfd240f1a4c62bb4d4947f72c7a61cca4b5a294a39994e02a59f97bffd0f7 WHIRLPOOL b392bef2f59a5a402f6996a7ed5d961648d4539fee50e04bfc4715e0c7ee3921fc5ffebe9c9dd5746da8646e1b608d7dde3e6ad0fa65730846ccdb89b24bd322
 MISC metadata.xml 679 SHA256 5fbe40a8b6b991ec786dcda0aabd1c499ab221b9b360ca3ba2ea3bf64eabfdbf SHA512 c50f72ce3f1c66e36a7b83a62b2486a1795b7cd5b49524f254bc00a9a6e5fac82f6f055c5a2da8857ea66c5e5b2b02b09d8c5c1b99cf945a441bb5f3b993aaaa WHIRLPOOL 05f79ce8802db54b93ef99df228e3e001b248bed7cace9f45af1213f9fa4f152d15bcb7b6a28c293f95c7aafed4f5a5a2237400d3833df5377c5f4a850674869
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.20 (GNU/Linux)
 
-iQIcBAEBCgAGBQJSQxrPAAoJELp701BxlEWfSMgP/1yzJJeAuAAaTbIOV+jmR1m+
-KX3Cp+5joEZhlM1k43fLs1LWPzAI8Y7d28jgZE+dXYJAu5eUh12BDpNHMuY72mS7
-rYDEhCd7pAN6tS3HpegWxxuWv5dOeTRPok9/KF+0x4GjNWIfbzDPlPKG615VG2nH
-BgOmFqat8LHEvQPH5UpMaknU8xZjXyCZj4dAFLn1fwKtKe7Hu3dRH4kA2tfrkeIC
-ubJLYa8NOBH+UgZVAbYapie5FOGszPkuA+G25IbtSITJXyz+VC+G+maAIfkpyALJ
-nNrsjgvd1seHeTVXeassTvbFkHPaz+psBQPZKjWUflV2LKdjXQ0nNa4NlV88+sZF
-+DDuQ31MPeY0E5axOaLSTlfKcOmXwxmzHGQ0nkIzUntDUdjIQGfcNEfwzzoMhAcG
-pan19Ygnsuaod54gd/5++482kE/ijT+5IurSF5EyL0TdXEYOAtWzM0EDMbrHjLzW
-b/FFbDzgT/eKUO6IIpW8GFdJrEw5U/F3li+Kf3LTAKpWjU3ptqgM6sWyg2nvQO0Z
-4WW1YaEuFb1YyWy04nGTpQmuGhmcUqxFW+K2IXN/dKWHYOe3SlzZ/gGtjJYzfmgy
-V2RpIDeNpkSyWkSIpVnBYRpWLUemIECrnbMTU84yZAggqzlxFDEznTnfDxv2HEX6
-TYUrLb9VYkFFydyN6CoZ
-=Sc3g
+iEYEAREIAAYFAlJNCqIACgkQCaWpQKGI+9RfewCfXd5bl8wNrqYj2h6+qtncXmrB
+QosAnAm8h/dfOPVCKufKOBPDxV0YoZpa
+=z2u6
 -----END PGP SIGNATURE-----
diff --git a/net-wireless/bluez/bluez-4.101-r7.ebuild b/net-wireless/bluez/bluez-4.101-r7.ebuild
new file mode 100644
index 000000000000..fd53ce576123
--- /dev/null
+++ b/net-wireless/bluez/bluez-4.101-r7.ebuild
@@ -0,0 +1,161 @@
+# 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.1 2013/10/03 06:11:45 pacho 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
+
+	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
+}