Version bump, reword elog message (#549462 by emarsk)

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

3 files changed, 221 insertions, 17 deletions

diff --git a/net-wireless/bluez/ChangeLog b/net-wireless/bluez/ChangeLog
index 7efb5ce5ae5e..d0495c56804f 100644
--- a/net-wireless/bluez/ChangeLog
+++ b/net-wireless/bluez/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-wireless/bluez
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez/ChangeLog,v 1.239 2015/04/08 18:20:55 mgorny Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez/ChangeLog,v 1.240 2015/06/19 17:26:56 pacho Exp $
+
+*bluez-5.31 (19 Jun 2015)
+
+  19 Jun 2015; Pacho Ramos <pacho@gentoo.org> +bluez-5.31.ebuild:
+  Version bump, reword elog message (#549462 by emarsk)
 
   08 Apr 2015; Michał Górny <mgorny@gentoo.org> bluez-4.101-r9.ebuild,
   bluez-5.25.ebuild, bluez-5.28.ebuild, bluez-5.30.ebuild:
diff --git a/net-wireless/bluez/Manifest b/net-wireless/bluez/Manifest
index 4c15b55d5f69..a9e270db1b64 100644
--- a/net-wireless/bluez/Manifest
+++ b/net-wireless/bluez/Manifest
@@ -18,28 +18,18 @@ DIST bluez-4.101.tar.xz 887236 SHA256 41f9578bef39b8c94a2d6ddeaa556afd22d136936d
 DIST bluez-5.25.tar.xz 1479312 SHA256 5ca62f3f45e2638a0f7a81658d6c8813ee01487436ae8e53e9fe395e23d1fd30 SHA512 2e13c552e771a9066c3170dfca43cca8a16b3afa3580b90ff065301e3a85d35ac47b145f5aa4db42001c466675994e9115d5c1909b7abe76c381114b7f4d872a WHIRLPOOL 28dfe9e7a6eb9a1cb81001f7183a26b3a3cf8d6383b4c6d17e0b851eeb87497e23c8262a07564cb1cc0fcec128627503ff266d17c86c7ebd8906b9c714dc5df1
 DIST bluez-5.28.tar.xz 1553592 SHA256 85bab48f4b47a158739028682c1e09cf30099c8ea9dfe63360055f8e06fc18a9 SHA512 7945604d8fcce86a6c89b04ae5f1c6a7c5e3d7f4788f42e9e0faab0377119b70da319d9eabf05d58e1f91d090996f04194589db313de3cdb5d8e2a9aa5fe3036 WHIRLPOOL 1ee91548a8d32ae530ed5c4e74350eab061eade6bb876a1d9f24922d791990eb570d4b1d85966b8f400bd49a6680d9516dbdbbe5a2208b5ea30f9a58dd655551
 DIST bluez-5.30.tar.xz 1594944 SHA256 1e3a4adb5a097dab83b3cf58e09c9541b815c6f33e3da972e18dfd1eb05d382c SHA512 177c519cc95f6d2e7086d819d9a2a35b42dcc444c9c267813c5407cd02435f7fe2bcbbbb7e85fb312046a57b89ef4eaebc8da5e9adfa57925c7bb40345c156bd WHIRLPOOL cb711a5b6476082714ed4db2972f2b65cd38ef684287646416defd003aa00f70499e69fbbd0c0d78e13e69d24d0f4c4774c9bc852f20da78b7ad00ef51fb9da3
+DIST bluez-5.31.tar.xz 1631664 SHA256 c4b661cc5866d9a9a9d608d700392afa278c3b6fe8426238bf6979be7c63818f SHA512 d358e08b2dddb3b918c3cd60c510417c7d32ff30e416e15d8fcd7530fe17de1f4b2f3f8e3186f4b7e1a8f493b69706bae5ab74873a655de56726fb0ffd487dc0 WHIRLPOOL ce0504b2c9a7bdb918962cff60dbb67cb9fa93d4824c11f33881d20f0e812c025a8485bb5ed2136a4c9e6245c144dfbeba8a5669348e27c221f02329e719bb63
 EBUILD bluez-4.101-r9.ebuild 5284 SHA256 16d72234e2f36a5b8906a2ca83c61da8bd787409954ca3b3e5553cf0d7b75c78 SHA512 f42d84f7c93344400f9b61f40f18d198a299681524dcecbf63965dfc39a33418c721ab89d93ef336dd0e987026903fd13589c431a1053405610828f8ac437531 WHIRLPOOL 77c09fc3f4e0a98d70bc8358c7efd8ad3ab704b9df4a0909b8b69b86688b130b7f280bd8326e8b8fd0f2d9d715a8a0558e58aaeae04a3d07f7add1b6a9717b18
 EBUILD bluez-5.25.ebuild 5604 SHA256 3fc5ce1f47a5c001a98362ae7012e4c5d1d7e5fc658d9eb5d795f85e429b9edc SHA512 300d0e07162382c89b38438cf9ad60a5ce8c9776353ea1c4e765ae90e5e16705ce4ea95aa91dd92ffab1cd4bdcc1b49b4c801253555417fe6a185312de3b6e51 WHIRLPOOL 1ad3448f32972670f1bc742f232bcc470a1db5412d3fe0f17cc11c894f7d8553ec814e2f441d47f466cc509eb3fbb046cdef0534755b24d3800ec585cd74e498
 EBUILD bluez-5.28.ebuild 5520 SHA256 0b69f8ab5e4a161b2e534a3bc2a97613a757053fe119a2e71d13bd7ca6f27a5a SHA512 07a3b630ceaa535b85dfff86822041c157d65414b67d66cd5984cdd0704a48f4e4689afe8d30cbf7afce1d154ad90f3a1d5b8b38252d7e268242c9fb5f314759 WHIRLPOOL f04f7dadf0eaee73d977f64099197439c8676daf523db974157f034899026e21e5f6ea0865a473ae0da3a3d60d55d9f6bf5a177ff8767d03441ee301069c2934
 EBUILD bluez-5.30.ebuild 5708 SHA256 308f673789946df7d76c9b74c3ef3d83065ea7d2beb07b3a982367bf2370b27b SHA512 6d385f28e20d95c9fb120fd2318f24869b48a52ff43a18acd73444fef5b2e0a21c4d37f7f8fde15bf591fbbcb7a588239109f57d4abdeadfca52130100c61c12 WHIRLPOOL 2f3efc7c1b9a155d0bdf4b99e18c229861230db45a40b715c9b6f36f5256ed594a3fe9f7d37e476b341c5b043c8b0d36f5821d05951eb61b5845e602c27452f9
-MISC ChangeLog 42450 SHA256 3987630925608164a81dbaec7e061cd9fe81ca21c275563689e48446686041a3 SHA512 3c8ae77a56ccca4e4424cac0efe2319622b58798969cb217718762792c69883b074378abd3e06723e7a3b80f4a6729cab37520c22a64e43a42689b39002cf786 WHIRLPOOL 4eb07ecd618609d9bb52ac4ad603d106805e0fbccd5bd444997dd0d92aacb1f1f7dbdd0e51db1a71b4429ecada736ecf2e1f36fa890d83452ae6d841fae97dc5
+EBUILD bluez-5.31.ebuild 5582 SHA256 af22c2eb882f466c431b7d2e75fe75f6f797dafb70d9f7806ebc138aaaeb7bc9 SHA512 b8b42e6a35e439d12ffcc4a2644543446b3667282fc75f04504e63066b20e41d8bf8861b921783b758285f36ef603a7303b545e3387247c73e119732bb5d1075 WHIRLPOOL 871c9c43ffa38a4b7e91aefe4534c49a835b97ff675fd471651405f4242120d76e58fd4d72f512e24fabaed7c4694e12732cfc76415bc1183fa6aaee933d1118
+MISC ChangeLog 42599 SHA256 3ca450aa07947dcc310a17ceb76eb87697c9ae2ae855f1e97d50c9cb2f964673 SHA512 aa68365dc70b5e48c1ff2f06285e17899b0ff9f33d68b7e8710e730bad32ca6755b719a3dd3567492de25798d56d48fa7bdb4e2de53ff28fb9330b94dec47a82 WHIRLPOOL 3b491b49d8310921fe2777571186b5e7f2e98225ebed08e7b1edd8212331bfdbc4553e2929f390c82dc48b907cdaf6a377ccc90c9ad4370e74333bd7c749b5ab
 MISC metadata.xml 759 SHA256 e649a4a8180f678ead82c6b8fd8d02cecc19f0c592fb059cbbadf14c3028da7f SHA512 91e8f285f398cbd6bd7e739433df5efab185bfcbc755e403639ac504fd8c5699531b205b0a54c4da24785268d8c5b18b06db30536484576726afede6a67c8184 WHIRLPOOL 459f9d3e931bd0c7962ef8633ed28292ca30835f60ff8eabf067051606509ee411d4aafa8e95e1ebfdc626f35e95ae6516b7469b984fcddddae0db3bb007d9a4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQJ8BAEBCABmBQJVJXGOXxSAAAAAAC4AKGlzc3Vlci1mcHJAbm90YXRpb25zLm9w
-ZW5wZ3AuZmlmdGhob3JzZW1hbi5uZXQ2REJCMDdDQzRGMERBRDA2RUEwQUZFNDFC
-MDdBMUFFQUVGQjQ0NjRFAAoJELB6GurvtEZOjxQQALHQrH3Cncv7T9AS4XIQ2X+4
-pzCL1IhCJJCYpr8pl7HX/DdjGv1GXiE+y4Y6gUts1R6vIq4VgjP77XLekkP+nY2J
-OkVBhPgQ6qfc6o/ud6iyvZkzOagx3mkHwQOZMyH8K8NJqIpuySeNj6UeMRttmqOe
-mRES+jQ03FN4+qX4Q0o3ErlVdVEuyTz7gYS0jYpdQhjjcPxUT5hshhga4vZcEGE4
-DxEY5ZnxN7nrDELrh8uqj2Gg44T28pd1DwO176LAlDwRwjIHs9HtlzaFLT8CAX0E
-6xVtOuAsfteHTlWQ7DtvFgvELYZIFJMXCBSuLexIE5/HjLHDNeEIM3Mkhm/emuS0
-U6jMFL7F163QXjjKY+d7fQOyYQLEWsyFvydczBL8Ev54ZcF7Qv/6fFdo5aw7aHqP
-Wf0XAko55PXMKBzshsNC1jJVIHIoduqwaltsmEC9lEiTUBKqanb4Pq5YF1cyjUJ/
-T8/ysNBco/oQN58fwyD0yxdu47S696DmwyijTmfDf6q+oIqvdFXOINDYCr4VTc8r
-+TaFwTh/mtfDzpLPvR+6+XKl0zZYjct3H505RndE8Blg1bs1zyz+wAraDSj/CWSS
-BNJZIYYaqxCR1kJtZUnAqe1yeTanyFgPJ5Mi6dOdHTE80IugMnR/X7ytDiU6DUDS
-aEqhuPORr4U1tCBGIEYX
-=p1cT
+iEYEAREIAAYFAlWEUOEACgkQCaWpQKGI+9Sx4gCfVaw7CgtRqPK2aVlCzID2T8hl
+fjoAoIcO/gguGba5dSILNATc0jJ6nqs8
+=7rwP
 -----END PGP SIGNATURE-----
diff --git a/net-wireless/bluez/bluez-5.31.ebuild b/net-wireless/bluez/bluez-5.31.ebuild
new file mode 100644
index 000000000000..b125ea4505ea
--- /dev/null
+++ b/net-wireless/bluez/bluez-5.31.ebuild
@@ -0,0 +1,209 @@
+# Copyright 1999-2015 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez/bluez-5.31.ebuild,v 1.1 2015/06/19 17:26:56 pacho Exp $
+
+EAPI=5
+PYTHON_COMPAT=( python{2_7,3_3,3_4} )
+
+inherit autotools eutils multilib python-any-r1 readme.gentoo systemd udev user multilib-minimal
+
+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/3"
+KEYWORDS="~amd64 ~arm ~hppa ~mips ~ppc ~ppc64 ~x86"
+IUSE="cups debug +obex +readline selinux systemd test +udev"
+
+CDEPEND="
+	>=dev-libs/glib-2.28:2
+	>=sys-apps/dbus-1.6:=
+	>=sys-apps/hwids-20121202.2
+	cups? ( net-print/cups:= )
+	obex? ( dev-libs/libical:= )
+	readline? ( sys-libs/readline:= )
+	systemd? ( sys-apps/systemd )
+	udev? ( >=virtual/udev-172 )
+	abi_x86_32? (
+		!<app-emulation/emul-linux-x86-soundlibs-20140406-r1
+		!app-emulation/emul-linux-x86-soundlibs[-abi_x86_32]
+	)
+"
+DEPEND="${CDEPEND}
+	app-arch/xz-utils
+	virtual/pkgconfig
+	test? (
+		$(python_gen_any_dep '
+			>=dev-python/dbus-python-1[${PYTHON_USEDEP}]
+			|| (
+				dev-python/pygobject:3[${PYTHON_USEDEP}]
+				dev-python/pygobject:2[${PYTHON_USEDEP}]
+			)
+		')
+	)
+"
+RDEPEND="${CDEPEND}
+	selinux? ( sec-policy/selinux-bluetooth )
+"
+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 && 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() {
+	# Use static group "plugdev" if there is no ConsoleKit (or systemd logind)
+	epatch "${FILESDIR}"/bluez-plugdev.patch
+
+	# Try both udevadm paths to cover udev/systemd vs. eudev locations (#539844)
+	# http://www.spinics.net/lists/linux-bluetooth/msg58739.html
+	epatch "${FILESDIR}"/bluez-udevadm-path.patch
+
+	# Fedora patches
+	# http://www.spinics.net/lists/linux-bluetooth/msg38490.html
+	epatch "${FILESDIR}"/0001-Allow-using-obexd-without-systemd-in-the-user-sessio.patch
+
+	# http://www.spinics.net/lists/linux-bluetooth/msg40136.html
+	epatch "${FILESDIR}"/0001-obex-Use-GLib-helper-function-to-manipulate-paths.patch
+
+	# http://www.spinics.net/lists/linux-bluetooth/msg41264.html
+	epatch "${FILESDIR}"/0002-autopair-Don-t-handle-the-iCade.patch
+
+	# ???
+	epatch "${FILESDIR}"/0004-agent-Assert-possible-infinite-loop.patch
+
+	# Ubuntu workaround for bug #501120
+	epatch "${FILESDIR}"/0001-work-around-Logitech-diNovo-Edge-keyboard-firmware-i.patch
+
+	if use cups; then
+		sed -i \
+			-e "s:cupsdir = \$(libdir)/cups:cupsdir = $(cups-config --serverbin):" \
+			Makefile.{in,tools} || die
+	fi
+
+	eautoreconf
+
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	local myconf=(
+		# readline is automagic when client is enabled
+		# --enable-client always needs readline, bug #504038
+		ac_cv_header_readline_readline_h=$(multilib_native_usex readline)
+	)
+
+	if ! multilib_is_native_abi; then
+		myconf+=(
+			# deps not used for the library
+			{DBUS,GLIB}_{CFLAGS,LIBS}=' '
+		)
+	fi
+
+	econf \
+		--localstatedir=/var \
+		--disable-android \
+		--enable-datafiles \
+		--enable-experimental \
+		--enable-optimization \
+		$(use_enable debug) \
+		--enable-pie \
+		--enable-threads \
+		--enable-library \
+		$(multilib_native_use_enable test) \
+		--enable-tools \
+		--enable-manpages \
+		--enable-monitor \
+		$(multilib_native_use_enable cups) \
+		$(multilib_native_use_enable obex) \
+		$(multilib_native_use_enable readline client) \
+		$(multilib_native_use_enable systemd) \
+		$(systemd_with_unitdir) \
+		$(multilib_native_use_enable udev) \
+		$(multilib_native_use_enable udev sixaxis)
+}
+
+multilib_src_compile() {
+	if multilib_is_native_abi; then
+		default
+	else
+		emake -f Makefile -f - libs \
+			<<<'libs: $(lib_LTLIBRARIES)'
+	fi
+}
+
+multilib_src_test() {
+	multilib_is_native_abi && default
+}
+
+multilib_src_install() {
+	if multilib_is_native_abi; then
+		emake DESTDIR="${D}" install
+
+		# Upstream doesn't install this, bug #524640
+		# http://permalink.gmane.org/gmane.linux.bluez.kernel/53115
+		# http://comments.gmane.org/gmane.linux.bluez.kernel/54564
+		# gatttool is only built with readline, bug #530776
+		use readline && dobin attrib/gatttool
+		dobin tools/hex2hcd
+
+		# Unittests are not that useful once installed
+		if use test ; then
+			rm -r "${ED}"/usr/$(get_libdir)/bluez/test || die
+		fi
+	else
+		emake DESTDIR="${D}" \
+			install-includeHEADERS \
+			install-libLTLIBRARIES \
+			install-pkgconfigDATA
+	fi
+}
+
+multilib_src_install_all() {
+	prune_libtool_files --modules
+
+	keepdir /var/lib/bluetooth
+
+	# Upstream don't want people to play with them
+	# But we keep installing them due to 'historical' reasons
+	insinto /etc/bluetooth
+	local d
+	for d in input network proximity; do
+		doins profiles/${d}/${d}.conf
+	done
+	doins src/main.conf
+	doins src/bluetooth.conf
+
+	newinitd "${FILESDIR}"/bluetooth-init.d-r3 bluetooth
+	newinitd "${FILESDIR}"/rfcomm-init.d-r2 rfcomm
+
+	einstalldocs
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+
+	use udev && udev_reload
+
+	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"
+		elog "need to add the user to the plugdev group."
+	fi
+}