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

Collapse All | Expand All

(-)a/net-wireless/bluez/bluez-5.49.ebuild (-7 / +13 lines)
Lines 22-42 REQUIRED_USE=" Link Here
22
	extra-tools? ( deprecated readline )
22
	extra-tools? ( deprecated readline )
23
	test? ( ${PYTHON_REQUIRED_USE} )
23
	test? ( ${PYTHON_REQUIRED_USE} )
24
	test-programs? ( ${PYTHON_REQUIRED_USE} )
24
	test-programs? ( ${PYTHON_REQUIRED_USE} )
25
	user-session? ( systemd )
26
"
25
"
27
26
28
CDEPEND="
27
CDEPEND="
29
	>=dev-libs/glib-2.28:2[${MULTILIB_USEDEP}]
28
	>=dev-libs/glib-2.28:2[${MULTILIB_USEDEP}]
30
	>=sys-apps/dbus-1.6:=[user-session=]
31
	>=sys-apps/hwids-20121202.2
29
	>=sys-apps/hwids-20121202.2
32
	alsa? ( media-libs/alsa-lib )
30
	alsa? ( media-libs/alsa-lib )
33
	cups? ( net-print/cups:= )
31
	cups? ( net-print/cups:= )
34
	mesh? (
32
	mesh? (
35
		dev-libs/json-c:=
33
		dev-libs/json-c:=
36
		sys-libs/readline:0= )
34
		sys-libs/readline:0=
35
	)
37
	obex? ( dev-libs/libical:= )
36
	obex? ( dev-libs/libical:= )
38
	readline? ( sys-libs/readline:0= )
37
	readline? ( sys-libs/readline:0= )
39
	systemd? ( sys-apps/systemd )
38
	systemd? (
39
		>=sys-apps/dbus-1.6:=[user-session=]
40
		sys-apps/systemd
41
	)
42
	!systemd? ( >=sys-apps/dbus-1.6:= )
40
	udev? ( >=virtual/udev-172 )
43
	udev? ( >=virtual/udev-172 )
41
"
44
"
42
TEST_DEPS="${PYTHON_DEPS}
45
TEST_DEPS="${PYTHON_DEPS}
Lines 98-104 src_prepare() { Link Here
98
	default
101
	default
99
102
100
	# http://www.spinics.net/lists/linux-bluetooth/msg38490.html
103
	# http://www.spinics.net/lists/linux-bluetooth/msg38490.html
101
	! use user-session && eapply "${FILESDIR}"/0001-Allow-using-obexd-without-systemd-in-the-user-sessio.patch
104
	if ! use user-session || ! use systemd; then
105
		eapply "${FILESDIR}"/0001-Allow-using-obexd-without-systemd-in-the-user-sessio.patch
106
	fi
102
107
103
	if use cups; then
108
	if use cups; then
104
		sed -i \
109
		sed -i \
Lines 227-233 multilib_src_install_all() { Link Here
227
	# https://bugs.archlinux.org/task/45816
232
	# https://bugs.archlinux.org/task/45816
228
	# https://bugzilla.redhat.com/show_bug.cgi?id=1318441
233
	# https://bugzilla.redhat.com/show_bug.cgi?id=1318441
229
	# https://bugzilla.redhat.com/show_bug.cgi?id=1389347
234
	# https://bugzilla.redhat.com/show_bug.cgi?id=1389347
230
	use user-session && ln -s "${ED}"/usr/lib/systemd/user/obex.service "${ED}"/usr/lib/systemd/user/dbus-org.bluez.obex.service
235
	if use user-session && use systemd; then
236
		ln -s "${ED}"/usr/lib/systemd/user/obex.service "${ED}"/usr/lib/systemd/user/dbus-org.bluez.obex.service
237
	fi
231
238
232
	find "${D}" -name '*.la' -delete || die
239
	find "${D}" -name '*.la' -delete || die
233
240
234
- 

Return to bug 639434