Order the dependencies alphabetically. Sort old-daemons elog informations. Drop info about them being disabled (no bluez3 around for long time already). Drop elog check for gnome/kde gui as both desktop environments handle bluetooth properly themselves.

Package-Manager: portage-2.2.0_alpha30/cvs/Linux x86_64

3 files changed, 44 insertions, 48 deletions

diff --git a/net-wireless/bluez/ChangeLog b/net-wireless/bluez/ChangeLog
index 58c7a88b8100..476e15e2fea6 100644
--- a/net-wireless/bluez/ChangeLog
+++ b/net-wireless/bluez/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-wireless/bluez
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez/ChangeLog,v 1.82 2011/03/30 09:49:26 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez/ChangeLog,v 1.83 2011/04/28 20:58:08 scarabeus Exp $
+
+  28 Apr 2011; Tomáš Chvátal <scarabeus@gentoo.org> bluez-4.91.ebuild:
+  Order the dependencies alphabetically. Sort old-daemons elog informations.
+  Drop info about them being disabled (no bluez3 around for long time already).
+  Drop elog check for gnome/kde gui as both desktop environments handle
+  bluetooth properly themselves.
 
 *bluez-4.91 (30 Mar 2011)
 
diff --git a/net-wireless/bluez/Manifest b/net-wireless/bluez/Manifest
index 392004710278..3783b9ddc1f0 100644
--- a/net-wireless/bluez/Manifest
+++ b/net-wireless/bluez/Manifest
@@ -29,13 +29,13 @@ DIST oui-20110330.txt 2372550 RMD160 bbab368201d98335c3bd3857df2be85f6a3ba5cd SH
 EBUILD bluez-4.87.ebuild 5642 RMD160 a1da5c51be06ad13e38882f8ef0743c625039141 SHA1 f75a250518751965b12a4f74b70a611bce2b6e85 SHA256 27e24d62f1521a4bff9e23664cd48eb20cd1be16f64bda879b27d008b65cb767
 EBUILD bluez-4.89.ebuild 5644 RMD160 62bef8ac263b56ecdb8ed80c052242e97f5aaa70 SHA1 4020718cfcd6d9f22cc2dba5489ce8c71ef8ee3c SHA256 a3ed2181b70e1ae75af72b1e7d1859f593ac1ebd6648fa982f1c4fb392580163
 EBUILD bluez-4.90.ebuild 5529 RMD160 fdf825a35b8eadb34a97eda892b0fe27a73fc747 SHA1 944b3e8a310ea94d61f06a0b9abfc0e22295620e SHA256 18fec92a4e651e7ffbdd5644fa19c7cf1ae8491aa3efe65bedb12270eb52139c
-EBUILD bluez-4.91.ebuild 5529 RMD160 fc04efa16e22057ac680710fc340355b35a71df2 SHA1 d57d09fe2a8946de63030e5aea42437cb5e6fd48 SHA256 03ff0a95ce8a10a71dfdfdecd6960de3402174961e90c7d3af0213bd66996a6f
-MISC ChangeLog 15677 RMD160 99b8ba2ef98318daf0aa01c98541a43f9e4c111a SHA1 33b17c9c1272e2a62b2c6d816fb4821a9c8851af SHA256 db0ab7d8d9ce19e786aa96c448ffeae9bff3822b4c8a377242537638cb42f52d
+EBUILD bluez-4.91.ebuild 4849 RMD160 c0af6e6354159c2b94b3e35ef861d34dae9ecec6 SHA1 8cb91de2f085c1a75c1523cc3523aec9a9e08f6e SHA256 796fb8867bc56a3e37910a5b1ddbf44ec4649ed4c09b4c00aaeb711433c10728
+MISC ChangeLog 16018 RMD160 f474f465905f9dad06f465de3f6d1e429644493b SHA1 8c805406d2d3dfd47f2d719dfa1a9b4ad0676ebb SHA256 9566147343d2b3302f8d4419b03a1f4a190bef20142ecb629c181196e0c723a7
 MISC metadata.xml 1052 RMD160 5df0b0075716e5e6aee6ebcb4b734c61ca4e372e SHA1 9b13c6123b253d99e742c8a1e9be5ed50b430c80 SHA256 7006466957d5bb3c892604d1e76093d1ee2ba9fc85ebe6459f643138af174c5c
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk2S/KwACgkQCaWpQKGI+9RWPgCeNIrHiE3s+8pN+adoN9FNPy+r
-QMkAnjHpCjOl9v5zdT49Rfqx9YVwtUh1
-=fmpQ
+iEYEARECAAYFAk251LAACgkQHB6c3gNBRYcdBwCguCd2576lLOI0PVCh5aICFzjB
+qHwAn22nyJa3pHjbk5jsPqZQSv5I0g4F
+=nsAJ
 -----END PGP SIGNATURE-----
diff --git a/net-wireless/bluez/bluez-4.91.ebuild b/net-wireless/bluez/bluez-4.91.ebuild
index 2884822199f0..979ae4783c7f 100644
--- a/net-wireless/bluez/bluez-4.91.ebuild
+++ b/net-wireless/bluez/bluez-4.91.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez/bluez-4.91.ebuild,v 1.1 2011/03/30 09:49:26 pacho Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez/bluez-4.91.ebuild,v 1.2 2011/04/28 20:58:08 scarabeus Exp $
 
 EAPI="4"
 
@@ -12,7 +12,7 @@ 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="20110330" # Needed because of bug #345263
+OUIDATE="20110330"
 SRC_URI="mirror://kernel/linux/bluetooth/${P}.tar.gz
 	http://dev.gentoo.org/~pacho/bluez/oui-${OUIDATE}.txt"
 LICENSE="GPL-2 LGPL-2.1"
@@ -21,29 +21,37 @@ KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
 
 IUSE="alsa attrib caps +consolekit cups debug gstreamer maemo6 health old-daemons pcmcia pnat test-programs usb"
 
-CDEPEND="alsa? (
+CDEPEND="
+	>=dev-libs/glib-2.14:2
+	media-libs/libsndfile
+	sys-apps/dbus
+	>=sys-fs/udev-146[extras]
+	alsa? (
 		media-libs/alsa-lib[alsa_pcm_plugins_extplug,alsa_pcm_plugins_ioplug]
 	)
 	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 )
+		>=media-libs/gst-plugins-base-0.10:0.10
+	)
 	usb? ( dev-libs/libusb:1 )
-	cups? ( net-print/cups )
-	>=sys-fs/udev-146[extras]
-	>=dev-libs/glib-2.14:2
-	sys-apps/dbus
-	media-libs/libsndfile
-	!net-wireless/bluez-libs
-	!net-wireless/bluez-utils"
-DEPEND="sys-devel/flex
+"
+DEPEND="${CDEPEND}
 	>=dev-util/pkgconfig-0.20
-	${CDEPEND}"
+	sys-devel/flex
+"
 RDEPEND="${CDEPEND}
+	!net-wireless/bluez-libs
+	!net-wireless/bluez-utils
 	consolekit? ( sys-auth/consolekit )
 	test-programs? (
 		dev-python/dbus-python
-		dev-python/pygobject:2 )"
+		dev-python/pygobject:2
+	)
+"
+
+DOCS=( AUTHORS ChangeLog README )
 
 pkg_setup() {
 	if ! use consolekit; then
@@ -58,7 +66,8 @@ src_prepare() {
 	fi
 
 	if use cups; then
-		sed -i -e "s:cupsdir = \$(libdir)/cups:cupsdir = `cups-config --serverbin`:" \
+		sed -i \
+			-e "s:cupsdir = \$(libdir)/cups:cupsdir = `cups-config --serverbin`:" \
 			Makefile.tools Makefile.in || die
 	fi
 }
@@ -95,8 +104,7 @@ src_configure() {
 }
 
 src_install() {
-	emake DESTDIR="${D}" install
-	dodoc AUTHORS ChangeLog README
+	default
 
 	if use test-programs ; then
 		cd "${S}/test"
@@ -138,49 +146,31 @@ src_install() {
 	insinto /var/lib/misc
 	newins "${DISTDIR}/oui-${OUIDATE}.txt" oui.txt
 
-	find "${ED}" -name "*.la" -delete || die "remove of la files failed"
+	find "${ED}" -name "*.la" -delete
 }
 
 pkg_postinst() {
 	udevadm control --reload-rules && udevadm trigger --subsystem-match=bluetooth
 
 	if ! has_version "net-dialup/ppp"; then
-		elog
 		elog "To use dial up networking you must install net-dialup/ppp."
 	fi
 
-	if ! has_version "net-wireless/gnome-bluetooth" && ! has_version "net-wireless/kbluetooth"; then
-		elog
-		elog "For desktop integration you can try net-wireless/gnome-bluetooth"
-		elog "for gnome and net-wireless/kbluetooth for kde."
-	fi
-
-	if ! use old-daemons; then
-		elog
-		elog "Use the old-daemons use flag to get the old daemons like hidd or pand"
-		elog "installed. Please note that 'bluetooth' init script doesn't stop the old"
-		elog "daemons after you update it, so it's recommended to stop all of them using"
-		elog "their own init scripts or manually killing them."
+	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
 		elog "If you want to use rfcomm as a normal user, you need to add the user"
 		elog "to the uucp group."
 	else
-		elog
 		elog "Since you have the consolekit use flag disabled, you will only be able to run"
 		elog "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
-
-	if use old-daemons; then
-		elog
-		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
 }