version bump (#72230)

9 files changed, 156 insertions, 19 deletions

diff --git a/net-wireless/bluez-libs/ChangeLog b/net-wireless/bluez-libs/ChangeLog
index 70f36ab80c99..35aadd1879e7 100644
--- a/net-wireless/bluez-libs/ChangeLog
+++ b/net-wireless/bluez-libs/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-wireless/bluez-libs
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez-libs/ChangeLog,v 1.25 2004/12/16 11:12:26 corsair Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez-libs/ChangeLog,v 1.26 2004/12/20 19:59:46 liquidx Exp $
+
+*bluez-libs-2.12 (20 Dec 2004)
+
+  20 Dec 2004; Alastair Tse <liquidx@gentoo.org>
+  +files/bluez-libs-2.12-handsfree.patch, +bluez-libs-2.12.ebuild:
+  version bump (#72230)
 
   16 Dec 2004; Markus Rothe <corsair@gentoo.org> bluez-libs-2.10.ebuild:
   Stable on ppc64
diff --git a/net-wireless/bluez-libs/Manifest b/net-wireless/bluez-libs/Manifest
index 1037bed4f3e0..8e6714a00581 100644
--- a/net-wireless/bluez-libs/Manifest
+++ b/net-wireless/bluez-libs/Manifest
@@ -2,6 +2,8 @@ MD5 87c040780ce54f11d32d5c68503216a7 ChangeLog 3456
 MD5 9e83cd63031aacb590ce182d99935cc9 bluez-libs-2.10.ebuild 642
 MD5 bb5e63a53a97752bbd9dabf3e68e45c4 bluez-libs-2.7.ebuild 531
 MD5 439de383d422683abddb9ff8b75aa67b metadata.xml 235
-MD5 de3e6042ceea4fbca926d59617ffdb36 files/bluez-libs-2.10-handsfree.patch 1030
+MD5 7a6aa98ad03ad3f4901a422eb20cb8ec bluez-libs-2.12.ebuild 643
 MD5 3582cb4d2e7e3578ac75f23798b13d25 files/digest-bluez-libs-2.10 67
 MD5 e9e80d4297e7ac6f8e8018d52f9a082c files/digest-bluez-libs-2.7 66
+MD5 de3e6042ceea4fbca926d59617ffdb36 files/bluez-libs-2.10-handsfree.patch 1030
+MD5 1cdc7bca3add1c6f448e180a44f506e4 files/digest-bluez-libs-2.12 67
diff --git a/net-wireless/bluez-libs/bluez-libs-2.12.ebuild b/net-wireless/bluez-libs/bluez-libs-2.12.ebuild
new file mode 100644
index 000000000000..688f524bf4e5
--- /dev/null
+++ b/net-wireless/bluez-libs/bluez-libs-2.12.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2004 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez-libs/bluez-libs-2.12.ebuild,v 1.1 2004/12/20 19:59:46 liquidx Exp $
+
+inherit eutils
+
+DESCRIPTION="Bluetooth Userspace Libraries"
+HOMEPAGE="http://bluez.sourceforge.net/"
+SRC_URI="http://bluez.sourceforge.net/download/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~hppa ~ppc ~sparc ~x86 ~alpha ~ppc64"
+IUSE=""
+
+DEPEND="!net-wireless/bluez-sdp"
+
+src_unpack() {
+	unpack ${A}
+	cd ${S}; epatch ${FILESDIR}/${P}-handsfree.patch
+}
+
+src_install() {
+	make DESTDIR=${D} install || die
+}
diff --git a/net-wireless/bluez-libs/files/bluez-libs-2.12-handsfree.patch b/net-wireless/bluez-libs/files/bluez-libs-2.12-handsfree.patch
new file mode 100644
index 000000000000..99370718c9e4
--- /dev/null
+++ b/net-wireless/bluez-libs/files/bluez-libs-2.12-handsfree.patch
@@ -0,0 +1,19 @@
+--- bluez-libs-2.12/src/sdp.c.old	2004-12-20 19:08:56.489679664 +0000
++++ bluez-libs-2.12/src/sdp.c	2004-12-20 19:09:25.125326384 +0000
+@@ -107,6 +107,8 @@
+ 	{ GENERIC_TELEPHONY_SVCLASS_ID, "Generic Telephony" },
+ 	{ PANU_SVCLASS_ID,              "PAN user" },
+ 	{ NAP_SVCLASS_ID,               "Network access point" },
++	{ HANDSFREE_SVCLASS_ID,         "Handsfree"},
++	{ HANDSFREE_AUDIO_GW_SVCLASS_ID,"Handsfree Audio Gateway"},
+ 	{ GN_SVCLASS_ID,                "PAN group network" },
+ 	{ HID_SVCLASS_ID,               "Human Interface Device" },
+ 	{ CIP_SVCLASS_ID,               "Common ISDN Access" },
+@@ -133,6 +135,7 @@
+ 	{ PANU_PROFILE_ID,               "PAN user" },
+ 	{ NAP_PROFILE_ID,                "PAN access point" },
+ 	{ GN_PROFILE_ID,                 "PAN group network" },
++	{ HANDSFREE_PROFILE_ID,          "Handsfree"},
+ 	{ HID_PROFILE_ID,                "Human Interface Device" },
+ 	{ CIP_PROFILE_ID,                "Common ISDN Access" },
+ 	{ SAP_PROFILE_ID,                "SIM Access" },
diff --git a/net-wireless/bluez-libs/files/digest-bluez-libs-2.12 b/net-wireless/bluez-libs/files/digest-bluez-libs-2.12
new file mode 100644
index 000000000000..385182444710
--- /dev/null
+++ b/net-wireless/bluez-libs/files/digest-bluez-libs-2.12
@@ -0,0 +1 @@
+MD5 abfa1167a6053f00155eeedc4fdd9f8a bluez-libs-2.12.tar.gz 269194
diff --git a/net-wireless/bluez-utils/ChangeLog b/net-wireless/bluez-utils/ChangeLog
index 0283a159b972..e212ff7d0a8d 100644
--- a/net-wireless/bluez-utils/ChangeLog
+++ b/net-wireless/bluez-utils/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for net-wireless/bluez-utils
 # Copyright 2002-2004 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez-utils/ChangeLog,v 1.34 2004/11/11 09:49:44 eradicator Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-wireless/bluez-utils/ChangeLog,v 1.35 2004/12/20 20:00:48 liquidx Exp $
+
+*bluez-utils-2.12 (20 Dec 2004)
+
+  20 Dec 2004; Alastair Tse <liquidx@gentoo.org> +bluez-utils-2.12.ebuild:
+  version bump (#72230)
 
   11 Nov 2004; Jeremy Huddleston <eradicator@gentoo.org>
   bluez-utils-2.10-r1.ebuild:
diff --git a/net-wireless/bluez-utils/Manifest b/net-wireless/bluez-utils/Manifest
index cedbc0692618..88bfd6650ab2 100644
--- a/net-wireless/bluez-utils/Manifest
+++ b/net-wireless/bluez-utils/Manifest
@@ -1,27 +1,19 @@
------BEGIN PGP SIGNED MESSAGE-----
-Hash: SHA1
-
 MD5 7f0cfc4d48336087579eac808baaaeb0 ChangeLog 5391
-MD5 ed80a378b301103c8715cffda6157d7a bluez-utils-2.10-r1.ebuild 2596
+MD5 5b012319f221d1ea2adea1b2f253e7f6 bluez-utils-2.10.ebuild 2294
 MD5 43c46462d55ff522368adcca12159bd9 bluez-utils-2.7.ebuild 2276
 MD5 439de383d422683abddb9ff8b75aa67b metadata.xml 235
-MD5 5b012319f221d1ea2adea1b2f253e7f6 bluez-utils-2.10.ebuild 2294
+MD5 ed80a378b301103c8715cffda6157d7a bluez-utils-2.10-r1.ebuild 2596
+MD5 ed80a378b301103c8715cffda6157d7a bluez-utils-2.12.ebuild 2596
 MD5 44ca243c60a83967c811537a38b92549 files/bluetooth.rc 1166
 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 2fcf0c81d0479f85cb7244f2b1900c6d files/bluez-utils-2.10-handsfree.patch 540
+MD5 06aa410f5fe0f8459273a2bcda7db8cc files/digest-bluez-utils-2.10 68
 MD5 8f08bc200ec5740dd96c1043257f776f files/digest-bluez-utils-2.7 67
 MD5 7449a658ef08ac7e86b221b3c43961af files/pin.sample 26
-MD5 06aa410f5fe0f8459273a2bcda7db8cc files/digest-bluez-utils-2.10 68
-MD5 cba196ec0ce8e3622a29f93b030ed027 files/2.10-r1/bluetooth.rc 3340
+MD5 06aa410f5fe0f8459273a2bcda7db8cc files/digest-bluez-utils-2.10-r1 68
+MD5 2fcf0c81d0479f85cb7244f2b1900c6d files/bluez-utils-2.10-handsfree.patch 540
+MD5 461e23b79c054101bd79fdb85755a864 files/digest-bluez-utils-2.12 68
 MD5 e7df7cd2ca07f4f1ab415d457a6e1c13 files/2.10-r1/pin 5
 MD5 992426019dbbd772c9326512d2a0033d files/2.10-r1/pin-helper.sh 49
------BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.2.6 (GNU/Linux)
-
-iD8DBQFBkzXBArHZZzCEUG0RAnODAJwKxN9jkqP9ediMJ/uBi60mvPi8nwCggF+E
-fj/6V/bkrTPFdN004U19/SU=
-=iH1M
------END PGP SIGNATURE-----
+MD5 cba196ec0ce8e3622a29f93b030ed027 files/2.10-r1/bluetooth.rc 3340
diff --git a/net-wireless/bluez-utils/bluez-utils-2.12.ebuild b/net-wireless/bluez-utils/bluez-utils-2.12.ebuild
new file mode 100644
index 000000000000..a49340de5682
--- /dev/null
+++ b/net-wireless/bluez-utils/bluez-utils-2.12.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2004 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.12.ebuild,v 1.1 2004/12/20 20:00:48 liquidx Exp $
+
+IUSE="gtk"
+
+inherit eutils
+
+DESCRIPTION="bluetooth utilities"
+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.12
+	!net-wireless/bluez-pan
+	gtk? ( >=dev-python/pygtk-2.2 )
+	dev-libs/libusb"
+
+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
+}
+
+src_compile() {
+	econf || die "econf failed"
+	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 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.10-r1/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*"
+	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."
+
+	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/files/digest-bluez-utils-2.12 b/net-wireless/bluez-utils/files/digest-bluez-utils-2.12
new file mode 100644
index 000000000000..eae936205c65
--- /dev/null
+++ b/net-wireless/bluez-utils/files/digest-bluez-utils-2.12
@@ -0,0 +1 @@
+MD5 20aeda4b1b6176cc178b0152ff736516 bluez-utils-2.12.tar.gz 296613