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 (-55 / +28 lines)
Lines 13-24 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 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? (
20
		>=media-libs/gstreamer-0.10
20
		>=media-libs/gstreamer-0.10
21
		>=media-libs/gst-plugins-base-0.10 )
21
		>=media-libs/gst-plugins-base-0.10
22
	)
22
	usb? ( dev-libs/libusb )
23
	usb? ( dev-libs/libusb )
23
	cups? ( net-print/cups )
24
	cups? ( net-print/cups )
24
	sys-fs/udev
25
	sys-fs/udev
Lines 28-61 Link Here
28
	>=dev-libs/libnl-1.1
29
	>=dev-libs/libnl-1.1
29
	!net-wireless/bluez-libs
30
	!net-wireless/bluez-libs
30
	!net-wireless/bluez-utils"
31
	!net-wireless/bluez-utils"
31
DEPEND="sys-devel/flex
32
DEPEND="${CDEPEND}
32
	>=dev-util/pkgconfig-0.20
33
	>=dev-util/pkgconfig-0.20
33
	doc? ( dev-util/gtk-doc )
34
	sys-devel/bison
34
	${CDEPEND}"
35
	sys-devel/flex"
35
RDEPEND="${CDEPEND}
36
RDEPEND="${CDEPEND}
36
	sys-auth/pambase[consolekit]"
37
	consolekit? ( sys-auth/pambase[consolekit] )
38
	test-programs? (
39
		dev-python/dbus-python
40
		dev-python/pygobject
41
	)"
37
42
38
src_prepare() {
43
src_prepare() {
39
	epatch \
44
	epatch \
40
		"${FILESDIR}/4.31-as_needed.patch" \
45
		"${FILESDIR}/4.50-conditional-libsbc.patch" \
41
		"${FILESDIR}/4.34-conditional_libsbc.patch"
46
		"${FILESDIR}/4.50-cups-location.patch"
42
43
	if use cups; then
44
		epatch "${FILESDIR}/4.18/cups-location.patch"
45
	fi
46
47
47
	# needed for both patches
48
	# needed for both patches
48
	eautoreconf
49
	eautoreconf
49
}
50
}
50
51
51
src_configure() {
52
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 \
53
	econf \
58
		$(use_enable doc gtk-doc) \
59
		--enable-network \
54
		--enable-network \
60
		--enable-serial \
55
		--enable-serial \
61
		--enable-input \
56
		--enable-input \
Lines 67-72 Link Here
67
		--enable-netlink \
62
		--enable-netlink \
68
		--enable-tools \
63
		--enable-tools \
69
		--enable-bccmd \
64
		--enable-bccmd \
65
		$(use_enable pcmcia) \
70
		--enable-hid2hci \
66
		--enable-hid2hci \
71
		--enable-dfutool \
67
		--enable-dfutool \
72
		$(use_enable old-daemons hidd) \
68
		$(use_enable old-daemons hidd) \
Lines 74-92 Link Here
74
		$(use_enable old-daemons dund) \
70
		$(use_enable old-daemons dund) \
75
		$(use_enable cups) \
71
		$(use_enable cups) \
76
		$(use_enable test-programs test) \
72
		$(use_enable test-programs test) \
77
		--enable-manpages \
73
		--enable-udevrules \
78
		--enable-configfiles \
74
		--enable-configfiles \
79
		--disable-initscripts \
80
		--disable-pcmciarules \
81
		$(use_enable debug) \
75
		$(use_enable debug) \
82
		--localstatedir=/var
76
		--localstatedir=/var
83
}
77
}
84
78
85
src_install() {
79
src_install() {
86
	emake DESTDIR="${D}" install || die "make install failed"
80
	emake DESTDIR="${D}" install || die "make install failed"
87
88
	dodoc AUTHORS ChangeLog README || die
81
	dodoc AUTHORS ChangeLog README || die
89
82
83
	# don't install useless .la files
84
	find "${D}" -type f -name '*.la' -delete || die "failed to remove .la files"
85
90
	if use test-programs ; then
86
	if use test-programs ; then
91
		cd "${S}/test"
87
		cd "${S}/test"
92
		dobin simple-agent simple-service monitor-bluetooth
88
		dobin simple-agent simple-service monitor-bluetooth
Lines 96-157 Link Here
96
		done
92
		done
97
		insinto /usr/share/doc/${PF}/test-services
93
		insinto /usr/share/doc/${PF}/test-services
98
		doins service-*
94
		doins service-*
99
100
		cd "${S}"
95
		cd "${S}"
101
	fi
96
	fi
102
97
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
98
	if use old-daemons; then
107
		newconfd "${FILESDIR}/4.18/conf.d-hidd" hidd || die
99
		newconfd "${FILESDIR}/4.18/conf.d-hidd" hidd || die
108
		newinitd "${FILESDIR}/4.18/init.d-hidd" hidd || die
100
		newinitd "${FILESDIR}/4.18/init.d-hidd" hidd || die
109
	fi
101
	fi
110
102
111
	# bug #84431
103
	## 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
104
120
	insinto /etc/bluetooth
105
	insinto /etc/bluetooth
121
	doins \
106
	doins \
122
		input/input.conf \
107
		input/input.conf \
123
		audio/audio.conf \
108
		audio/audio.conf \
124
		network/network.conf
109
		network/network.conf \
110
		|| die
125
}
111
}
126
112
127
pkg_postinst() {
113
pkg_postinst() {
128
	udevadm control --reload_rules && udevadm trigger
114
	udevadm control --reload-rules && udevadm trigger --subsystem-match=bluetooth
129
115
130
	elog
131
	elog "To use dial up networking you must install net-dialup/ppp."
116
	elog "To use dial up networking you must install net-dialup/ppp."
132
	elog ""
117
	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"
118
	elog "For a password agent, there is for example net-wireless/bluez-gnome"
136
	elog "for gnome and net-wireless/kdebluetooth for kde."
119
	elog "for gnome and net-wireless/kdebluetooth for kde."
137
	elog ""
120
	elog
138
	elog "Since 3.10.1 we don't install the old style daemons any more but rely"
121
	elog "If you want to use rfcomm as a normal user, you need to add the user"
139
	elog "on the new service architechture:"
122
	elog "to the uucp group."
140
	elog "	http://wiki.bluez.org/wiki/Services"
123
	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"
124
	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"
125
	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:"
126
	elog "daemons after you update it so it's recommended to run:"
148
	elog "  /etc/init.d/bluetooth stop"
127
	elog "  /etc/init.d/bluetooth stop"
149
	elog "before updating your configuration files or you can manually kill"
128
	elog "before updating your configuration files or you can manually kill"
150
	elog "the extra daemons you previously enabled in /etc/conf.d/bluetooth."
129
	elog "the extra daemons you previously enabled in /etc/conf.d/bluetooth."
151
	elog ""
130
	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
131
	if use old-daemons; then
156
		elog "The hidd init script was installed because you have the old-daemons"
132
		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"
133
		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"
138
		elog "The bluetooth service should be started automatically by udev"
163
		elog "when the required hardware is inserted next time."
139
		elog "when the required hardware is inserted next time."
164
	fi
140
	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
}
141
}

Return to bug 270859