Use cups-config to decide where to install the backend. Fixes bug #180527.

Package-Manager: portage-2.1.2.7

5 files changed, 194 insertions, 8 deletions

diff --git a/net-wireless/bluez-utils/ChangeLog b/net-wireless/bluez-utils/ChangeLog
index 33b3a9d38c72..ede0b089c971 100644
--- a/net-wireless/bluez-utils/ChangeLog
+++ b/net-wireless/bluez-utils/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-wireless/bluez-utils
 # Copyright 2002-2007 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez-utils/ChangeLog,v 1.96 2007/05/24 16:59:00 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez-utils/ChangeLog,v 1.97 2007/06/01 17:36:27 betelgeuse Exp $
+
+*bluez-utils-3.11-r1 (01 Jun 2007)
+
+  01 Jun 2007; Petteri Räty <betelgeuse@gentoo.org>
+  +files/3.11/cups-location.patch, +bluez-utils-3.11-r1.ebuild:
+  Use cups-config to decide where to install the backend. Fixes bug #180527.
 
   24 May 2007; Petteri Räty <betelgeuse@gentoo.org> files/3.11/init.d-hidd:
   Use qgrep -q instead of directing to /dev/null at the request of drizztbsd.
diff --git a/net-wireless/bluez-utils/Manifest b/net-wireless/bluez-utils/Manifest
index c3f7bd6da921..cf7ea8837395 100644
--- a/net-wireless/bluez-utils/Manifest
+++ b/net-wireless/bluez-utils/Manifest
@@ -5,6 +5,10 @@ AUX 3.11/conf.d-hidd 89 RMD160 31407e00bcb00eb0b9c1adeb7434a922bfb967e9 SHA1 dc6
 MD5 b982f0cbd7bcae0d52779a41338ad0e4 files/3.11/conf.d-hidd 89
 RMD160 31407e00bcb00eb0b9c1adeb7434a922bfb967e9 files/3.11/conf.d-hidd 89
 SHA256 8fc50b8c644e0bc69eacef2a9555118b2f4758aafcb42e8ea3ca1293e8f3a211 files/3.11/conf.d-hidd 89
+AUX 3.11/cups-location.patch 480 RMD160 3da74418b140c2ea05d2c9e0d743eaf004deba5d SHA1 3605b1633c92b2b7eefc7e6b78e98df3e12088a8 SHA256 cede5fed7e4ece7cf4977d40e7fd8f9a22200660b06cca15d39c9c40542ab33d
+MD5 cb251654cb6f9169b4a427601e33b3ff files/3.11/cups-location.patch 480
+RMD160 3da74418b140c2ea05d2c9e0d743eaf004deba5d files/3.11/cups-location.patch 480
+SHA256 cede5fed7e4ece7cf4977d40e7fd8f9a22200660b06cca15d39c9c40542ab33d files/3.11/cups-location.patch 480
 AUX 3.11/init.d-hidd 787 RMD160 cddb020723df70d359742d353036f8b2d25315da SHA1 de3ee8a87f08cc7d7a0bb92176d7cecc5b34f8e0 SHA256 1ddd5cb72d83f6581ac8baf78cec9c8fe2f31a4f8949314c526cb3ef9bc22ab0
 MD5 cae26eac04544dbf491654d0816d4fcf files/3.11/init.d-hidd 787
 RMD160 cddb020723df70d359742d353036f8b2d25315da files/3.11/init.d-hidd 787
@@ -73,14 +77,18 @@ EBUILD bluez-utils-3.10.1-r1.ebuild 3640 RMD160 a985d3f803c7e7f7268eae65670f77f4
 MD5 488a5f46c3c4c68ea63e547329f9c952 bluez-utils-3.10.1-r1.ebuild 3640
 RMD160 a985d3f803c7e7f7268eae65670f77f49da8a4ce bluez-utils-3.10.1-r1.ebuild 3640
 SHA256 823d4d14354e055fe6221adb6c3f6d5e0f5f8e062e6aae1e9519684c936d511a bluez-utils-3.10.1-r1.ebuild 3640
+EBUILD bluez-utils-3.11-r1.ebuild 4488 RMD160 99e532f9f76e93069f5151efbb126b45f0107988 SHA1 b8f42da7d15b7cb45dff849ac01268f9b8ef3322 SHA256 da171ff242c23d2de61362cb41083f09d7d21efac4adf88d4a69cd972ff626c5
+MD5 db84c227ea5afc3573833218bf04c716 bluez-utils-3.11-r1.ebuild 4488
+RMD160 99e532f9f76e93069f5151efbb126b45f0107988 bluez-utils-3.11-r1.ebuild 4488
+SHA256 da171ff242c23d2de61362cb41083f09d7d21efac4adf88d4a69cd972ff626c5 bluez-utils-3.11-r1.ebuild 4488
 EBUILD bluez-utils-3.11.ebuild 4390 RMD160 f512bc825bd33083997808851fae345310c445c0 SHA1 ce5f924b40cf0b128ccca9a05f88f8bf7b081301 SHA256 edb2e13a425b079e8d1796c65a0e101efc4822cc2391268fe0f71cea4e306c74
 MD5 450384c3120d4c7ba30c724d15273487 bluez-utils-3.11.ebuild 4390
 RMD160 f512bc825bd33083997808851fae345310c445c0 bluez-utils-3.11.ebuild 4390
 SHA256 edb2e13a425b079e8d1796c65a0e101efc4822cc2391268fe0f71cea4e306c74 bluez-utils-3.11.ebuild 4390
-MISC ChangeLog 16522 RMD160 4162393853bbdd137524a2586a292103d340bda1 SHA1 6f955bb12c244de43b54b4515ab68ec435e84b3b SHA256 03f252d97a87a9dee07444947abdd39c3338c7b978090de80c64bf56c55aa4b4
-MD5 5d9780fac05dda208406e6d65c7f23fb ChangeLog 16522
-RMD160 4162393853bbdd137524a2586a292103d340bda1 ChangeLog 16522
-SHA256 03f252d97a87a9dee07444947abdd39c3338c7b978090de80c64bf56c55aa4b4 ChangeLog 16522
+MISC ChangeLog 16753 RMD160 bdfb6972d7997c56e7dbcaf6174282f54b3bc648 SHA1 d8793769ec42d845897ea3b0480fbefc46ddd5c4 SHA256 8225f46b19fb0e9080fb106c66430eac870bd3afefad2a5541a5e6a1b28037fd
+MD5 c80f54bf372d48a8acc0432b0433c8fb ChangeLog 16753
+RMD160 bdfb6972d7997c56e7dbcaf6174282f54b3bc648 ChangeLog 16753
+SHA256 8225f46b19fb0e9080fb106c66430eac870bd3afefad2a5541a5e6a1b28037fd ChangeLog 16753
 MISC metadata.xml 379 RMD160 b6c255069f62314f5f4452ad4a893baff8304efd SHA1 243ba54e82b478d5941198402cbaa00badd656d9 SHA256 a104a4d733fb797bc867c3c92090dc716305795aa09441a6b7a4b442ff52e669
 MD5 b996228cd1649e0bf48029de7d85ea6d metadata.xml 379
 RMD160 b6c255069f62314f5f4452ad4a893baff8304efd metadata.xml 379
@@ -97,10 +105,13 @@ SHA256 c0d22b7a4b6f1b143493afa595235f9fe3af627bd3309049376d2f33bd6b05d4 files/di
 MD5 fa37849bea8038575ca22cdcb981a24b files/digest-bluez-utils-3.11 250
 RMD160 cd6eb3862412d047c9c0e6e9b95a8bbf1be48265 files/digest-bluez-utils-3.11 250
 SHA256 08578e99cb4138a6823f7c88a1d542326e0ca6868163379c2163177469c92be1 files/digest-bluez-utils-3.11 250
+MD5 fa37849bea8038575ca22cdcb981a24b files/digest-bluez-utils-3.11-r1 250
+RMD160 cd6eb3862412d047c9c0e6e9b95a8bbf1be48265 files/digest-bluez-utils-3.11-r1 250
+SHA256 08578e99cb4138a6823f7c88a1d542326e0ca6868163379c2163177469c92be1 files/digest-bluez-utils-3.11-r1 250
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.4 (GNU/Linux)
 
-iD8DBQFGVcRZcxLzpIGCsLQRAsvhAJ9e9xbgdfLpf/k6p69Li9IL7JlKmACfUJAY
-ljKYruncS30bADHrA31cKg4=
-=1zSg
+iD8DBQFGYFkgcxLzpIGCsLQRAvE2AJ4gDzQ8mekHlFI5JDZuhcD580DSsACZAf3P
+6qLM00nut7tNVKYKxh83zFA=
+=pnhp
 -----END PGP SIGNATURE-----
diff --git a/net-wireless/bluez-utils/bluez-utils-3.11-r1.ebuild b/net-wireless/bluez-utils/bluez-utils-3.11-r1.ebuild
new file mode 100644
index 000000000000..89897da224da
--- /dev/null
+++ b/net-wireless/bluez-utils/bluez-utils-3.11-r1.ebuild
@@ -0,0 +1,148 @@
+# Copyright 1999-2007 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez-utils/bluez-utils-3.11-r1.ebuild,v 1.1 2007/06/01 17:36:27 betelgeuse Exp $
+
+inherit autotools eutils
+
+DESCRIPTION="Bluetooth Tools and System Daemons for Linux"
+HOMEPAGE="http://bluez.sourceforge.net/"
+SRC_URI="http://bluez.sourceforge.net/download/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~sparc ~x86"
+
+IUSE="cups debug examples hal old-daemons test-programs usb"
+
+DEPEND="
+	>=net-wireless/bluez-libs-${PV}
+	hal? ( sys-apps/hal )
+	usb? ( dev-libs/libusb )
+	cups? ( net-print/cups )
+	sys-fs/udev
+	dev-libs/glib
+	sys-apps/dbus"
+
+src_unpack() {
+	unpack ${A}
+	# bundled glib
+	cd "${S}"
+	rm -r eglib/{*.c,*.h}  || die
+	if use cups; then
+		epatch "${FILESDIR}/3.11/cups-location.patch"
+		eautoreconf
+	fi
+}
+
+src_compile() {
+	# the order is the same as ./configure --help
+
+	# we don't need the other daemons either with the new
+	# service architechture
+	# hcid has in integrated sdpd now that we use
+
+	# These are currently under work and don't work properly:
+	# --enable-alsa
+	# --enable-sync
+	# --enable-obex
+	# Only for embedded devices
+	# --enable-audio
+
+	econf \
+		$(use_enable debug) \
+		--enable-inotify \
+		$(use_enable hal) \
+		$(use_enable usb) \
+		--enable-glib  \
+		--disable-obex \
+		--disable-alsa \
+		--enable-network \
+		--enable-serial \
+		--enable-input \
+		--disable-audio \
+		--disable-sync \
+		$(use_enable examples echo) \
+		--enable-hcid \
+		$(use_enable test-programs test) \
+		$(use_enable old-daemons sdpd) \
+		$(use_enable old-daemons hidd) \
+		$(use_enable old-daemons pand) \
+		$(use_enable cups) \
+		--enable-configfiles \
+		--disable-initscripts \
+		--disable-pcmciarules \
+		--enable-bccmd \
+		--enable-avctrl \
+		--enable-hid2hci \
+		--enable-dfutool \
+		--localstatedir=/var \
+		|| die "econf failed"
+
+	emake || die "emake failed"
+}
+
+src_install() {
+	make DESTDIR="${D}" install || die "make install failed"
+
+	dodoc AUTHORS ChangeLog README || die
+
+	# a very simple example daemon
+	dobin daemon/passkey-agent || die
+
+	newinitd "${FILESDIR}/${PN}-3.10.1-init.d" bluetooth || die
+	newconfd "${S}/scripts/bluetooth.default" bluetooth || die
+
+	if use old-daemons; then
+		sed -re 's/^(Autostart=)true/\1false/' \
+			-i "${D}/etc/bluetooth/input.service" || die
+		newconfd "${FILESDIR}/3.11/conf.d-hidd" hidd || die
+		newinitd "${FILESDIR}/3.11/init.d-hidd" hidd || die
+	fi
+
+	# bug #84431
+	insinto /etc/udev/rules.d/
+	newins "${FILESDIR}/${PN}-3.10.1-udev.rules" 70-bluetooth.rules || die
+	newins "${S}/scripts/bluetooth.rules" 70-bluetooth-pcmcia.rules || die
+
+	exeinto /lib/udev/
+	newexe "${FILESDIR}/${PN}-3.10.1-udev.script" bluetooth.sh || die
+	doexe  "${S}/scripts/bluetooth_serial" || die
+}
+
+pkg_postinst() {
+	udevcontrol reload_rules && udevtrigger
+
+	elog
+	elog "To use dial up networking you must install net-dialup/ppp."
+	elog ""
+	elog "Since 3.0 bluez has changed the passkey handling to use a dbus based"
+	elog "API so please remember to update your /etc/bluetooth/hcid.conf."
+	elog "For a password agent, there is for example net-wireless/bluez-gnome"
+	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 "	http://wiki.bluez.org/wiki/Services"
+	elog ""
+	elog "Edit /etc/bluetooth/*.service to enable the services."
+	elog "Use the old-daemons use flag to get the old daemons like hidd"
+	elog "installed. Please note that the init script doesn't stop the old"
+	elog "daemons after you update it so it's recommended to run:"
+	elog "  /etc/init.d/bluetooth stop"
+	elog "before updating your configuration files or you can manually kill"
+	elog "the extra daemons you previously enabled in /etc/conf.d/bluetooth."
+	elog ""
+	elog "If you want to use rfcomm as a normal user, you need to add the user"
+	elog "to the uucp group."
+	elog ""
+	if use old-daemons; then
+		elog "The hidd init script was installed because you have the old-daemons"
+		elog "use flag on. It is not started by default via udev so please add it"
+		elog "to the required runleves using rc-update <runlevel> add hidd. If"
+		elog "you need init scripts for the other daemons, please file requests"
+		elog "to https://bugs.gentoo.org."
+	else
+		elog "The bluetooth service should be started automatically by udev"
+		elog "when the required hardware is inserted next time."
+	fi
+}
diff --git a/net-wireless/bluez-utils/files/3.11/cups-location.patch b/net-wireless/bluez-utils/files/3.11/cups-location.patch
new file mode 100644
index 000000000000..e0ddc020062b
--- /dev/null
+++ b/net-wireless/bluez-utils/files/3.11/cups-location.patch
@@ -0,0 +1,18 @@
+? cups/.deps
+? cups/Makefile
+? cups/Makefile.in
+Index: cups/Makefile.am
+===================================================================
+RCS file: /cvsroot/bluez/utils/cups/Makefile.am,v
+retrieving revision 1.9
+diff -u -r1.9 Makefile.am
+--- cups/Makefile.am	20 Aug 2006 02:21:03 -0000	1.9
++++ cups/Makefile.am	1 Jun 2007 15:47:14 -0000
+@@ -1,6 +1,6 @@
+ 
+ if CUPS
+-cupsdir = $(libdir)/cups/backend
++cupsdir = `cups-config --serverbin`/backend
+ 
+ cups_PROGRAMS = bluetooth
+ else
diff --git a/net-wireless/bluez-utils/files/digest-bluez-utils-3.11-r1 b/net-wireless/bluez-utils/files/digest-bluez-utils-3.11-r1
new file mode 100644
index 000000000000..92e7c6768bde
--- /dev/null
+++ b/net-wireless/bluez-utils/files/digest-bluez-utils-3.11-r1
@@ -0,0 +1,3 @@
+MD5 703fed8e09e25b5e1f01be337576e343 bluez-utils-3.11.tar.gz 810657
+RMD160 0960cd1d76f29df383397ba33e0bf52648cf393b bluez-utils-3.11.tar.gz 810657
+SHA256 6f442988bf11d8066ee1ed416acea04ed4be764ab3189780bd2148536e9d76d8 bluez-utils-3.11.tar.gz 810657