Attachment #216446 for bug #270859




SRC_URI="mirror://kernel/linux/bluetooth/${P}.tar.gz"
LICENSE="GPL-2 LGPL-2.1"
SLOT="0"
KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"

IUSE="alsa caps +consolekit cups debug gstreamer old-daemons pcmcia test-programs usb"

CDEPEND="alsa? ( media-libs/alsa-lib )
	caps? ( >=sys-libs/libcap-ng-0.6.2 )
	gstreamer? (
		>=media-libs/gstreamer-0.10
		>=media-libs/gst-plugins-base-0.10 )

	!net-wireless/bluez-utils"
DEPEND="sys-devel/flex
	>=dev-util/pkgconfig-0.20
	doc? ( dev-util/gtk-doc )
	${CDEPEND}"
RDEPEND="${CDEPEND}
	consolekit? ( sys-auth/pambase[consolekit] )
	test-programs? (
		dev-python/dbus-python
		dev-python/pygobject )"

src_prepare() {
	epatch \
		"${FILESDIR}/4.31-as_needed.patch" \
		"${FILESDIR}/4.34-conditional_libsbc.patch"

	if ! use consolekit; then
		# No consolekit for at_console etc, so we grant plugdev the rights
		epatch	"${FILESDIR}/bluez-plugdev.patch"

}

src_configure() {
	# the order is the same as ./configure --help

	# we don't need the other daemons either with the new
	# service architechture

	econf \
		$(use_enable caps capng) \
		--enable-network \
		--enable-serial \
		--enable-input \

		$(use_enable old-daemons dund) \
		$(use_enable cups) \
		$(use_enable test-programs test) \
		--enable-udevrules \
		--enable-configfiles \
		$(use_enable pcmcia) \
		--disable-pcmciarules \
		$(use_enable debug) \
		--localstatedir=/var
}


	dodoc AUTHORS ChangeLog README || die

	# don't install useless .la files
	find "${D}" -type f -name '*.la' -delete || die "failed to remove .la files"

	if use test-programs ; then
		cd "${S}/test"
		dobin simple-agent simple-service monitor-bluetooth

		cd "${S}"
	fi

	newinitd "${FILESDIR}/4.18/bluetooth-init.d" bluetooth || die
	newconfd "${FILESDIR}/4.18/bluetooth-conf.d" bluetooth || die

	if use old-daemons; then
		newconfd "${FILESDIR}/4.18/conf.d-hidd" hidd || die
		newinitd "${FILESDIR}/4.18/init.d-hidd" hidd || die
	fi

	# bug #84431
	insinto /etc/udev/rules.d/
	newins "${FILESDIR}/${PN}-4.18-udev.rules" 70-bluetooth.rules || die
	newins "${S}/scripts/bluetooth.rules" 70-bluetooth-pcmcia.rules || die

	exeinto /$(get_libdir)/udev/
	newexe "${FILESDIR}/${PN}-4.18-udev.script" bluetooth.sh || die
	doexe  "${S}/scripts/bluetooth_serial" || die

	insinto /etc/bluetooth
	doins \
		input/input.conf \
		audio/audio.conf \
		network/network.conf \
		serial/serial.conf \
		|| die

	newinitd "${FILESDIR}/4.18/bluetooth-init.d" bluetooth || die
	newconfd "${FILESDIR}/4.18/bluetooth-conf.d" bluetooth || die
}

pkg_postinst() {
	udevadm control --reload-rules && udevadm trigger --subsystem-match=bluetooth

	elog
	elog "To use dial up networking you must install net-dialup/ppp."
	elog ""
	elog "For a password agent, there is for example net-wireless/bluez-gnome"
	elog "for gnome and net-wireless/kdebluetooth for kde."
	elog "For a password agent, there are for example net-wireless/bluez-gnome"
	elog "and net-wireless/gnome-bluetooth:2 for GNOME. For KDE, see bug 246381"
	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 "For registering devices that don't pair, use net-wireless/blueman"
	elog "http://wiki.bluez.org/wiki/HOWTO/AudioDevices for configuration help."
	elog ""
	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 "  /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."

	if use consolekit; then
		elog ""
		elog "If you want to use rfcomm as a normal user, you need to add the user"
		elog "to the uucp group."
	else
		elog ""
		ewarn "Since you have the consolekit use flag disabled for this package, you will only be "
		ewarn "able to run bluetooth clients as root.  If you want to be able to run bluetooth "
		ewarn "clients as a regular user, you must enable the consolekit use flag for this package."
	fi

	if use old-daemons; then
		elog ""
		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 runlevels 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 ""
		elog "The bluetooth service should be started automatically by udev"
		elog "when the required hardware is inserted next time."
	fi
	elog
	ewarn "On first install you need to run /etc/init.d/dbus reload or hcid"
	ewarn "will fail to start."
}

Lines 1-8 Link Here

(-)a/usr/portage/net-wireless/bluez/files/4.18/bluetooth-conf.d (-3 lines)
1	# Bluetooth configuraton file	1	# Bluetooth configuraton file
2		2
3	# Run hid2hci (allowed values are "true" and "false")
4	HID2HCI_ENABLE=false
5
6	# Bind rfcomm devices (allowed values are "true" and "false")	3	# Bind rfcomm devices (allowed values are "true" and "false")
7	RFCOMM_ENABLE=true	4	RFCOMM_ENABLE=true
8		5





start() {
   	ebegin "Starting Bluetooth"
	udevadm trigger --subsystem-match=bluetooth

	ebegin "    Starting bluetoothd"
	# -s enables internal sdp server
	start-stop-daemon --start \
		--exec /usr/sbin/bluetoothd
	result=$?
	eend ${result}

	if [ "${HID2HCI_ENABLE}" = "true" -a -x /usr/sbin/hid2hci ]; then
		ebegin "    Running hid2hci"
		/usr/sbin/hid2hci --tohci -q    #be quiet
		[ ${result} == 0 ] && result=$?
		eend ${result}
	fi

	if [ "${RFCOMM_ENABLE}" = "true" -a -x /usr/bin/rfcomm ]; then
		if [ -f "${RFCOMM_CONFIG}" ]; then
			ebegin "    Starting rfcomm"
			/usr/bin/rfcomm -f "${RFCOMM_CONFIG}" bind all
			eend $?
			eend ${result}
		else
			ewarn "Not enabling rfcomm because RFCOMM_CONFIG does not exists"
		fi
	fi

	eend 0
}

stop() {
	ebegin "Shutting down Bluetooth"
	eend 0
	start-stop-daemon --stop --quiet --exec /usr/sbin/bluetoothd
	eend $?
}

Lines 1-18 Link Here

(-)a/usr/portage/net-wireless/bluez/files/4.18/cups-location.patch (-8 lines)
1	? cups/.deps
2	? cups/Makefile
3	? cups/Makefile.in
4	Index: cups/Makefile.am
5	===================================================================
6	RCS file: /cvsroot/bluez/utils/cups/Makefile.am,v
7	retrieving revision 1.9
8	diff -u -r1.9 Makefile.am

Return to bug 270859

Lines 11-21 HOMEPAGE="http://bluez.sourceforge.net/" Link Here

(-)a/usr/portage/net-wireless/bluez/bluez-4.39-r2.ebuild (-49 / +38 lines)
11	SRC_URI="mirror://kernel/linux/bluetooth/${P}.tar.gz"	11	SRC_URI="mirror://kernel/linux/bluetooth/${P}.tar.gz"
12	LICENSE="GPL-2 LGPL-2.1"	12	LICENSE="GPL-2 LGPL-2.1"
13	SLOT="0"	13	SLOT="0"
14	KEYWORDS="amd64 arm ~hppa ppc ppc64 x86"	14	KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~x86"
15		15
16	IUSE="alsa +consolekit cups debug doc gstreamer old-daemons test-programs usb"	16	IUSE="alsa caps +consolekit cups debug gstreamer old-daemons pcmcia test-programs usb"
17		17
18	CDEPEND="alsa? ( media-libs/alsa-lib )	18	CDEPEND="alsa? ( media-libs/alsa-lib )
		19	caps? ( >=sys-libs/libcap-ng-0.6.2 )
19	gstreamer? (	20	gstreamer? (
20	>=media-libs/gstreamer-0.10	21	>=media-libs/gstreamer-0.10
21	>=media-libs/gst-plugins-base-0.10 )	22	>=media-libs/gst-plugins-base-0.10 )
Lines 30-45 CDEPEND="alsa? ( media-libs/alsa-lib ) Link Here
30	!net-wireless/bluez-utils"	31	!net-wireless/bluez-utils"
31	DEPEND="sys-devel/flex	32	DEPEND="sys-devel/flex
32	>=dev-util/pkgconfig-0.20	33	>=dev-util/pkgconfig-0.20
33	doc? ( dev-util/gtk-doc )
34	${CDEPEND}"	34	${CDEPEND}"
35	RDEPEND="${CDEPEND}	35	RDEPEND="${CDEPEND}
36	consolekit? ( sys-auth/pambase[consolekit] )"	36	consolekit? ( sys-auth/pambase[consolekit] )
		37	test-programs? (
		38	dev-python/dbus-python
		39	dev-python/pygobject )"
37		40
38	src_prepare() {	41	src_prepare() {
39	epatch \
40	"${FILESDIR}/4.31-as_needed.patch" \
41	"${FILESDIR}/4.34-conditional_libsbc.patch"
42
43	if ! use consolekit; then	42	if ! use consolekit; then
44	# No consolekit for at_console etc, so we grant plugdev the rights	43	# No consolekit for at_console etc, so we grant plugdev the rights
45	epatch "${FILESDIR}/bluez-plugdev.patch"	44	epatch "${FILESDIR}/bluez-plugdev.patch"
Lines 54-66 src_prepare() { Link Here
54	}	53	}
55		54
56	src_configure() {	55	src_configure() {
57	# the order is the same as ./configure --help
58
59	# we don't need the other daemons either with the new
60	# service architechture
61
62	econf \	56	econf \
63	$(use_enable doc gtk-doc) \	57	$(use_enable caps capng) \
64	--enable-network \	58	--enable-network \
65	--enable-serial \	59	--enable-serial \
66	--enable-input \	60	--enable-input \
Lines 79-88 src_configure() { Link Here
79	$(use_enable old-daemons dund) \	73	$(use_enable old-daemons dund) \
80	$(use_enable cups) \	74	$(use_enable cups) \
81	$(use_enable test-programs test) \	75	$(use_enable test-programs test) \
82	--enable-manpages \	76	--enable-udevrules \
83	--enable-configfiles \	77	--enable-configfiles \
84	--disable-initscripts \	78	$(use_enable pcmcia) \
85	--disable-pcmciarules \
86	$(use_enable debug) \	79	$(use_enable debug) \
87	--localstatedir=/var	80	--localstatedir=/var
88	}	81	}
Lines 92-97 src_install() { Link Here
92		85
93	dodoc AUTHORS ChangeLog README \|\| die	86	dodoc AUTHORS ChangeLog README \|\| die
94		87
		88	# don't install useless .la files
		89	find "${D}" -type f -name '*.la' -delete \|\| die "failed to remove .la files"
		90
95	if use test-programs ; then	91	if use test-programs ; then
96	cd "${S}/test"	92	cd "${S}/test"
97	dobin simple-agent simple-service monitor-bluetooth	93	dobin simple-agent simple-service monitor-bluetooth
Lines 105-151 src_install() { Link Here
105	cd "${S}"	101	cd "${S}"
106	fi	102	fi
107		103
108	newinitd "${FILESDIR}/4.18/bluetooth-init.d" bluetooth \|\| die
109	newconfd "${FILESDIR}/4.18/bluetooth-conf.d" bluetooth \|\| die
110
111	if use old-daemons; then	104	if use old-daemons; then
112	newconfd "${FILESDIR}/4.18/conf.d-hidd" hidd \|\| die	105	newconfd "${FILESDIR}/4.18/conf.d-hidd" hidd \|\| die
113	newinitd "${FILESDIR}/4.18/init.d-hidd" hidd \|\| die	106	newinitd "${FILESDIR}/4.18/init.d-hidd" hidd \|\| die
114	fi	107	fi
115		108
116	# bug #84431
117	insinto /etc/udev/rules.d/
118	newins "${FILESDIR}/${PN}-4.18-udev.rules" 70-bluetooth.rules \|\| die
119	newins "${S}/scripts/bluetooth.rules" 70-bluetooth-pcmcia.rules \|\| die
120
121	exeinto /$(get_libdir)/udev/
122	newexe "${FILESDIR}/${PN}-4.18-udev.script" bluetooth.sh \|\| die
123	doexe "${S}/scripts/bluetooth_serial" \|\| die
124
125	insinto /etc/bluetooth	109	insinto /etc/bluetooth
126	doins \	110	doins \
127	input/input.conf \	111	input/input.conf \
128	audio/audio.conf \	112	audio/audio.conf \
129	network/network.conf	113	network/network.conf \
		114	serial/serial.conf \
		115	\|\| die
		116
		117	newinitd "${FILESDIR}/4.18/bluetooth-init.d" bluetooth \|\| die
		118	newconfd "${FILESDIR}/4.18/bluetooth-conf.d" bluetooth \|\| die
130	}	119	}
131		120
132	pkg_postinst() {	121	pkg_postinst() {
133	udevadm control --reload_rules && udevadm trigger	122	udevadm control --reload-rules && udevadm trigger --subsystem-match=bluetooth
134		123
135	elog	124	elog
136	elog "To use dial up networking you must install net-dialup/ppp."	125	elog "To use dial up networking you must install net-dialup/ppp."
137	elog ""	126	elog ""
138	elog "Since 3.0 bluez has changed the passkey handling to use a dbus based"	127	elog "For a password agent, there is for example net-wireless/bluez-gnome"
139	elog "API so please remember to update your /etc/bluetooth/hcid.conf."	128	elog "for gnome and net-wireless/kdebluetooth for kde."
140	elog "For a password agent, there are for example net-wireless/bluez-gnome"
141	elog "and net-wireless/gnome-bluetooth:2 for GNOME. For KDE, see bug 246381"
142	elog ""
143	elog "Since 3.10.1 we don't install the old style daemons any more but rely"
144	elog "on the new service architechture:"
145	elog " http://wiki.bluez.org/wiki/Services"
146	elog ""	129	elog ""
147	elog "3.15 adds support for the audio service. See"	130	elog "For registering devices that don't pair, use net-wireless/blueman"
148	elog "http://wiki.bluez.org/wiki/HOWTO/AudioDevices for configuration help."
149	elog ""	131	elog ""
150	elog "Use the old-daemons use flag to get the old daemons like hidd"	132	elog "Use the old-daemons use flag to get the old daemons like hidd"
151	elog "installed. Please note that the init script doesn't stop the old"	133	elog "installed. Please note that the init script doesn't stop the old"
Lines 153-173 pkg_postinst() { Link Here
153	elog " /etc/init.d/bluetooth stop"	135	elog " /etc/init.d/bluetooth stop"
154	elog "before updating your configuration files or you can manually kill"	136	elog "before updating your configuration files or you can manually kill"
155	elog "the extra daemons you previously enabled in /etc/conf.d/bluetooth."	137	elog "the extra daemons you previously enabled in /etc/conf.d/bluetooth."
156	elog ""	138
157	elog "If you want to use rfcomm as a normal user, you need to add the user"	139	if use consolekit; then
158	elog "to the uucp group."	140	elog ""
159	elog ""	141	elog "If you want to use rfcomm as a normal user, you need to add the user"
		142	elog "to the uucp group."
		143	else
		144	elog ""
		145	ewarn "Since you have the consolekit use flag disabled for this package, you will only be "
		146	ewarn "able to run bluetooth clients as root. If you want to be able to run bluetooth "
		147	ewarn "clients as a regular user, you must enable the consolekit use flag for this package."
		148	fi
		149
160	if use old-daemons; then	150	if use old-daemons; then
		151	elog ""
161	elog "The hidd init script was installed because you have the old-daemons"	152	elog "The hidd init script was installed because you have the old-daemons"
162	elog "use flag on. It is not started by default via udev so please add it"	153	elog "use flag on. It is not started by default via udev so please add it"
163	elog "to the required runleves using rc-update <runlevel> add hidd. If"	154	elog "to the required runlevels using rc-update <runlevel> add hidd. If"
164	elog "you need init scripts for the other daemons, please file requests"	155	elog "you need init scripts for the other daemons, please file requests"
165	elog "to https://bugs.gentoo.org."	156	elog "to https://bugs.gentoo.org."
166	else	157	else
		158	elog ""
167	elog "The bluetooth service should be started automatically by udev"	159	elog "The bluetooth service should be started automatically by udev"
168	elog "when the required hardware is inserted next time."	160	elog "when the required hardware is inserted next time."
169	fi	161	fi
170	elog
171	ewarn "On first install you need to run /etc/init.d/dbus reload or hcid"
172	ewarn "will fail to start."
173	}	162	}

Lines 10-48 depend() { Link Here

(-)a/usr/portage/net-wireless/bluez/files/4.18/bluetooth-init.d (-21 / +4 lines)
10		10
11	start() {	11	start() {
12	ebegin "Starting Bluetooth"	12	ebegin "Starting Bluetooth"
13	local result=0	13	udevadm trigger --subsystem-match=bluetooth
14
15	ebegin " Starting bluetoothd"
16	# -s enables internal sdp server
17	start-stop-daemon --start \
18	--exec /usr/sbin/bluetoothd
19	result=$?
20	eend ${result}
21
22	if [ "${HID2HCI_ENABLE}" = "true" -a -x /usr/sbin/hid2hci ]; then
23	ebegin " Running hid2hci"
24	/usr/sbin/hid2hci --tohci -q #be quiet
25	[ ${result} == 0 ] && result=$?
26	eend ${result}
27	fi
28		14
29	if [ "${RFCOMM_ENABLE}" = "true" -a -x /usr/bin/rfcomm ]; then	15	if [ "${RFCOMM_ENABLE}" = "true" -a -x /usr/bin/rfcomm ]; then
30	if [ -f "${RFCOMM_CONFIG}" ]; then	16	if [ -f "${RFCOMM_CONFIG}" ]; then
31	ebegin " Starting rfcomm"	17	ebegin " Starting rfcomm"
32	/usr/bin/rfcomm -f "${RFCOMM_CONFIG}" bind all	18	/usr/bin/rfcomm -f "${RFCOMM_CONFIG}" bind all
33	[ ${result} == 0 ] && result=$?	19	eend $?
34	eend ${result}
35	else	20	else
36	ewarn "Not enabling rfcomm because RFCOMM_CONFIG does not exists"	21	ewarn "Not enabling rfcomm because RFCOMM_CONFIG does not exists"
37	fi	22	fi
38	fi	23	fi
39		24
40	eend ${result}	25	eend 0
41	}	26	}
42		27
43	stop() {	28	stop() {
44	ebegin "Shutting down Bluetooth"	29	ebegin "Shutting down Bluetooth"
45		30	eend 0
46	start-stop-daemon --stop --quiet --exec /usr/sbin/bluetoothd
47	eend $?
48	}	31	}