From: Pacho Ramos <pacho@gentoo.org>
Date: Wed, 26 Nov 2014 22:45:17 +0000 (+0000)
Subject: gatttool is only built with readline, bug #530776 by Richard Li; drop old
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=705e83b968d3a0a6180a22a42c7ee613a43359b4;p=gentoo.git

gatttool is only built with readline, bug #530776 by Richard Li; drop old

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

diff --git a/net-wireless/bluez/ChangeLog b/net-wireless/bluez/ChangeLog
index 9b9db7d6a6ed..a4dacbf00cef 100644
--- a/net-wireless/bluez/ChangeLog
+++ b/net-wireless/bluez/ChangeLog
@@ -1,6 +1,10 @@
 # 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.227 2014/11/26 10:40:09 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez/ChangeLog,v 1.228 2014/11/26 22:45:15 pacho Exp $
+
+  26 Nov 2014; Pacho Ramos <pacho@gentoo.org> -bluez-5.24.ebuild,
+  bluez-5.25.ebuild:
+  gatttool is only built with readline, bug #530776 by Richard Li; drop old
 
   26 Nov 2014; Agostino Sarubbo <ago@gentoo.org> bluez-5.25.ebuild:
   Stable for amd64, wrt bug #529946
diff --git a/net-wireless/bluez/Manifest b/net-wireless/bluez/Manifest
index 93c01dbf486b..4e184c9948f8 100644
--- a/net-wireless/bluez/Manifest
+++ b/net-wireless/bluez/Manifest
@@ -16,28 +16,16 @@ AUX rfcomm-init.d-r2 661 SHA256 e633ab4690db7d89d8a325bbdff73253cb4e3994c4cc5daa
 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.21.tar.xz 1387560 SHA256 81eb073516f39ff1fa02fa40120e834f40fdb0b772f8f4153a9ab566cc0a1f4f SHA512 41ce678abd050ad020d1e04e52740167746eaa7f35e339784c07dec44995b07a8e4e96f0e9530eed2faa50c95c756d56ea0c4d412421b69698f8ca4c9051d07e WHIRLPOOL 60d3312fa66903a8a92ab516558cefc9ddc5c81e8cf632fa7a13ce170f10db94ecef52611c704c4d2f5db5eb0470fca8b6fec0ce59136f4c864a3d08c7bad2ff
-DIST bluez-5.24.tar.xz 1444536 SHA256 e870c5fba0bf3496856fc720e2d217856fcf40b59829f8cc0c05902ebb9fb837 SHA512 e4372c5a74dff8c399693504139bbd0d5b7b06822e659530d30cc5cf12842ad96ed1875eed0c46cc7cb63178cc910c6100988d1bb396580c1e0746e6eea50b13 WHIRLPOOL 60c5b6e045bf280d9298df03ec7aa7d42e7993a3492d5375d324adf02b8fd6af42932d8b3878714d27595b67ee8f5a825d8a9149ab584ac364e3282e829a4618
 DIST bluez-5.25.tar.xz 1479312 SHA256 5ca62f3f45e2638a0f7a81658d6c8813ee01487436ae8e53e9fe395e23d1fd30 SHA512 2e13c552e771a9066c3170dfca43cca8a16b3afa3580b90ff065301e3a85d35ac47b145f5aa4db42001c466675994e9115d5c1909b7abe76c381114b7f4d872a WHIRLPOOL 28dfe9e7a6eb9a1cb81001f7183a26b3a3cf8d6383b4c6d17e0b851eeb87497e23c8262a07564cb1cc0fcec128627503ff266d17c86c7ebd8906b9c714dc5df1
 EBUILD bluez-4.101-r9.ebuild 5290 SHA256 63c55aae8588448a5bf761ade1e988237a55a1305d301ff13ab20f7305528875 SHA512 f807d991af88accb10a4f21ae14a08817ca4c125b6d5bfd0292483397d4bbac347f8cab8162de78ff18f819973d5a9e6b483126eb4b854216a021fee699f26b6 WHIRLPOOL 014617996ca15da044bc3b9e46c0991deee797f4c5721f246dd102547077a12b21f97b05b48ded492aff98021e2b39e67ba036e11ad8358727231aa6822e1e06
 EBUILD bluez-5.21-r1.ebuild 5126 SHA256 46b881c067d59ecdc9966d6ee33059b682a7d3ebac10a85eb5b6aa70d2dc4207 SHA512 b5eff31b2890e07cdf64bcc7fa645c4d17ae57cf4ab350441dac2f22dd7df927d54fcc0a950ac9f1444aea5d2d9704eeb5fe7dbc2f1840ef36fb9c67c38aa223 WHIRLPOOL b35f5f768fd1ee56ebb07649252879226edd82beea81e5dd35d003d3b2391815f64ef89c2c49d52c3b1418d5bc8e0f3ad3dd1a9dbb3dacb8053346378cc8b759
-EBUILD bluez-5.24.ebuild 5695 SHA256 22ca40ed79dafe1c056cb9dc3489ed2a77a91865e53a89271933343d8526cac3 SHA512 81a4dfd1fad26a366b8478209feb189637ae28507fdeea671677425e2db92147af20b6494d8ee20bfc8547ce04fcaf90787a00e7a970c41a107863aef3521a3e WHIRLPOOL 8f39fed52b3a390c1d911240c581eed0ff26090b64ee6a09c77656f46dc347ebb48286f1fb685746225fe97436803c15357b283e588a1358d694cd9e2a3ecb8e
-EBUILD bluez-5.25.ebuild 5542 SHA256 053c3385ec13f4b2e8f01a27b5cf83dfd8eaa242a89831b649c481047543f685 SHA512 c27108d09750aec1ebed89d9aa36a56907b9dea656ab52431ed1da3e97a617c04716e65019f7d2965f8f5060700d06737fa113689e4930d8ad6f2fc93558634e WHIRLPOOL 92e9273a1eb2429e7fd35fe0898c4e6bfc043c9bd832cc4d595a60b56961c6f0db6d35d01531c75391c4e023f61deecc721d17fd28a23989fa998d42f40c217e
-MISC ChangeLog 40496 SHA256 0b603774d0792c2b3247930a095861ed3c8fc3f8d349d6835e66f9b7958ba0da SHA512 9201898420c25728d19cb6f5d345c5f664fa26ff74d986f252c2993e2d175e7152bf0631775c43f8fb2d2450353c16ca6e3cc75463a97f9ade31b33d2de43417 WHIRLPOOL ed544fb55d792f80c21f8be52e722f045d283c8135cc233db5fdb3257441b1f8e5d295bbb852ed96a488bd7c7adb56a998b4f85f15a141c85aab2e1bd1c922d5
+EBUILD bluez-5.25.ebuild 5614 SHA256 f4caec7ef9de22186834e017d5874bed7f5ae991882ad2a76b86f48018efc967 SHA512 f6d1d1862314d55e4098a3b9c98b8bbeb2f095761bb83fca0c2458f2159f128392cc9b20278d99c4eab0c5cdc671661073756b1e1025b32225a15cb75a0511e2 WHIRLPOOL 9d99c28402a95e28143ad294b70247b9ddd87ef347894d072cc8a9219b4bb77dff50616fc8a46791390566d056d3ec596b36883e869401e8ac7d8faf6819e723
+MISC ChangeLog 40662 SHA256 23c316353a06b95de41566d236ed2b17ec1e4f9053997f630a4883b2f10fe055 SHA512 718814610facf7f61bb8507e0962198541695eb25be02915d6cd01d7029a4716fc97f239a268a8c110f25e2e3fc60acbe145c5301bc068ee554e58603ff308ea WHIRLPOOL 2e578f29ff0f61511855bd31a1b7fafaf51c3b6ef18e55ed328e5a3d00457e669a76e85e72ce85e6eec91c13e19d957a8e579cb12c14c379c09834c3e980aff6
 MISC metadata.xml 759 SHA256 e649a4a8180f678ead82c6b8fd8d02cecc19f0c592fb059cbbadf14c3028da7f SHA512 91e8f285f398cbd6bd7e739433df5efab185bfcbc755e403639ac504fd8c5699531b205b0a54c4da24785268d8c5b18b06db30536484576726afede6a67c8184 WHIRLPOOL 459f9d3e931bd0c7962ef8633ed28292ca30835f60ff8eabf067051606509ee411d4aafa8e95e1ebfdc626f35e95ae6516b7469b984fcddddae0db3bb007d9a4
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJUda4KAAoJELp701BxlEWf6J8P/RjFqt2NNcApdolvc6DgAYQ9
-C8ExTNeLu7SuBZyZLimZ2ZH3HeW3r+6Msmt0NtVeNpq4uBiQSocXMlg3mZPs6HVS
-kyeNhkPNHSQOhHaqcO+B15VOX1zCt08FTZP1Ywu3yflMjnMomqqyIia2bYzHvEAh
-qfJ6sYGcl07q3lQp+jNxXE2HTqE5Nksht98Jc5ppXt1nPGs5WGlfeNpQBCHTQovY
-t98sYZ7P1EI9IIFI84PvOye5uxUYzWMjBZ+jEl5/y0nt89Sbqbio3Yb4guWlz9QT
-jI/AgfKe7pzE8yzHxVfCe24S+/rKL8nOsv5Fmjx4TYhrOYKTWV029DpSB62H6MQK
-DSHWwjjtyAIbdfwFgWQVHCjHJ0JkXKRpFmZk3qLnk5+V3cIeyKY6fm8ZC0BXoQRC
-ag2ihx0aG0CCYZGoVZXI9ouQ9ogm7wQm4xXTSvZ6n6mZTiyxc4/PbV2WszEp4x2c
-A47kf4e3YkkgtZW9BceSpciRjz1sMYSQacSEYEBUNRWk7KwD68aa+r03FmUkhxj2
-KCpsQZiV1FTGzfGyjUvXbMFFBgDJrBkLGtHOfqBZqO1GDGSDF8+7xFmHkA+az2bT
-T0qMXxOJIvVWN1sD2EqaDqixbbsdFzqJ0eEnQ+o/RFa6yjUkD0t90xZst00s/oen
-fKpZRynD+nQ/Z+mmEftW
-=lJQ0
+iEYEAREIAAYFAlR2V/wACgkQCaWpQKGI+9TKLACfd0A215QoSrWlFjI19AjzWRRL
+K8gAnAkWcFmkgH1kmQzNqegGyknF8PWY
+=eENr
 -----END PGP SIGNATURE-----
diff --git a/net-wireless/bluez/bluez-5.24.ebuild b/net-wireless/bluez/bluez-5.24.ebuild
deleted file mode 100644
index 5221a8b95e7d..000000000000
--- a/net-wireless/bluez/bluez-5.24.ebuild
+++ /dev/null
@@ -1,211 +0,0 @@
-# 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.24.ebuild,v 1.3 2014/11/02 09:36:26 swift Exp $
-
-EAPI=5
-PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3} )
-
-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 ~ppc ~ppc64 ~x86"
-IUSE="cups debug +obex +readline selinux systemd test +udev"
-REQUIRED_USE="test? ( ${PYTHON_REQUIRED_USE} )"
-
-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}
-	virtual/pkgconfig
-	test? (
-		${PYTHON_DEPS}
-		>=dev-python/dbus-python-1
-		dev-python/pygobject:2
-		dev-python/pygobject:3
-	)
-"
-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
-
-	# 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
-
-	# Fix compatibility with musl, bug #524454
-	# http://marc.info/?l=linux-bluetooth&m=141269379106447
-	epatch "${FILESDIR}/${PN}-5.24-musl-compat.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 don't install this, bug #524640
-		# http://permalink.gmane.org/gmane.linux.bluez.kernel/53115
-		# http://comments.gmane.org/gmane.linux.bluez.kernel/54564
-		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 '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
-
-# FIXME:
-# Looks like upstream installs it only for systemd, probably not needed
-#	insinto /usr/share/dbus-1/system-services
-#	doins src/org.bluez.service
-
-	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 only"
-		elog "be able to run bluetooth clients as root. If you want to be able to run bluetooth clients as"
-		elog "a regular user, you need to add the user to the plugdev group."
-	fi
-}
diff --git a/net-wireless/bluez/bluez-5.25.ebuild b/net-wireless/bluez/bluez-5.25.ebuild
index 7b40e8e3f5b7..d446342d37ed 100644
--- a/net-wireless/bluez/bluez-5.25.ebuild
+++ b/net-wireless/bluez/bluez-5.25.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.25.ebuild,v 1.4 2014/11/26 10:40:09 ago Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez/bluez-5.25.ebuild,v 1.5 2014/11/26 22:45:15 pacho Exp $
 
 EAPI=5
 PYTHON_COMPAT=( python{2_6,2_7,3_2,3_3,3_4} )
@@ -149,7 +149,8 @@ multilib_src_install() {
 		# Upstream don't install this, bug #524640
 		# http://permalink.gmane.org/gmane.linux.bluez.kernel/53115
 		# http://comments.gmane.org/gmane.linux.bluez.kernel/54564
-		dobin attrib/gatttool
+		# gatttool is only built with readline, bug #530776
+		use readline && dobin attrib/gatttool
 		dobin tools/hex2hcd
 
 		# Unittests are not that useful once installed