--- /usr/portage/net-wireless/bluez/bluez-4.19.ebuild	2008-11-28 22:21:35.000000000 +0100
+++ /usr/portage/net-wireless/bluez/bluez-4.19.ebuild	2008-12-01 21:19:03.000000000 +0100
@@ -5,13 +5,14 @@ 
 inherit autotools multilib eutils
 
 DESCRIPTION="Bluetooth Tools and System Daemons for Linux"
-HOMEPAGE="http://bluez.sourceforge.net/"
+HOMEPAGE="http://www.bluez.org/"
 SRC_URI="mirror://kernel/linux/bluetooth/${P}.tar.gz"
 LICENSE="GPL-2 LGPL-2.1"
+
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sh ~sparc ~x86"
 
-IUSE="alsa cups debug doc examples gstreamer old-daemons test-programs usb"
+IUSE="alsa cups debug doc gstreamer old-daemons test-programs usb"
 
 RDEPEND="alsa? ( media-libs/alsa-lib )
 	gstreamer? (
@@ -19,12 +20,13 @@ 
 		>=media-libs/gst-plugins-base-0.10 )
 	usb? ( dev-libs/libusb )
 	cups? ( net-print/cups )
-	sys-fs/udev
-	dev-libs/glib
+	=dev-libs/glib-2*
+	>=dev-libs/libnl-1.1
 	sys-apps/dbus
+	sys-fs/udev
 	!net-wireless/bluez-libs
 	!net-wireless/bluez-utils"
-DEPEND="!<dev-libs/libnl-1.1
+DEPEND="sys-devel/bison
 	sys-devel/flex
 	dev-util/pkgconfig
 	doc? ( dev-util/gtk-doc )
@@ -42,17 +44,14 @@ 
 
 src_compile() {
 	# the order is the same as ./configure --help
-
 	# we don't need the other daemons either with the new
-	# service architechture
-
+	# service architecture
 	econf \
 		$(use_enable doc gtk-doc) \
 		--enable-network \
 		--enable-serial \
 		--enable-input \
 		--enable-audio \
-		--enable-service \
 		$(use_enable gstreamer) \
 		$(use_enable alsa) \
 		$(use_enable usb) \
@@ -77,18 +76,10 @@ 
 }
 
 src_install() {
-	emake DESTDIR="${D}" install || die "make install failed"
+	emake DESTDIR="${D}" install || die "emake install failed"
 
 	dodoc AUTHORS ChangeLog README || die
 
-	if use test-programs ; then
-		dobin input/test-input || die
-
-		# a very simple example daemon
-		dobin test/passkey-agent || die
-		dobin test/auth-agent || die
-	fi
-
 	newinitd "${FILESDIR}/4.18/bluetooth-init.d" bluetooth || die
 	newconfd "${FILESDIR}/4.18/bluetooth-conf.d" bluetooth || die
 
@@ -107,10 +98,10 @@ 
 	doexe  "${S}/scripts/bluetooth_serial" || die
 
 	insinto /etc/bluetooth
-	doins \
-		input/input.conf \
-		audio/audio.conf \
-		network/network.conf
+	local svc=
+	for svc in audio input network; do
+		doins "${S}"/${svc}/${svc}.conf
+	done
 }
 
 pkg_postinst() {
@@ -125,7 +116,7 @@ 
 	elog "for gnome and net-wireless/kdebluetooth for kde."
 	elog ""
 	elog "Since 3.10.1 we don't install the old style daemons any more but rely"
-	elog "on the new service architechture:"
+	elog "on the new service architecture:"
 	elog "	http://wiki.bluez.org/wiki/Services"
 	elog ""
 	elog "3.15 adds support for the audio service. See"