Version bump, remove old.

Package-Manager: portage-2.1.11/cvs/Linux x86_64

4 files changed, 58 insertions, 64 deletions

diff --git a/net-wireless/bluez/ChangeLog b/net-wireless/bluez/ChangeLog
index 8a9769d6ef76..d68c045bcd1e 100644
--- a/net-wireless/bluez/ChangeLog
+++ b/net-wireless/bluez/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-wireless/bluez
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez/ChangeLog,v 1.134 2012/05/22 16:16:32 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez/ChangeLog,v 1.135 2012/06/23 11:46:55 pacho Exp $
+
+*bluez-4.101 (23 Jun 2012)
+
+  23 Jun 2012; Pacho Ramos <pacho@gentoo.org> +bluez-4.101.ebuild,
+  -bluez-4.96.ebuild, metadata.xml:
+  Version bump, remove old.
 
   22 May 2012; Samuli Suominen <ssuominen@gentoo.org> bluez-4.96.ebuild,
   bluez-4.98-r2.ebuild:
@@ -670,4 +676,3 @@
   Initial commit, keeping the keywords the same as for bluez-libs/-utils
   since it's mostly the same. Most patches are taken from bluez-libs/-utils.
   (bug #236357)
-
diff --git a/net-wireless/bluez/Manifest b/net-wireless/bluez/Manifest
index 6b2749c57fbe..5bd6339be485 100644
--- a/net-wireless/bluez/Manifest
+++ b/net-wireless/bluez/Manifest
@@ -16,25 +16,21 @@ AUX init.d-dund 551 RMD160 273a9fb1989b80f12dc9813e9fe9ca42bd010e33 SHA1 51a24ec
 AUX init.d-hidd 780 RMD160 46a761ad2e151c2e1d997a9455edf4e3e4d61df0 SHA1 7d2d80a91517d5fa2965c1ac6078d8cc4f382198 SHA256 b1878d70112fd8fa1b851aaa4caa5e2b4efb55bf8e2dda02c014b55ce93adedb
 AUX rfcomm-conf.d 150 RMD160 5b4e24e56ea284f2bc80436a641fec0c6d0a8e84 SHA1 1716708772bf67f7f83ed562c35cc3b12da8073c SHA256 672498957049fd301f9c9c1dc9fa49430e5e6d3c3f1f3cdce80df3af7d425d08
 AUX rfcomm-init.d 668 RMD160 6c4f90ffbb00651fa957b91150c0c0ebb8ad11fb SHA1 93fc518eb512d71625d5d62da65c3b5c3e926401 SHA256 4430703a9bec9a9482416b2d24aa47492264768a0b61356b361bbc8b1229a83e
-DIST bluez-4.96.tar.gz 1164913 RMD160 7775a70c5cd86fc418547fae83621dab39196147 SHA1 c9327784cbcf1efc03cc547ceb18de90c8fb4c7c SHA256 c06fd50fd77909cad55e3181a42c6bce7cfcf7abb8cd87871c13d0d70f87fa99
+DIST bluez-4.101.tar.xz 887236 RMD160 8c4c000f595777771a66e1adbf68426e6db2c2f6 SHA1 5e6d94686b1a0492c4aed59ba16601f4903c15e8 SHA256 41f9578bef39b8c94a2d6ddeaa556afd22d136936d0f03100e422fe970a45a7d
 DIST bluez-4.98.tar.xz 838868 RMD160 eeb933670dc610d46f574da274edc58c3e07942a SHA1 4fe7cbee9db8bd82c30046d4ccca132702b511ad SHA256 6eb21e712e8835eb1aec84bdfb38891cc4dc5353af921b8235d481da13c565d9
 DIST bluez-4.99.tar.xz 859756 RMD160 168a851df6cac91541d8e454c78faeacf0c4549c SHA1 3d2e240618b7cc4ab16aeafcae749bf42ac0d8d3 SHA256 41889a91a5516eec26c4e59095ceea076de158b1ac38fd0ede9034596f511d3b
-DIST oui-20110801.txt.xz 520980 RMD160 2f7c863825fa8ae35d9beebe6bbd49fddd32f32e SHA1 a210a711e4e8046627676e5adf56132c977b663c SHA256 47be96b0e7b4a3235260f94ad77445fbf5226832ede588d9ea67d61759ff32e3
 DIST oui-20120113.txt.xz 541268 RMD160 445c782408d427bce66eadd3e179c425e3eb4c76 SHA1 6bc294d6992242648189b234e04afc96fce4a7cf SHA256 f65d2096566d88f9c55ce4da9104696cecb262a7d07c2f2ff58332f1ab40ae84
 DIST oui-20120308.txt.xz 546720 RMD160 eac8bc6c4be2c83e617ce5bd1c6825c1053c3492 SHA1 9dd7d7e77a83cbf3dc0e280102424a6f6b6f294c SHA256 4256ba96a522333a41fd058e1880a04f77566c9ad0a62d3c0d7ac422bf8b9086
-EBUILD bluez-4.96.ebuild 4826 RMD160 9044a40f4a6a0bf76d0a3551b99bae9c51a8b057 SHA1 5189d4280851c4aab6a2c500e700d5a0de35b4cd SHA256 ffca836c86eeff6e9247bfa91150491c4146b42e62e49e15ba9db855e7ae16cc
+DIST oui-20120623.txt.xz 561880 RMD160 17f82ed044400f768b3235eea3b6f666093cb3f1 SHA1 48d5b4014373b25c88f7c81f63eb5ad5af430fe6 SHA256 94843e51cf957a2da36869e0df1ff95c929694e9624e18416dfbfd10eb0af4e6
+EBUILD bluez-4.101.ebuild 4534 RMD160 54b5e8509a86e9f90fdbced274c9f6cb5c0336f8 SHA1 f1364c267914580048c7dc1147f8598821b2c491 SHA256 648122dc12b4463d9719cb6d9202fd89aec97d2e27dfae071fbdd4e78eb2afe1
 EBUILD bluez-4.98-r2.ebuild 4809 RMD160 aff467eaa4ba7f6151a7ab85f813476df3496495 SHA1 f0a703b59a04b2175aa7a906981afbe8c5e20697 SHA256 88cc8310d374265513e0c66217ddaff0097b6d2679f73055250af666fc6df268
 EBUILD bluez-4.99.ebuild 4603 RMD160 7ba2ce9dc2107f3b184dd8b4917cd684ff077423 SHA1 84f7541d192a72745d4a4553be453507b9f23233 SHA256 4288acda88bb2199fb6fa555def5000c475c9327fbd7a8900a29634dba438271
-MISC ChangeLog 25994 RMD160 d47591dedf87f03e00a45db1a504a3aa03bb7293 SHA1 6b741ea25a827785021499ac1b3ffffe890903f5 SHA256 b53719ab841d56bf4725fb391c94bc11d5b0fe6cb241d6b346c1ed27c8230eb9
-MISC metadata.xml 1002 RMD160 39cba3b507b69bcf58bb5561d8d6af1fd4a9aef4 SHA1 b7eaf92005d3a6f1a697f179f87a2b31e52cf50e SHA256 eefe2611dfa35dc04b39e2c7b36d9ebdfb3764bf945249bf994bd20606dfdeef
+MISC ChangeLog 26149 RMD160 78c579c04b662006d49e9141b49e3d1c5de67432 SHA1 3da1e6d8510df6d51d8c7cd1b1babde5834315d8 SHA256 90966dec2be26e3a20800884834ab0d909189c3d772791e1638c8c4291b1e27c
+MISC metadata.xml 709 RMD160 22621bfcd0188ecb7836e74c79f8bd4871bbfbfa SHA1 215f854ab353d27ad1759769dd7552f1dc3c3b93 SHA256 52aaf883d4e036328b559eb5c09e51401573cc8ad95c4e7cef659a8152af420b
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.19 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iQEcBAEBAgAGBQJPu7smAAoJEEdUh39IaPFNUF0H/1ujLWEtnDvQNkFUnNoNvgTl
-BHpHjsiJ6gCy6552WeFHF/wdONN389Kv6Wqps8yfxDl2FWFJcxsO+b4UTQs/YDEg
-co/qR7JMWKrwShpedeXNb2jWuzzEF53TslzGXeChM9sCrRuaHckNMe38MoEEaw9f
-yTDVdrFD4C2/pwxObaz3xQxGV/L/tHpyyRhfMGrTCwx5Y+YsmU2lh1w0OlVCOlHm
-E4U8E1eFTAgeu6fWg77DSfC9gQpntn9/CA3qCoo44zaZhg+YdHZjH6j+sQecRdev
-u3pARXmAvg6Fdj4ahGF7sRf87i3jj0BVF49Rh5M1x9L37QB+Idq65MEqJclxrWE=
-=iri2
+iEYEARECAAYFAk/lrLUACgkQCaWpQKGI+9SwuwCeKR3FSdM2ub7g1YsE7w4Tvu8S
+XwYAn0IkkpQKXGlPPnSmukmDzursc2f+
+=XjNo
 -----END PGP SIGNATURE-----
diff --git a/net-wireless/bluez/bluez-4.96.ebuild b/net-wireless/bluez/bluez-4.101.ebuild
index 82660cd13003..8062fc5aabda 100644
--- a/net-wireless/bluez/bluez-4.96.ebuild
+++ b/net-wireless/bluez/bluez-4.101.ebuild
@@ -1,10 +1,11 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez/bluez-4.96.ebuild,v 1.9 2012/05/22 16:16:32 ssuominen Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez/bluez-4.101.ebuild,v 1.1 2012/06/23 11:46:55 pacho Exp $
 
 EAPI="4"
+PYTHON_DEPEND="test-programs? 2"
 
-inherit multilib eutils systemd
+inherit multilib eutils systemd python
 
 DESCRIPTION="Bluetooth Tools and System Daemons for Linux"
 HOMEPAGE="http://www.bluez.org/"
@@ -12,39 +13,43 @@ HOMEPAGE="http://www.bluez.org/"
 # Because of oui.txt changing from time to time without noticement, we need to supply it
 # ourselves instead of using http://standards.ieee.org/regauth/oui/oui.txt directly.
 # See bugs #345263 and #349473 for reference.
-OUIDATE="20110801"
-SRC_URI="mirror://kernel/linux/bluetooth/${P}.tar.gz
+OUIDATE="20120623"
+SRC_URI="mirror://kernel/linux/bluetooth/${P}.tar.xz
 	http://dev.gentoo.org/~pacho/bluez/oui-${OUIDATE}.txt.xz"
+
 LICENSE="GPL-2 LGPL-2.1"
 SLOT="0"
-KEYWORDS="amd64 arm hppa ppc ppc64 x86"
-
-IUSE="alsa caps +consolekit cups debug gstreamer maemo6 health old-daemons pcmcia pnat test-programs usb"
+KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
+IUSE="alsa +consolekit cups debug gstreamer pcmcia test-programs usb readline"
 
 CDEPEND="
-	>=dev-libs/glib-2.14:2
-	sys-apps/dbus
-	>=sys-fs/udev-146[extras]
+	>=dev-libs/glib-2.28:2
+	>=sys-apps/dbus-1.4
+	>=sys-fs/udev-169
 	alsa? (
 		media-libs/alsa-lib[alsa_pcm_plugins_extplug(+),alsa_pcm_plugins_ioplug(+)]
 		media-libs/libsndfile
 	)
-	caps? ( >=sys-libs/libcap-ng-0.6.2 )
 	cups? ( net-print/cups )
 	gstreamer? (
 		>=media-libs/gstreamer-0.10:0.10
 		>=media-libs/gst-plugins-base-0.10:0.10
 	)
-	usb? ( virtual/libusb:1 )
+	usb? ( virtual/libusb:0 )
+	readline? ( sys-libs/readline )
 "
 DEPEND="${CDEPEND}
 	virtual/pkgconfig
 	sys-devel/flex
+	test-programs? ( >=dev-libs/check-0.9.6 )
 "
 RDEPEND="${CDEPEND}
 	!net-wireless/bluez-libs
 	!net-wireless/bluez-utils
-	consolekit? ( sys-auth/consolekit )
+	consolekit? (
+		|| ( sys-auth/consolekit
+			>=sys-apps/systemd-37 )
+	)
 	test-programs? (
 		dev-python/dbus-python
 		dev-python/pygobject:2
@@ -57,6 +62,10 @@ pkg_setup() {
 	if ! use consolekit; then
 		enewgroup plugdev
 	fi
+
+	if use test-programs; then
+		python_pkg_setup
+	fi
 }
 
 src_prepare() {
@@ -73,7 +82,10 @@ src_prepare() {
 }
 
 src_configure() {
+	use readline || export ac_cv_header_readline_readline_h=no
+
 	econf \
+		--enable-hid2hci \
 		--enable-audio \
 		--enable-bccmd \
 		--enable-datafiles \
@@ -87,19 +99,16 @@ src_configure() {
 		--localstatedir=/var \
 		--with-systemdunitdir="$(systemd_get_unitdir)" \
 		$(use_enable alsa) \
-		$(use_enable caps capng) \
 		$(use_enable cups) \
 		$(use_enable debug) \
 		$(use_enable gstreamer) \
-		$(use_enable health) \
-		$(use_enable maemo6) \
-		$(use_enable old-daemons dund) \
-		$(use_enable old-daemons hidd) \
-		$(use_enable old-daemons pand) \
 		$(use_enable pcmcia) \
-		$(use_enable pnat) \
 		$(use_enable test-programs test) \
-		$(use_enable usb)
+		$(use_enable usb) \
+		--enable-health \
+		--enable-maemo6 \
+		--enable-pnat \
+		--enable-wiimote
 }
 
 src_install() {
@@ -116,16 +125,10 @@ src_install() {
 		insinto /usr/share/doc/${PF}/test-services
 		doins service-*
 
+		python_convert_shebangs -r 2 "${ED}"
 		cd "${S}"
 	fi
 
-	if use old-daemons; then
-		newconfd "${FILESDIR}/conf.d-hidd" hidd
-		newinitd "${FILESDIR}/init.d-hidd" hidd
-		newconfd "${FILESDIR}/conf.d-dund" dund
-		newinitd "${FILESDIR}/init.d-dund" dund
-	fi
-
 	insinto /etc/bluetooth
 	doins \
 		input/input.conf \
@@ -133,19 +136,15 @@ src_install() {
 		network/network.conf \
 		serial/serial.conf
 
-	insinto /lib/udev/rules.d/
-	newins "${FILESDIR}/${PN}-4.18-udev.rules" 70-bluetooth.rules
-	exeinto /lib/udev/
-	newexe "${FILESDIR}/${PN}-4.18-udev.script" bluetooth.sh
-
-	newinitd "${FILESDIR}/bluetooth-init.d" bluetooth
-	newconfd "${FILESDIR}/bluetooth-conf.d" bluetooth
+	newinitd "${FILESDIR}/bluetooth-init.d-r1" bluetooth
+	newinitd "${FILESDIR}/rfcomm-init.d" rfcomm
+	newconfd "${FILESDIR}/rfcomm-conf.d" rfcomm
 
 	# Install oui.txt as requested in bug #283791 and approved by upstream
 	insinto /var/lib/misc
 	newins "${WORKDIR}/oui-${OUIDATE}.txt" oui.txt
 
-	find "${ED}" -name "*.la" -delete
+	prune_libtool_files --all
 }
 
 pkg_postinst() {
@@ -155,14 +154,6 @@ pkg_postinst() {
 		elog "To use dial up networking you must install net-dialup/ppp."
 	fi
 
-	if use old-daemons; then
-		elog "dund and hidd init scripts were installed because you have the old-daemons"
-		elog "use flag on. They are not started by default via udev so please add them"
-		elog "to the required runlevels using rc-update <runlevel> add <dund/hidd>. If"
-		elog "you need init scripts for the other daemons, please file requests"
-		elog "to https://bugs.gentoo.org."
-	fi
-
 	if use consolekit; then
 		elog "If you want to use rfcomm as a normal user, you need to add the user"
 		elog "to the uucp group."
@@ -172,4 +163,11 @@ pkg_postinst() {
 		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
+
+	if [ "$(rc-config list default | grep bluetooth)" = "" ] ; then
+		elog "You will need to add bluetooth service to default runlevel"
+		elog "for getting your devices detected from startup without needing"
+		elog "to reconnect them. For that please run:"
+		elog "'rc-update add bluetooth default'"
+	fi
 }
diff --git a/net-wireless/bluez/metadata.xml b/net-wireless/bluez/metadata.xml
index 71aa61a77f79..9e63bbd3aa0d 100644
--- a/net-wireless/bluez/metadata.xml
+++ b/net-wireless/bluez/metadata.xml
@@ -17,11 +17,6 @@
 		<flag name='consolekit'>Use <pkg>sys-auth/pambase[consolekit]</pkg> to
 			determine access to bluetooth devices based on whether a user is
 			logged in locally or remotely</flag>
-		<flag name='health'>Compile with initial support for HDP</flag>
-		<flag name='maemo6'>Compile with maemo6 plugin</flag>
-		<flag name='old-daemons'>Install old daemons like hidd and sdpd that are
-			deprecated by the new Service framework</flag>
-		<flag name='pnat'>Enable pnat plugin</flag>
 		<flag name='test-programs'>Install tools for testing of
 			various Bluetooth functions</flag>
 	</use>