Attachment #344508 for bug #461940

Lines 11-17 Link Here

(-)/home/ssuominen/gentoo-x86/sys-fs/udev/udev-9999.ebuild (-25 / +112 lines)
11	KV_min=2.6.32	11	KV_min=2.6.32
12	fi	12	fi
13		13
14	inherit autotools eutils linux-info multilib toolchain-funcs versionator	14	inherit autotools eutils linux-info multilib pam toolchain-funcs versionator
15		15
16	if [[ ${PV} = 9999* ]]; then	16	if [[ ${PV} = 9999* ]]; then
17	EGIT_REPO_URI="git://anongit.freedesktop.org/systemd/systemd"	17	EGIT_REPO_URI="git://anongit.freedesktop.org/systemd/systemd"
Lines 32-38 Link Here
32		32
33	LICENSE="LGPL-2.1 MIT GPL-2"	33	LICENSE="LGPL-2.1 MIT GPL-2"
34	SLOT="0"	34	SLOT="0"
35	IUSE="acl doc +firmware-loader gudev hwdb introspection keymap +kmod +openrc selinux static-libs"	35	IUSE="acl doc +firmware-loader gudev hwdb logind introspection keymap +kmod +openrc pam selinux static-libs"
36		36
37	RESTRICT="test"	37	RESTRICT="test"
38		38
Lines 40-45 Link Here
40	acl? ( sys-apps/acl )	40	acl? ( sys-apps/acl )
41	gudev? ( >=dev-libs/glib-2 )	41	gudev? ( >=dev-libs/glib-2 )
42	introspection? ( >=dev-libs/gobject-introspection-1.31.1 )	42	introspection? ( >=dev-libs/gobject-introspection-1.31.1 )
		43	logind? (
		44	sys-apps/dbus sys-libs/libcap
		45	pam? ( virtual/pam )
		46	)
43	kmod? ( >=sys-apps/kmod-12 )	47	kmod? ( >=sys-apps/kmod-12 )
44	selinux? ( >=sys-libs/libselinux-2.1.9 )	48	selinux? ( >=sys-libs/libselinux-2.1.9 )
45	!<sys-libs/glibc-2.11	49	!<sys-libs/glibc-2.11
Lines 52-57 Link Here
52	virtual/pkgconfig	56	virtual/pkgconfig
53	!<sys-kernel/linux-headers-${KV_min}	57	!<sys-kernel/linux-headers-${KV_min}
54	doc? ( >=dev-util/gtk-doc-1.18 )	58	doc? ( >=dev-util/gtk-doc-1.18 )
		59	logind? ( dev-util/gperf )
55	keymap? ( dev-util/gperf )"	60	keymap? ( dev-util/gperf )"
56		61
57	if [[ ${PV} = 9999* ]]; then	62	if [[ ${PV} = 9999* ]]; then
Lines 76-82 Link Here
76		81
77	S=${WORKDIR}/systemd-${PV}	82	S=${WORKDIR}/systemd-${PV}
78		83
79	#QA_MULTILIB_PATHS="lib/systemd/systemd-udevd"	84	QA_MULTILIB_PATHS="usr/lib/systemd/.*"
80		85
81	udev_check_KV() {	86	udev_check_KV() {
82	if kernel_is lt ${KV_min//./ }; then	87	if kernel_is lt ${KV_min//./ }; then
Lines 191-206 Link Here
191		196
192	src_configure() {	197	src_configure() {
193	tc-export CC #463846	198	tc-export CC #463846
194	use keymap \|\| export ac_cv_path_GPERF=true #452760
195		199
196	local econf_args	200	local econf_args
197
198	econf_args=(	201	econf_args=(
199	ac_cv_search_cap_init=
200	ac_cv_header_sys_capability_h=yes
201	DBUS_CFLAGS=' '
202	DBUS_LIBS=' '
203	--bindir=/bin
204	--docdir=/usr/share/doc/${PF}	202	--docdir=/usr/share/doc/${PF}
205	--libdir=/usr/$(get_libdir)	203	--libdir=/usr/$(get_libdir)
206	--with-html-dir=/usr/share/doc/${PF}/html	204	--with-html-dir=/usr/share/doc/${PF}/html
Lines 214-220 Link Here
214	--disable-ima	212	--disable-ima
215	--disable-libcryptsetup	213	--disable-libcryptsetup
216	--disable-localed	214	--disable-localed
217	--disable-logind
218	--disable-myhostname	215	--disable-myhostname
219	--disable-nls	216	--disable-nls
220	--disable-pam	217	--disable-pam
Lines 228-233 Link Here
228	$(use_enable acl)	225	$(use_enable acl)
229	$(use_enable doc gtk-doc)	226	$(use_enable doc gtk-doc)
230	$(use_enable gudev)	227	$(use_enable gudev)
		228	$(use_enable logind)
231	$(use_enable keymap)	229	$(use_enable keymap)
232	$(use_enable kmod)	230	$(use_enable kmod)
233	$(use_enable selinux)	231	$(use_enable selinux)
Lines 243-260 Link Here
243	--with-firmware-path="/lib/firmware/updates:/lib/firmware"	241	--with-firmware-path="/lib/firmware/updates:/lib/firmware"
244	)	242	)
245	fi	243	fi
		244	if ! use logind; then
		245	if ! use keymap; then
		246	econf_args+=(
		247	ac_cv_path_GPERF=true
		248	)
		249	fi
		250	econf_args+=(
		251	ac_cv_search_cap_init=
		252	ac_cv_header_sys_capability_h=yes
		253	DBUS_CFLAGS=' '
		254	DBUS_LIBS=' '
		255	)
		256	else
		257	if use pam; then
		258	econf_args+=(
		259	--enable-pam
		260	--with-pamlibdir="$(getpam_mod_dir)"
		261	)
		262	fi
		263	fi
246	econf "${econf_args[@]}"	264	econf "${econf_args[@]}"
247	}	265	}
248		266
249	src_compile() {	267	src_compile() {
250	echo 'BUILT_SOURCES: $(BUILT_SOURCES)' > "${T}"/Makefile.extra	268	echo 'BUILT_SOURCES: $(BUILT_SOURCES)' > "${T}"/Makefile.extra
251	emake -f Makefile -f "${T}"/Makefile.extra BUILT_SOURCES	269	emake -f Makefile -f "${T}"/Makefile.extra BUILT_SOURCES
252	local pretargets=(
253	libsystemd-shared.la
254	libudev-private.la
255	libudev.la
256	)
257	local targets=(	270	local targets=(
		271	libudev.la
258	systemd-udevd	272	systemd-udevd
259	udevadm	273	udevadm
260	ata_id	274	ata_id
Lines 271-279 Link Here
271	)	285	)
272	use keymap && targets+=( keymap )	286	use keymap && targets+=( keymap )
273	use gudev && targets+=( libgudev-1.0.la )	287	use gudev && targets+=( libgudev-1.0.la )
		288	if use logind; then
		289	targets+=(
		290	libsystemd-login.la
		291	systemd-logind
		292	loginctl
		293	man/loginctl.1
		294	man/sd-login.3
		295	man/sd_get_seats.3
		296	man/sd_login_monitor_new.3
		297	man/sd_pid_get_session.3
		298	man/sd_seat_get_active.3
		299	man/sd_session_is_active.3
		300	man/sd_uid_get_state.3
		301	man/systemd-user-sessions.service.8
		302	man/sd_get_sessions.3
		303	man/sd_get_uids.3
		304	man/sd_login_monitor.3
		305	man/sd_login_monitor_flush.3
		306	man/sd_login_monitor_get_fd.3
		307	man/sd_login_monitor_unref.3
		308	man/sd_pid_get_owner_uid.3
		309	man/sd_pid_get_unit.3
		310	man/sd_seat_can_multi_session.3
		311	man/sd_seat_get_sessions.3
		312	man/sd_session_get_class.3
		313	man/sd_session_get_display.3
		314	man/sd_session_get_seat.3
		315	man/sd_session_get_service.3
		316	man/sd_session_get_state.3
		317	man/sd_session_get_tty.3
		318	man/sd_session_get_type.3
		319	man/sd_session_get_uid.3
		320	man/sd_uid_get_seats.3
		321	man/sd_uid_get_sessions.3
		322	man/sd_uid_is_on_seat.3
		323	man/systemd-user-sessions.8
		324	)
		325	if use pam; then
		326	targets+=(
		327	pam_systemd.la
		328	man/pam_systemd.8
		329	)
		330	fi
		331	fi
274		332
275	emake "${pretargets[@]}"	333	emake -j1 "${targets[@]}"
276	emake "${targets[@]}"
277	if use doc; then	334	if use doc; then
278	emake -C docs/libudev	335	emake -C docs/libudev
279	use gudev && emake -C docs/gudev	336	use gudev && emake -C docs/gudev
Lines 282-294 Link Here
282		339
283	src_install() {	340	src_install() {
284	local lib_LTLIBRARIES="libudev.la" \	341	local lib_LTLIBRARIES="libudev.la" \
285	pkgconfiglib_DATA="src/libudev/libudev.pc"	342	pkgconfiglib_DATA="src/libudev/libudev.pc" \
		343	rootlibexec_PROGRAMS="systemd-udevd" \
		344	dist_bashcompletion_DATA="shell-completion/bash/udevadm" \
		345	rootbin_PROGRAMS="udevadm" \
		346	dist_pkgsysconf_DATA="" \
		347	MANPAGES="man/udev.7 man/udevadm.8 man/systemd-udevd.service.8" \
		348	pamlib_LTLIBRARIES=""
286		349
287	local targets=(	350	local targets=(
288	install-libLTLIBRARIES	351	install-libLTLIBRARIES
289	install-includeHEADERS	352	install-includeHEADERS
290	install-libgudev_includeHEADERS	353	install-libgudev_includeHEADERS
291	install-binPROGRAMS	354	install-binPROGRAMS
		355	install-rootbinPROGRAMS
292	install-rootlibexecPROGRAMS	356	install-rootlibexecPROGRAMS
293	install-udevlibexecPROGRAMS	357	install-udevlibexecPROGRAMS
294	install-dist_udevconfDATA	358	install-dist_udevconfDATA
Lines 297-302 Link Here
297	install-dist_udevkeymapforcerelDATA	361	install-dist_udevkeymapforcerelDATA
298	install-dist_udevrulesDATA	362	install-dist_udevrulesDATA
299	install-girDATA	363	install-girDATA
		364	install-man3
300	install-man7	365	install-man7
301	install-man8	366	install-man8
302	install-pkgconfiglibDATA	367	install-pkgconfiglibDATA
Lines 306-311 Link Here
306	libudev-install-hook	371	libudev-install-hook
307	install-directories-hook	372	install-directories-hook
308	install-dist_bashcompletionDATA	373	install-dist_bashcompletionDATA
		374	install-dist_pkgsysconfDATA
		375	install-pamlibLTLIBRARIES
309	)	376	)
310		377
311	if use gudev; then	378	if use gudev; then
Lines 313-331 Link Here
313	pkgconfiglib_DATA+=" src/gudev/gudev-1.0.pc"	380	pkgconfiglib_DATA+=" src/gudev/gudev-1.0.pc"
314	fi	381	fi
315		382
		383	if use logind; then
		384	dist_bashcompletion_DATA+=" shell-completion/bash/loginctl"
		385	lib_LTLIBRARIES+=" libsystemd-login.la"
		386	rootlibexec_PROGRAMS+=" systemd-logind systemd-user-sessions"
		387	rootbin_PROGRAMS+=" loginctl"
		388	pkgconfiglib_DATA+=" src/login/libsystemd-login.pc"
		389	dist_pkgsysconf_DATA+=" src/login/logind.conf"
		390	# MANPAGES+=" man/loginctl.1 man/sd-login.3 man/sd_get_seats.3 man/sd_login_monitor_new.3 man/sd_pid_get_session.3 man/sd_seat_get_active.3 man/sd_session_is_active.3 man/sd_uid_get_state.3 man/systemd-user-sessions.service.8 man/sd_get_sessions.3 man/sd_get_uids.3 man/sd_login_monitor.3 man/sd_login_monitor_flush.3 man/sd_login_monitor_get_fd.3 man/sd_login_monitor_unref.3 man/sd_pid_get_owner_uid.3 man/sd_pid_get_unit.3 man/sd_seat_can_multi_session.3 man/sd_seat_get_sessions.3 man/sd_session_get_class.3 man/sd_session_get_display.3 man/sd_session_get_seat.3 man/sd_session_get_service.3 man/sd_session_get_state.3 man/sd_session_get_tty.3 man/sd_session_get_type.3 man/sd_session_get_uid.3 man/sd_uid_get_seats.3 man/sd_uid_get_sessions.3 man/sd_uid_is_on_seat.3 man/systemd-user-sessions.8"
		391	if use pam; then
		392	MANPAGES+=" man/pam_systemd.8"
		393	pamlib_LTLIBRARIES+=" pam_systemd.la"
		394	fi
		395	fi
		396
316	# add final values of variables:	397	# add final values of variables:
317	targets+=(	398	targets+=(
318	rootlibexec_PROGRAMS=systemd-udevd	399	pamlib_LTLIBRARIES="${pamlib_LTLIBRARIES}"
319	bin_PROGRAMS=udevadm	400	rootlibexec_PROGRAMS="${rootlibexec_PROGRAMS}"
		401	rootbin_PROGRAMS="${rootbin_PROGRAMS}"
320	lib_LTLIBRARIES="${lib_LTLIBRARIES}"	402	lib_LTLIBRARIES="${lib_LTLIBRARIES}"
321	MANPAGES="man/udev.7 man/udevadm.8 \	403	MANPAGES="${MANPAGES}"
322	man/systemd-udevd.service.8"
323	MANPAGES_ALIAS="man/systemd-udevd.8"	404	MANPAGES_ALIAS="man/systemd-udevd.8"
324	pkgconfiglib_DATA="${pkgconfiglib_DATA}"	405	pkgconfiglib_DATA="${pkgconfiglib_DATA}"
325	INSTALL_DIRS='$(sysconfdir)/udev/rules.d \	406	INSTALL_DIRS='$(sysconfdir)/udev/rules.d \
326	$(sysconfdir)/udev/hwdb.d'	407	$(sysconfdir)/udev/hwdb.d'
327	dist_bashcompletion_DATA="shell-completion/bash/udevadm"	408	dist_bashcompletion_DATA="${dist_bashcompletion_DATA}"
		409	dist_pkgsysconf_DATA="${dist_pkgsysconf_DATA}"
328	)	410	)
		411
329	emake -j1 DESTDIR="${D}" "${targets[@]}"	412	emake -j1 DESTDIR="${D}" "${targets[@]}"
330	if use doc; then	413	if use doc; then
331	emake -C docs/libudev DESTDIR="${D}" install	414	emake -C docs/libudev DESTDIR="${D}" install
Lines 349-355 Link Here
349	# install udevd to /sbin and remove empty and redudant directory	432	# install udevd to /sbin and remove empty and redudant directory
350	# /lib/systemd because systemd is installed to /usr wrt #462750	433	# /lib/systemd because systemd is installed to /usr wrt #462750
351	mv "${D}"/{lib/systemd/systemd-,sbin/}udevd \|\| die	434	mv "${D}"/{lib/systemd/systemd-,sbin/}udevd \|\| die
352	rm -r "${D}"/lib/systemd	435	if use logind; then
		436	mv "${D}"/{lib,usr/lib}/systemd
		437	else
		438	rm -r "${D}"/lib/systemd
		439	fi
353	}	440	}
354		441
355	pkg_preinst() {	442	pkg_preinst() {

Return to bug 461940