fix localstatedir to point to /var/lib/bluetooth rather than /var/lib/lib/bluetooth (#95990)

Package-Manager: portage-2.0.51.22-r1

5 files changed, 145 insertions, 19 deletions

diff --git a/net-wireless/bluez-utils/ChangeLog b/net-wireless/bluez-utils/ChangeLog
index 9b95cde5e2c2..55c5bd24e166 100644
--- a/net-wireless/bluez-utils/ChangeLog
+++ b/net-wireless/bluez-utils/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for net-wireless/bluez-utils
 # Copyright 2002-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez-utils/ChangeLog,v 1.45 2005/06/17 20:35:38 hansmi Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez-utils/ChangeLog,v 1.46 2005/06/24 16:18:45 liquidx Exp $
+
+*bluez-utils-2.17-r1 (24 Jun 2005)
+
+  24 Jun 2005; Alastair Tse <liquidx@gentoo.org> bluez-utils-2.17.ebuild,
+  +bluez-utils-2.17-r1.ebuild:
+  fix localstatedir to point to /var/lib/bluetooth rather than
+  /var/lib/lib/bluetooth (#95990)
 
   17 Jun 2005; Michael Hanselmann <hansmi@gentoo.org>
   bluez-utils-2.16-r1.ebuild:
diff --git a/net-wireless/bluez-utils/Manifest b/net-wireless/bluez-utils/Manifest
index d63bc00917de..ee2323c3766c 100644
--- a/net-wireless/bluez-utils/Manifest
+++ b/net-wireless/bluez-utils/Manifest
@@ -1,25 +1,37 @@
-MD5 946214b26fff463e76269c42340b77d2 bluez-utils-2.16.ebuild 2683
-MD5 439de383d422683abddb9ff8b75aa67b metadata.xml 235
-MD5 8956170e0d15f46fb0885c977f11126f bluez-utils-2.15.ebuild 2482
-MD5 e55d2d905e858aeaa60992b54811684c ChangeLog 7089
-MD5 686bd5e9d884c3eb340b11c14ddfe429 bluez-utils-2.17.ebuild 2683
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+MD5 4844904c9d4ecddc2d6ead7134184029 ChangeLog 7329
 MD5 b049b8c4d26d949b96515f79c805084c bluez-utils-2.10-r1.ebuild 2591
-MD5 5fb15e85a2a314a3177e67893e720933 bluez-utils-2.16-r1.ebuild 2682
 MD5 4da0ad67818e730edd5337a4a16c899a bluez-utils-2.12.ebuild 2189
-MD5 4a3141759c84210a8e1303a9d6f11b43 files/digest-bluez-utils-2.16-r1 68
-MD5 461e23b79c054101bd79fdb85755a864 files/digest-bluez-utils-2.12 68
-MD5 2fcf0c81d0479f85cb7244f2b1900c6d files/bluez-utils-2.10-handsfree.patch 540
-MD5 7274187d952212ca6469a2306efb0d42 files/2.15-bluepin.patch 355
+MD5 8956170e0d15f46fb0885c977f11126f bluez-utils-2.15.ebuild 2482
+MD5 439de383d422683abddb9ff8b75aa67b metadata.xml 235
+MD5 946214b26fff463e76269c42340b77d2 bluez-utils-2.16.ebuild 2683
+MD5 5fb15e85a2a314a3177e67893e720933 bluez-utils-2.16-r1.ebuild 2682
+MD5 8a1167d67abaa7f3995c906b2067109a bluez-utils-2.17.ebuild 2710
+MD5 a279b7bed88f4122288be86400970221 bluez-utils-2.17-r1.ebuild 2713
 MD5 44ca243c60a83967c811537a38b92549 files/bluetooth.rc 1166
-MD5 7b0985abd13b5bbc75fe58e206372a65 files/digest-bluez-utils-2.15 68
+MD5 2fcf0c81d0479f85cb7244f2b1900c6d files/bluez-utils-2.10-handsfree.patch 540
+MD5 d552cb6515bf251c019ca4a95dd266eb files/bluez-utils-2.3-bluepin-gtk2.patch 3295
+MD5 336de3d1eba238735777d7d8f8e0c282 files/bluez-utils-2.3-bluepin.patch 461
+MD5 ce3b08e1df53875d1060e9e246810907 files/bluez-utils-2.3-rfcomm_fflush.patch 966
 MD5 06aa410f5fe0f8459273a2bcda7db8cc files/digest-bluez-utils-2.10-r1 68
+MD5 461e23b79c054101bd79fdb85755a864 files/digest-bluez-utils-2.12 68
+MD5 7b0985abd13b5bbc75fe58e206372a65 files/digest-bluez-utils-2.15 68
 MD5 7449a658ef08ac7e86b221b3c43961af files/pin.sample 26
-MD5 d552cb6515bf251c019ca4a95dd266eb files/bluez-utils-2.3-bluepin-gtk2.patch 3295
 MD5 4a3141759c84210a8e1303a9d6f11b43 files/digest-bluez-utils-2.16 68
+MD5 7274187d952212ca6469a2306efb0d42 files/2.15-bluepin.patch 355
+MD5 4a3141759c84210a8e1303a9d6f11b43 files/digest-bluez-utils-2.16-r1 68
 MD5 7316e8b8851edb4c09b59e386d6b16fb files/digest-bluez-utils-2.17 68
-MD5 ce3b08e1df53875d1060e9e246810907 files/bluez-utils-2.3-rfcomm_fflush.patch 966
-MD5 336de3d1eba238735777d7d8f8e0c282 files/bluez-utils-2.3-bluepin.patch 461
-MD5 992426019dbbd772c9326512d2a0033d files/2.10-r1/pin-helper.sh 49
-MD5 e7df7cd2ca07f4f1ab415d457a6e1c13 files/2.10-r1/pin 5
+MD5 7316e8b8851edb4c09b59e386d6b16fb files/digest-bluez-utils-2.17-r1 68
 MD5 cba196ec0ce8e3622a29f93b030ed027 files/2.10-r1/bluetooth.rc 3340
+MD5 e7df7cd2ca07f4f1ab415d457a6e1c13 files/2.10-r1/pin 5
+MD5 992426019dbbd772c9326512d2a0033d files/2.10-r1/pin-helper.sh 49
 MD5 8640fa9eafee8ea600121af7792b7ad9 files/2.16/bluetooth.rc 3396
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v1.4.1 (GNU/Linux)
+
+iD8DBQFCvDKaTM53OX+9xmMRAqhGAKDMAKpS7A2LPuHDuZrj4cgMOG8YVwCgg/mA
+YN/pKm0sWGKFCzsHMWeXLls=
+=f723
+-----END PGP SIGNATURE-----
diff --git a/net-wireless/bluez-utils/bluez-utils-2.17-r1.ebuild b/net-wireless/bluez-utils/bluez-utils-2.17-r1.ebuild
new file mode 100644
index 000000000000..03774a5706d3
--- /dev/null
+++ b/net-wireless/bluez-utils/bluez-utils-2.17-r1.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2005 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez-utils/bluez-utils-2.17-r1.ebuild,v 1.1 2005/06/24 16:18:45 liquidx Exp $
+
+IUSE="gtk alsa cups pcmcia dbus"
+
+inherit eutils
+
+DESCRIPTION="Bluetooth Tools and System Daemons for using Bluetooth under Linux"
+HOMEPAGE="http://bluez.sourceforge.net/"
+SRC_URI="http://bluez.sourceforge.net/download/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+
+RDEPEND=">=net-wireless/bluez-libs-2.17
+	!net-wireless/bluez-pan
+	dev-libs/libusb
+	gtk? ( >=dev-python/pygtk-2.2 )
+	alsa? ( media-libs/alsa-lib )
+	cups? ( net-print/cups )
+	dbus? ( =sys-apps/dbus-0.23* )
+	pcmcia? ( sys-apps/pcmcia-cs sys-apps/setserial )"
+
+DEPEND="sys-devel/bison
+	sys-devel/flex
+	>=sys-apps/sed-4
+	${RDEPEND}"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+	if ! use gtk; then
+		mv -f scripts/Makefile.in ${T}/Makefile.in
+		sed -e "s:= bluepin:= :" \
+			${T}/Makefile.in > scripts/Makefile.in
+	fi
+	cd ${S}/scripts
+	epatch ${FILESDIR}/2.15-bluepin.patch
+}
+
+src_compile() {
+
+	econf \
+		$(use_enable cups) \
+		$(use_enable alsa) \
+		$(use_enable pcmcia) \
+		$(use_enable gtk bluepin) \
+		$(use_enable dbus) \
+		--enable-usb \
+		--disable-initscripts \
+		--enable-obex \
+		--enable-hid2hci \
+		--enable-bcm203x \
+		--localstatedir=/var \
+	emake || die "make failed"
+}
+
+src_install() {
+	make DESTDIR=${D} install || die
+	dodoc README
+
+	sed -e "s:security auto;:security user;:" \
+		-i ${D}/etc/bluetooth/hcid.conf
+
+	if use gtk; then
+		sed -e "s:\(pin_helper \).*:\1/usr/bin/bluepin;:" \
+			-i ${D}/etc/bluetooth/hcid.conf
+	else
+		sed -e "s:\(pin_helper \).*:\1/etc/bluetooth/pin-helper;:" \
+			-i ${D}/etc/bluetooth/hcid.conf
+	fi
+
+	exeinto /etc/init.d
+	newexe ${FILESDIR}/2.16/bluetooth.rc bluetooth
+
+	exeinto /etc/bluetooth
+	newexe ${FILESDIR}/2.10-r1/pin-helper.sh pin-helper
+	insinto /etc/bluetooth
+	newins ${FILESDIR}/2.10-r1/pin pin
+	fperms 0600 /etc/bluetooth/pin
+
+	insinto /etc/conf.d
+	newins ${S}/scripts/bluetooth.default bluetooth
+	sed -i -e 's/^HIDD_ENABLE=.*/HIDD_ENABLE=false/' \
+		-e 's/^HID2HCI_ENABLE=.*/HID2HCI_ENABLE=false/' \
+		${D}/etc/conf.d/bluetooth
+}
+
+pkg_postinst() {
+	einfo ""
+	einfo "A startup script has been installed in /etc/init.d/bluetooth."
+	einfo "RFComm devices are found in /dev/bluetooth/rfcomm/* instead of /dev/rfcomm*"
+	echo
+	einfo "If you need to set a default PIN, edit /etc/bluetooth/pin, and change"
+	einfo "/etc/bluetooth/hcid.conf option 'pin_helper' to /etc/bluetooth/pin-helper."
+	echo
+
+	if use gtk; then
+		einfo "By default, /usr/bin/bluepin will be launched on the desktop display"
+		einfo "for pin number input."
+	fi
+	einfo ""
+}
diff --git a/net-wireless/bluez-utils/bluez-utils-2.17.ebuild b/net-wireless/bluez-utils/bluez-utils-2.17.ebuild
index 50fc0c0a6bc9..accc537f46b8 100644
--- a/net-wireless/bluez-utils/bluez-utils-2.17.ebuild
+++ b/net-wireless/bluez-utils/bluez-utils-2.17.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez-utils/bluez-utils-2.17.ebuild,v 1.1 2005/05/25 00:30:22 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez-utils/bluez-utils-2.17.ebuild,v 1.2 2005/06/24 16:18:45 liquidx Exp $
 
 IUSE="gtk alsa cups pcmcia dbus"
 
@@ -52,7 +52,8 @@ src_compile() {
 		--disable-initscripts \
 		--enable-obex \
 		--enable-hid2hci \
-		--enable-bcm203x
+		--enable-bcm203x \
+		--localstatedir=/var \
 	emake || die "make failed"
 }
 
diff --git a/net-wireless/bluez-utils/files/digest-bluez-utils-2.17-r1 b/net-wireless/bluez-utils/files/digest-bluez-utils-2.17-r1
new file mode 100644
index 000000000000..91c9a6d166cf
--- /dev/null
+++ b/net-wireless/bluez-utils/files/digest-bluez-utils-2.17-r1
@@ -0,0 +1 @@
+MD5 42be19b0029a83824358baa0106da947 bluez-utils-2.17.tar.gz 488141