Version bump, readline is needed when client is built (#504038 by Richard Li), make udev optional (#504324 by Alexandre Rostovtsev and Joshua Kinard), drop old.

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

3 files changed, 32 insertions, 14 deletions

diff --git a/net-wireless/bluez/ChangeLog b/net-wireless/bluez/ChangeLog
index e251e2e22488..058a04a16b19 100644
--- a/net-wireless/bluez/ChangeLog
+++ b/net-wireless/bluez/ChangeLog
@@ -1,6 +1,14 @@
 # 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.192 2014/03/09 12:05:48 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez/ChangeLog,v 1.193 2014/03/12 20:52:46 pacho Exp $
+
+*bluez-5.16 (12 Mar 2014)
+
+  12 Mar 2014; Pacho Ramos <pacho@gentoo.org> +bluez-5.16.ebuild,
+  -bluez-5.14-r1.ebuild:
+  Version bump, readline is needed when client is built (#504038 by Richard Li),
+  make udev optional (#504324 by Alexandre Rostovtsev and Joshua Kinard), drop
+  old.
 
   09 Mar 2014; Pacho Ramos <pacho@gentoo.org> bluez-5.15.ebuild:
   x86 stable, bug 499954
diff --git a/net-wireless/bluez/Manifest b/net-wireless/bluez/Manifest
index d767ba0fe75d..1aedf7d90026 100644
--- a/net-wireless/bluez/Manifest
+++ b/net-wireless/bluez/Manifest
@@ -13,17 +13,17 @@ AUX rfcomm-conf.d 150 SHA256 672498957049fd301f9c9c1dc9fa49430e5e6d3c3f1f3cdce80
 AUX rfcomm-init.d 665 SHA256 88df441dc7a7d5ce28005e311168690ecf877148efc5264e310189a6baedc05e SHA512 30ddaa1e0572d6b436dd20a89ebfdc83369c10ccc307e184c8437ff8b1a91078a4315958f1b013cb1568817562c17440f9ca1284f686ec9bc542cd6d0d321097 WHIRLPOOL b050e49599481a8a13e6ed47fad919b9eaaf39dffe0774783c57a26cbc27c15d59591a6edd19ede7a9844ac6de211fc3d37ced06052d34a9ab02dae271b9696e
 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
-DIST bluez-5.14.tar.xz 1209352 SHA256 5a485837c215f3093d3a98cb412dc99e1139f88a66c8809bdf183ad5e676395f SHA512 41ff320157b034f1b075266d8a6e0ffc9a2eccb2a4ae90abaec0970abd144a3e536292e826bd47f82e7fd52c1d370d45fba537f54e5cb8d6e9e306ab30f4af0f WHIRLPOOL 0a951d6fe9572b77cc05758cc947b23681a49823fc9e23cb645444892e33c093e5b4d979763b53e6f4898569d073b0f320d491818f9bfddb2feb132eb70c7b44
 DIST bluez-5.15.tar.xz 1242876 SHA256 487bd75697e565793bf5bc4fbd5fa6a602788313b0c694f7542b81689fc0aa87 SHA512 33b9d0e90b66a778af60aae0761d5627e33513b1ca204a8a76e5ef8ea1555c4734b9029359c8e0981680bef8a3853d50d5cf0094b01e389dd2987e2274f4d026 WHIRLPOOL ad3235e1973c7e8bd6716a8b8cd77161b8d12b06596b7ff45e9d15a35e3d2f8bcee0b5de0159f7c22eb653f519089158718ecc4ea1c326289398844ce586d023
+DIST bluez-5.16.tar.xz 1275864 SHA256 c8d5094a21a799dca9cdcd99651dc19d521af514b22b8178fc787c454cdbb163 SHA512 27ac9aa98107b234696885ce3f40736dc25b9e4b34baa6b4d9dd3f0b81d4ca364a819f42801bddc8c1a247be1db37ac3c7e7802188ad943b996c07b640db65b1 WHIRLPOOL a917ffa4c3652986c0ea2a994793d988381f320e86a1718567123af71570583e6e8180627b06fe34c3a9c9f765d2debcac5814f15b3aa5291953b5072498f106
 EBUILD bluez-4.101-r8.ebuild 4240 SHA256 b6a8079aaa7d88894758ae5ebb9c0e45099c1593e6a4d2814aa521a55f58eac2 SHA512 149053e66990a699dc393b98d3b009d01174d88704195fc7e80831701fff1c1bd32b60a31e9642170b10d52b2211452de4309c75478fe78ae5640f161b8e639b WHIRLPOOL 15710a42aeda2fa1ce49525eb8281844d5f0e7f4f637b677aaad41d510145fba1ef5932fcd1a0fa9cdaeca0b9100bdd1059574caead836c09476f6d9f2928f80
-EBUILD bluez-5.14-r1.ebuild 3945 SHA256 5e69d22c6cf64e6463f20210dcbb6e194f2b046fd19dac36f1860f39e202436c SHA512 02336aff4dfabdeb705aa7d723459c7805c764aa3a8653de3a10375445b04eb4fd6166e6b4c4c43545ab1d555fb0f6f047abe638c91139c7d0b644a3eed34e9c WHIRLPOOL f7099211086e2ae6eb7e5a3e115f52613d3c2d105d27b217ca4da80405e2af9776b4f1117ec5fc307ca4f9cbd0095bdda704eaa2aa127137d1679c38f674ec7f
 EBUILD bluez-5.15.ebuild 3962 SHA256 51de8c49ab3df367afdc5a7c284ff8c546fc8f1a5ba2a92b7f029dc52825a4a2 SHA512 e348cf01a4dfbba95f86351f61433b51a360f3a4687af805a15495b563a2467664bddf974c2bb07b5e94b644ac4e75e12b9a5f0a8f1a6df95990738996404cc2 WHIRLPOOL d89d0383a5a89803ba47e4831d6c068f7429d2a67da2b18dd447de77faed8cbf246514949f201273bfd2b0cfd58fe333e868674c538c2a1b067613295f44a2c1
-MISC ChangeLog 35476 SHA256 0dfed0b23ed215aaa6c9f252184048088ac7e94041dfaa25a6e32e53855cfca1 SHA512 f0834ea6fb6c277ac75d2e7ef7b32ec9de978e06021ce31fa9dc936a3b2319c5570015397b6592c69c61cebca2a5815e602a2c0f76ffd19fd12228e37d2966d5 WHIRLPOOL 742747716e9e94ccda73f4bdb9b2a236c96952ea70d187a4ac3408bfe848dff87e3795bdfd3a7f1947ed157aef3400fe759d8df0be89c661c71d5cf3ce218b0f
+EBUILD bluez-5.16.ebuild 4321 SHA256 5b39a617de83b61a1cbd177ff78418abdcd37ca8431a07823f6713f53a724a07 SHA512 48dd365ff6500895533eea0023464ca81c4e2bff8cc3df32175fbc1345409396981118b8f795c0d1fdb8a997029da2fd0dc6e185fbf43e2a4cac347428c763c7 WHIRLPOOL 8e2f14ba49797317904b374c6eb4b35dc0c4f17ac7b38d748b18fd5533728b767cc14d3fb0f820925e3594215fcd32250d6fa413748bcdaed3e0b0b8f95c0ad8
+MISC ChangeLog 35762 SHA256 4d2faf2380a393b2394e9f1b4a29b73154ea71ab700543984109f040f6dc0106 SHA512 a9c8d8837c3b83be9c98497bf37d85fd600cd012c5e2b91beae0d9e83fe2085457213c944ab1eccce2119a00cb41295d9afc99619f0ecf7fbc9fad7a87f7a650 WHIRLPOOL 18d370da60d08268d6877eaa0d7b2b58f6fbb5dbfe8fc1285d9fea5d059848baf9aecf06426acfa12aea6f8f3de950347a7984a7bfad8392f9eadb6747871524
 MISC metadata.xml 759 SHA256 e649a4a8180f678ead82c6b8fd8d02cecc19f0c592fb059cbbadf14c3028da7f SHA512 91e8f285f398cbd6bd7e739433df5efab185bfcbc755e403639ac504fd8c5699531b205b0a54c4da24785268d8c5b18b06db30536484576726afede6a67c8184 WHIRLPOOL 459f9d3e931bd0c7962ef8633ed28292ca30835f60ff8eabf067051606509ee411d4aafa8e95e1ebfdc626f35e95ae6516b7469b984fcddddae0db3bb007d9a4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iEYEAREIAAYFAlMcWR0ACgkQCaWpQKGI+9TPMACfeIMixHkUbqAoZacXaDHrpucW
-RYQAmwe0esQkv2EIDO827o6NK3dk6MtV
-=N98a
+iEYEAREIAAYFAlMgyR8ACgkQCaWpQKGI+9RI9QCeJMYSBVAALPbBNmGOV/urmjar
+Fq8An1qGTHGXqOi1FwT4jSPSWnmsj6X8
+=rHaA
 -----END PGP SIGNATURE-----
diff --git a/net-wireless/bluez/bluez-5.14-r1.ebuild b/net-wireless/bluez/bluez-5.16.ebuild
index 9b60fe9ec176..d665b9e316ff 100644
--- a/net-wireless/bluez/bluez-5.14-r1.ebuild
+++ b/net-wireless/bluez/bluez-5.16.ebuild
@@ -1,6 +1,6 @@
 # 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.14-r1.ebuild,v 1.3 2014/02/22 20:27:42 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez/bluez-5.16.ebuild,v 1.1 2014/03/12 20:52:46 pacho Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
@@ -14,19 +14,19 @@ 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 +udev"
 REQUIRED_USE="test? ( ${PYTHON_REQUIRED_USE} )"
 
 RDEPEND="
 	>=dev-libs/glib-2.28:2
 	>=sys-apps/dbus-1.6:=
 	>=sys-apps/hwids-20121202.2
-	>=virtual/udev-171
 	cups? ( net-print/cups:= )
 	obex? ( dev-libs/libical )
 	readline? ( sys-libs/readline:= )
 	selinux? ( sec-policy/selinux-bluetooth )
 	systemd? ( sys-apps/systemd )
+	udev? ( >=virtual/udev-171 )
 "
 DEPEND="${RDEPEND}
 	virtual/pkgconfig
@@ -46,6 +46,14 @@ DOC_CONTENTS="
 pkg_setup() {
 	enewgroup plugdev
 	use test && python-any-r1_pkg_setup
+
+	if ! use udev; then
+		ewarn
+		ewarn "You are installing ${PN} with USE=-udev. This means various bluetooth"
+		ewarn "devices and adapters from Apple, Dell, Logitech etc. will not work,"
+		ewarn "and hid2hci will not be available."
+		ewarn
+	fi
 }
 
 src_prepare() {
@@ -77,11 +85,13 @@ src_prepare() {
 
 src_configure() {
 	# readline is automagic when client is enabled
+	# --enable-client always needs readline, bug #504038
 	export ac_cv_header_readline_readline_h=$(usex readline)
 
 	# Missing flags: experimental (sap, nfc, ...)
 	econf \
 		--localstatedir=/var \
+		--disable-android \
 		--enable-experimental \
 		--enable-optimization \
 		$(use_enable debug) \
@@ -91,13 +101,13 @@ src_configure() {
 		$(use_enable test) \
 		--enable-tools \
 		--enable-monitor \
-		--enable-udev \
 		$(use_enable cups) \
 		$(use_enable obex) \
-		--enable-client \
+		$(use_enable readline client) \
 		$(use_enable systemd) \
 		$(systemd_with_unitdir) \
-		--enable-sixaxis
+		$(use_enable udev) \
+		$(use_enable udev sixaxis)
 }
 
 src_install() {
@@ -133,7 +143,7 @@ src_install() {
 pkg_postinst() {
 	readme.gentoo_print_elog
 
-	udev_reload
+	use udev && udev_reload
 
 	has_version net-dialup/ppp || elog "To use dial up networking you must install net-dialup/ppp."