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

Collapse All | Expand All

(-)/usr/portage/sys-apps/dbus/dbus-1.8.6.ebuild (-3 / +31 lines)
Lines 101-114 Link Here
101
		--disable-embedded-tests
101
		--disable-embedded-tests
102
		--disable-modular-tests
102
		--disable-modular-tests
103
		$(use_enable debug stats)
103
		$(use_enable debug stats)
104
		--with-session-socket-dir=/tmp
104
		--with-session-socket-dir="${EPREFIX}"/tmp
105
		--with-system-pid-file=/var/run/dbus.pid
105
		--with-system-pid-file="${EPREFIX}"/var/run/dbus.pid
106
		--with-system-socket=/var/run/dbus/system_bus_socket
106
		--with-system-socket="${EPREFIX}"/var/run/dbus/system_bus_socket
107
		--with-dbus-user=messagebus
107
		--with-dbus-user=messagebus
108
		$(use_with X x)
108
		$(use_with X x)
109
		"$(systemd_with_unitdir)"
109
		"$(systemd_with_unitdir)"
110
		)
110
		)
111
111
112
	if [[ ${CHOST} == *-darwin* ]]; then
113
		myconf+=(
114
			--enable-launchd
115
			--with-launchd-agent-dir="${EPREFIX}"/Library/LaunchAgents
116
		)
117
	fi
118
112
	if multilib_is_native_abi; then
119
	if multilib_is_native_abi; then
113
		docconf=(
120
		docconf=(
114
			--enable-xml-docs
121
			--enable-xml-docs
Lines 222-225 Link Here
222
	# dependencies with hardcoded paths (although the known ones got fixed already)
229
	# dependencies with hardcoded paths (although the known ones got fixed already)
223
	dbus-uuidgen --ensure="${EROOT%/}"/etc/machine-id
230
	dbus-uuidgen --ensure="${EROOT%/}"/etc/machine-id
224
	ln -sf "${EROOT%/}"/etc/machine-id "${EROOT%/}"/var/lib/dbus/machine-id
231
	ln -sf "${EROOT%/}"/etc/machine-id "${EROOT%/}"/var/lib/dbus/machine-id
232
233
	if [[ ${CHOST} == *-darwin* ]]; then
234
		local plist="org.freedesktop.dbus-session.plist"
235
		elog
236
		elog
237
		elog "For MacOS/Darwin we now ship launchd support for dbus."
238
		elog "This enables autolaunch of dbus at session login and makes"
239
		elog "dbus usable under MacOS/Darwin."
240
		elog
241
		elog "The launchd plist file ${plist} has been"
242
		elog "installed in ${EPREFIX}/Library/LaunchAgents."
243
		elog "For it to be used, you will have to do all of the following:"
244
		elog " + cd ~/Library/LaunchAgents"
245
		elog " + ln -s ${EPREFIX}/Library/LaunchAgents/${plist}"
246
		elog " + logout and log back in"
247
		elog
248
		elog "If your application needs a proper DBUS_SESSION_BUS_ADDRESS"
249
		elog "specified and refused to start otherwise, then export the"
250
		elog "the following to your environment:"
251
		elog " DBUS_SESSION_BUS_ADDRESS=\"launchd:env=DBUS_LAUNCHD_SESSION_BUS_SOCKET\""
252
	fi
225
}
253
}

Return to bug 518954