added gtk2 patch to bluepin (#35987). changed default pin helper to bluepin.

5 files changed, 231 insertions, 1 deletions

diff --git a/net-wireless/bluez-utils/ChangeLog b/net-wireless/bluez-utils/ChangeLog
index 6bbc6b52c527..d9d0de10d74f 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-2003 Gentoo Technologies, Inc.; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez-utils/ChangeLog,v 1.12 2004/01/07 01:31:46 liquidx Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez-utils/ChangeLog,v 1.13 2004/01/09 12:11:42 liquidx Exp $
+
+*bluez-utils-2.3-r2 (09 Jan 2004)
+
+  09 Jan 2004; Alastair Tse <liquidx@gentoo.org>:
+  files/bluez-utils-2.3-bluepin-gtk2.patch bluez-utils-2.3-r2.ebuild
+  new revision bump. added gtk2 patch to /usr/bin/bluepin (#35987).
+  changed default pin_helper to /usr/bin/bluepin.
 
   07 Jan 2004; Alastair Tse <liquidx@gentoo.org> files/bluetooth.rc:
   added 'after hotplug' in rc script (#36762)
diff --git a/net-wireless/bluez-utils/Manifest b/net-wireless/bluez-utils/Manifest
index 67d67bcc82f5..0aa259ef9c6c 100644
--- a/net-wireless/bluez-utils/Manifest
+++ b/net-wireless/bluez-utils/Manifest
@@ -1,10 +1,13 @@
 MD5 dc8a53b14535ed20f10c927236ee4c85 ChangeLog 1967
 MD5 5e37c569d8455b38f15b160b44794cfd bluez-utils-2.3-r1.ebuild 1880
+MD5 9a672e40a67a8e2f50c515e5cde6281d bluez-utils-2.3-r2.ebuild 2001
 MD5 f7db3b22bfee688d179582ebd6fb0716 bluez-utils-2.3.ebuild 1540
 MD5 23d1ee94cc2fb13eb6dcae0a51b061fa metadata.xml 237
 MD5 cfa3331172be7ea78a864d919dee35e4 files/bluetooth.rc 1110
+MD5 92de688eab66e8cd0a0f2e61f921a3c6 files/bluez-utils-2.3-bluepin-gtk2.patch 3253
 MD5 336de3d1eba238735777d7d8f8e0c282 files/bluez-utils-2.3-bluepin.patch 461
 MD5 ce3b08e1df53875d1060e9e246810907 files/bluez-utils-2.3-rfcomm_fflush.patch 966
 MD5 8bc76d5064a1fae0dd2481919b1988f1 files/digest-bluez-utils-2.3 67
 MD5 8bc76d5064a1fae0dd2481919b1988f1 files/digest-bluez-utils-2.3-r1 67
+MD5 8bc76d5064a1fae0dd2481919b1988f1 files/digest-bluez-utils-2.3-r2 67
 MD5 7449a658ef08ac7e86b221b3c43961af files/pin.sample 26
diff --git a/net-wireless/bluez-utils/bluez-utils-2.3-r2.ebuild b/net-wireless/bluez-utils/bluez-utils-2.3-r2.ebuild
new file mode 100644
index 000000000000..6fb5e91fb63d
--- /dev/null
+++ b/net-wireless/bluez-utils/bluez-utils-2.3-r2.ebuild
@@ -0,0 +1,90 @@
+# Copyright 1999-2003 Gentoo Technologies, Inc.
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez-utils/bluez-utils-2.3-r2.ebuild,v 1.1 2004/01/09 12:11:42 liquidx Exp $
+
+DESCRIPTION="bluetooth utilities"
+HOMEPAGE="http://bluez.sourceforge.net/"
+SRC_URI="http://bluez.sourceforge.net/download/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~x86"
+IUSE="gtk gtk2"
+RDEPEND=">=net-wireless/bluez-libs-2.4
+	gtk? ( !gtk2? ( =dev-python/pygtk-0.6* ) )
+	gtk? (  gtk2? ( >=dev-python/pygtk-2 ) )"
+
+DEPEND="sys-devel/bison
+	sys-devel/flex
+	>=sys-apps/sed-4
+	${RDEPEND}"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}
+
+	# patch to fix bluepin to use pygtk1
+	use gtk2 \
+		&& epatch ${FILESDIR}/${P}-bluepin-gtk2.patch \
+		|| epatch ${FILESDIR}/${P}-bluepin.patch
+	epatch ${FILESDIR}/${P}-rfcomm_fflush.patch
+
+	# Fix some installation locations
+
+	for dir in rfcomm tools; do
+		mv -f $dir/Makefile.in ${T}/Makefile.in
+		sed -e "s:\$(prefix)/usr/share/man:\@mandir\@:" \
+			${T}/Makefile.in > $dir/Makefile.in;
+	done
+
+	mv -f hcid/Makefile.in ${T}/Makefile.in
+	sed -e "s:\$(prefix)/etc/bluetooth:/etc/bluetooth:" \
+		${T}/Makefile.in > hcid/Makefile.in
+
+	if [ ! `use gtk` ]; then
+		mv -f scripts/Makefile.in ${T}/Makefile.in
+		sed -e "s:= bluepin:= :" \
+			${T}/Makefile.in > scripts/Makefile.in
+	fi
+}
+
+src_compile() {
+	econf
+	emake || die
+}
+
+src_install() {
+	make DESTDIR=${D} install || die
+	dodoc README
+
+	sed -e "s:security auto;:security user;:" \
+		-i ${D}/etc/bluetooth/hcid.conf
+	
+	if [ -n "`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;:" \
+			-i ${D}/etc/bluetooth/hcid.conf
+	fi			
+
+	exeinto /etc/init.d
+	newexe ${FILESDIR}/bluetooth.rc bluetooth
+
+	exeinto /etc/bluetooth
+	newexe ${FILESDIR}/pin.sample pin
+	fperms 0700 /etc/bluetooth/pin
+}
+
+pkg_postinst() {
+	einfo ""
+	einfo "A startup script has been installed in /etc/init.d/bluetooth."
+	einfo "RFComm devices are found in /dev/bluetooh/rfcomm/* instead of /dev/rfcomm*"
+	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."
+	if [ -n "`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/files/bluez-utils-2.3-bluepin-gtk2.patch b/net-wireless/bluez-utils/files/bluez-utils-2.3-bluepin-gtk2.patch
new file mode 100644
index 000000000000..5cd5a404ae65
--- /dev/null
+++ b/net-wireless/bluez-utils/files/bluez-utils-2.3-bluepin-gtk2.patch
@@ -0,0 +1,129 @@
+--- bluez-utils-2.3/scripts/bluepin	2003-03-20 05:58:14.000000000 +0000
++++ bluez-utils-2.3/scripts/bluepin	2003-09-19 12:52:33.301301864 +0100
+@@ -3,11 +3,13 @@
+ # Bluetooth PIN helper
+ # Written by Maxim Krasnyansky <maxk@qualcomm.com>
+ #
+-import sys, os, string, popen2
++import sys, os, string, popen2, pygtk
++
++pygtk.require('2.0')
+ 
+ # X Display initialization.
+-# Find running X Server and parse it's arguments.
+-# Set enviroment variables DISPLAY and XAUTHORITY
++# Find running X Server and parse its arguments.
++# Set environment variables DISPLAY and XAUTHORITY
+ # using info extracted from X Server args.
+ #
+ def set_display():
+@@ -24,62 +26,64 @@
+ 		elif arg[i] == "-auth":
+ 			auth = arg[i+1]
+ 			break
+-
+ 	os.environ['DISPLAY']    = disp 
+ 	os.environ['XAUTHORITY'] = auth
+ 
+ # Set X display before initializing GTK
+-set_display()
++set_display()
++
++# Some versions of fontconfig will segfault if HOME isn't set.
++#os.environ['HOME'] = ""
+ 
+-from gtk import *
++import gtk
+ 
+ # Dialog Class
+ DLG_OK = 1
+ DLG_CANCEL = 2
+-class Dialog(GtkDialog):
++class Dialog(gtk.Dialog):
+ 	result = DLG_CANCEL 
+ 	args = {}
+-	def __init__(self, modal=FALSE, mesg=None, args = {}):
+-		GtkDialog.__init__(self)
++	def __init__(self, modal=gtk.FALSE, mesg=None, args = {}):
++		gtk.Dialog.__init__(self)
+ 		self.args = args
+ 		self.set_modal(modal)
+-		self.set_usize(400, 0)
+-		self.set_uposition(300,300)
++#		self.set_usize(400, 0)
++#		self.set_uposition(300,300)
+ 		
+ 		self.connect("destroy", self.quit)
+ 		self.connect("delete_event", self.quit)
+ 
+ 		self.action_area.set_border_width(2)
+ 
+-		ok = GtkButton("Accept")
++		ok = gtk.Button("Accept")
+ 		ok.connect("clicked", self.ok)
+ 		self.action_area.pack_start(ok, padding = 20)
+ 		ok.show()
+ 
+-		cl = GtkButton("Reject")
++		cl = gtk.Button("Reject")
+ 		cl.connect("clicked", self.cancel)
+ 		self.action_area.pack_start(cl, padding = 20)
+ 		cl.show()
+ 
+ 		if mesg:
+-			msg = GtkLabel()
++			msg = gtk.Label("")
+ 			msg.set_text(mesg)
+ 			self.vbox.pack_start(msg, padding = 10)
+ 			msg.show()
+ 
+ 		self.ents = []
+ 		for k in self.args.keys():
+-			hbox = GtkHBox()
++			hbox = gtk.HBox()
+ 			hbox.set_border_width(5)
+ 			self.vbox.pack_start(hbox)
+ 			hbox.show()
+ 
+-			l = GtkLabel()
+-			e = GtkEntry()
++			l = gtk.Label("")
++			e = gtk.Entry()
+ 			l.set_text( k )
+ 			e.set_text( self.args[k] )
+ 			e.connect("key_press_event", self.key_press)
+-			hbox.pack_start(l, padding = 10, expand = FALSE)
++			hbox.pack_start(l, padding = 10, expand = gtk.FALSE)
+ 			hbox.pack_start(e)
+ 			l.show()
+ 			e.show()
+@@ -89,10 +93,10 @@
+ 		self.ents[0][1].grab_focus()
+ 
+ 	def key_press(self, entry, event):
+-		if event.keyval == GDK.Return:
++		if event.keyval == gtk.keysyms.Return:
+ 			entry.emit_stop_by_name("key_press_event")
+ 			self.ok()
+-		elif event.keyval == GDK.Escape:
++		elif event.keyval == gtk.keysyms.Escape:
+ 			entry.emit_stop_by_name("key_press_event")
+ 			self.cancel()
+ 
+@@ -110,13 +114,13 @@
+ 	def quit(self, *args):
+ 		self.hide()
+ 		self.destroy()
+-		mainquit()
++		gtk.mainquit()
+ 
+-def dialog(title, mesg, args, modal = FALSE):
++def dialog(title, mesg, args, modal = gtk.FALSE):
+ 	dlg = Dialog(args = args, mesg = mesg, modal = modal)
+ 	dlg.set_title(title)
+ 	dlg.show()
+-	mainloop()
++	gtk.mainloop()
+ 	return dlg.result
+ 
+ def main(*args):
diff --git a/net-wireless/bluez-utils/files/digest-bluez-utils-2.3-r2 b/net-wireless/bluez-utils/files/digest-bluez-utils-2.3-r2
new file mode 100644
index 000000000000..85892b8ab04f
--- /dev/null
+++ b/net-wireless/bluez-utils/files/digest-bluez-utils-2.3-r2
@@ -0,0 +1 @@
+MD5 dcc22cb0b24debd5e65f9234d9ba7685 bluez-utils-2.3.tar.gz 247775