Gentoo Websites Logo
Go to: Gentoo Home Documentation Forums Lists Bugs Planet Store Wiki Get Gentoo!
View | Details | Raw Unified | Return to bug 270859 | Differences between
and this patch

Collapse All | Expand All

(-)/usr/portage/net-wireless/bluez/bluez-4.39.ebuild (-47 / +19 lines)
Lines 13-19 Link Here
13
SLOT="0"
13
SLOT="0"
14
KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sh ~sparc ~x86"
14
KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sh ~sparc ~x86"
15
15
16
IUSE="alsa cups debug doc gstreamer old-daemons test-programs usb"
16
IUSE="alsa consolekit cups debug doc gstreamer old-daemons pcmcia test-programs usb"
17
17
18
CDEPEND="alsa? ( media-libs/alsa-lib )
18
CDEPEND="alsa? ( media-libs/alsa-lib )
19
	gstreamer? (
19
	gstreamer? (
Lines 33-47 Link Here
33
	doc? ( dev-util/gtk-doc )
33
	doc? ( dev-util/gtk-doc )
34
	${CDEPEND}"
34
	${CDEPEND}"
35
RDEPEND="${CDEPEND}
35
RDEPEND="${CDEPEND}
36
	sys-auth/pambase[consolekit]"
36
	consolekit? ( sys-auth/pambase[consolekit] )"
37
37
38
src_prepare() {
38
src_prepare() {
39
	epatch \
39
	epatch "${FILESDIR}/conditional_libsbc.patch"
40
		"${FILESDIR}/4.31-as_needed.patch" \
41
		"${FILESDIR}/4.34-conditional_libsbc.patch"
42
40
43
	if use cups; then
41
	if use cups; then
44
		epatch "${FILESDIR}/4.18/cups-location.patch"
42
		epatch "${FILESDIR}/cups-location.patch"
45
	fi
43
	fi
46
44
47
	# needed for both patches
45
	# needed for both patches
Lines 49-59 Link Here
49
}
47
}
50
48
51
src_configure() {
49
src_configure() {
52
	# the order is the same as ./configure --help
53
54
	# we don't need the other daemons either with the new
55
	# service architechture
56
57
	econf \
50
	econf \
58
		$(use_enable doc gtk-doc) \
51
		$(use_enable doc gtk-doc) \
59
		--enable-network \
52
		--enable-network \
Lines 67-72 Link Here
67
		--enable-netlink \
60
		--enable-netlink \
68
		--enable-tools \
61
		--enable-tools \
69
		--enable-bccmd \
62
		--enable-bccmd \
63
		$(use_enable pcmcia) \
70
		--enable-hid2hci \
64
		--enable-hid2hci \
71
		--enable-dfutool \
65
		--enable-dfutool \
72
		$(use_enable old-daemons hidd) \
66
		$(use_enable old-daemons hidd) \
Lines 75-92 Link Here
75
		$(use_enable cups) \
69
		$(use_enable cups) \
76
		$(use_enable test-programs test) \
70
		$(use_enable test-programs test) \
77
		--enable-manpages \
71
		--enable-manpages \
72
		--enable-udevrules \
78
		--enable-configfiles \
73
		--enable-configfiles \
79
		--disable-initscripts \
80
		--disable-pcmciarules \
81
		$(use_enable debug) \
74
		$(use_enable debug) \
82
		--localstatedir=/var
75
		--localstatedir=/var
83
}
76
}
84
77
85
src_install() {
78
src_install() {
86
	emake DESTDIR="${D}" install || die "make install failed"
79
	emake DESTDIR="${D}" install || die "make install failed"
87
88
	dodoc AUTHORS ChangeLog README || die
80
	dodoc AUTHORS ChangeLog README || die
89
81
82
	# don't install useless .la files
83
	find "${D}" -type f -name '*.la' -delete || die "failed to remove .la files"
84
90
	if use test-programs ; then
85
	if use test-programs ; then
91
		cd "${S}/test"
86
		cd "${S}/test"
92
		dobin simple-agent simple-service monitor-bluetooth
87
		dobin simple-agent simple-service monitor-bluetooth
Lines 96-157 Link Here
96
		done
91
		done
97
		insinto /usr/share/doc/${PF}/test-services
92
		insinto /usr/share/doc/${PF}/test-services
98
		doins service-*
93
		doins service-*
99
100
		cd "${S}"
94
		cd "${S}"
101
	fi
95
	fi
102
96
103
	newinitd "${FILESDIR}/4.18/bluetooth-init.d" bluetooth || die
104
	newconfd "${FILESDIR}/4.18/bluetooth-conf.d" bluetooth || die
105
106
	if use old-daemons; then
97
	if use old-daemons; then
107
		newconfd "${FILESDIR}/4.18/conf.d-hidd" hidd || die
98
		newconfd "${FILESDIR}/4.18/conf.d-hidd" hidd || die
108
		newinitd "${FILESDIR}/4.18/init.d-hidd" hidd || die
99
		newinitd "${FILESDIR}/4.18/init.d-hidd" hidd || die
109
	fi
100
	fi
110
101
111
	# bug #84431
102
	## TODO: use group uucp in new udev rules?
112
	insinto /etc/udev/rules.d/
113
	newins "${FILESDIR}/${PN}-4.18-udev.rules" 70-bluetooth.rules || die
114
	newins "${S}/scripts/bluetooth.rules" 70-bluetooth-pcmcia.rules || die
115
116
	exeinto /$(get_libdir)/udev/
117
	newexe "${FILESDIR}/${PN}-4.18-udev.script" bluetooth.sh || die
118
	doexe  "${S}/scripts/bluetooth_serial" || die
119
103
120
	insinto /etc/bluetooth
104
	insinto /etc/bluetooth
121
	doins \
105
	doins \
122
		input/input.conf \
106
		input/input.conf \
123
		audio/audio.conf \
107
		audio/audio.conf \
124
		network/network.conf
108
		network/network.conf \
109
		|| die
125
}
110
}
126
111
127
pkg_postinst() {
112
pkg_postinst() {
128
	udevadm control --reload_rules && udevadm trigger
113
	udevadm control --reload-rules && udevadm trigger --subsystem-match=bluetooth
129
114
130
	elog
131
	elog "To use dial up networking you must install net-dialup/ppp."
115
	elog "To use dial up networking you must install net-dialup/ppp."
132
	elog ""
116
	elog
133
	elog "Since 3.0 bluez has changed the passkey handling to use a dbus based"
134
	elog "API so please remember to update your /etc/bluetooth/hcid.conf."
135
	elog "For a password agent, there is for example net-wireless/bluez-gnome"
117
	elog "For a password agent, there is for example net-wireless/bluez-gnome"
136
	elog "for gnome and net-wireless/kdebluetooth for kde."
118
	elog "for gnome and net-wireless/kdebluetooth for kde."
137
	elog ""
119
	elog
138
	elog "Since 3.10.1 we don't install the old style daemons any more but rely"
120
	elog "If you want to use rfcomm as a normal user, you need to add the user"
139
	elog "on the new service architechture:"
121
	elog "to the uucp group."
140
	elog "	http://wiki.bluez.org/wiki/Services"
122
	elog
141
	elog ""
142
	elog "3.15 adds support for the audio service. See"
143
	elog "http://wiki.bluez.org/wiki/HOWTO/AudioDevices for configuration help."
144
	elog ""
145
	elog "Use the old-daemons use flag to get the old daemons like hidd"
123
	elog "Use the old-daemons use flag to get the old daemons like hidd"
146
	elog "installed. Please note that the init script doesn't stop the old"
124
	elog "installed. Please note that the init script doesn't stop the old"
147
	elog "daemons after you update it so it's recommended to run:"
125
	elog "daemons after you update it so it's recommended to run:"
148
	elog "  /etc/init.d/bluetooth stop"
126
	elog "  /etc/init.d/bluetooth stop"
149
	elog "before updating your configuration files or you can manually kill"
127
	elog "before updating your configuration files or you can manually kill"
150
	elog "the extra daemons you previously enabled in /etc/conf.d/bluetooth."
128
	elog "the extra daemons you previously enabled in /etc/conf.d/bluetooth."
151
	elog ""
129
	elog
152
	elog "If you want to use rfcomm as a normal user, you need to add the user"
153
	elog "to the uucp group."
154
	elog ""
155
	if use old-daemons; then
130
	if use old-daemons; then
156
		elog "The hidd init script was installed because you have the old-daemons"
131
		elog "The hidd init script was installed because you have the old-daemons"
157
		elog "use flag on. It is not started by default via udev so please add it"
132
		elog "use flag on. It is not started by default via udev so please add it"
Lines 162-168 Link Here
162
		elog "The bluetooth service should be started automatically by udev"
137
		elog "The bluetooth service should be started automatically by udev"
163
		elog "when the required hardware is inserted next time."
138
		elog "when the required hardware is inserted next time."
164
	fi
139
	fi
165
	elog
166
	ewarn "On first install you need to run /etc/init.d/dbus reload or hcid"
167
	ewarn "will fail to start."
168
}
140
}

Return to bug 270859