Attachment #363818 for bug #490968





PYTHON_COMPAT=( python2_7 python3_{2,3} )

inherit eutils toolchain-funcs libtool flag-o-matic bash-completion-r1 python-single-r1 multilib-minimal

MY_PV=${PV/_/-}
MY_P=${PN}-${MY_PV}

	ncurses? ( >=sys-libs/ncurses-5.2-r2 )
	pam? ( sys-libs/pam )
	python? ( ${PYTHON_DEPS} )
	selinux? ( sys-libs/libselinux[${MULTILIB_USEDEP}] )
	slang? ( sys-libs/slang )
	udev? ( virtual/udev )"
DEPEND="${RDEPEND}

	rm -f "${T}"/fallocate.c
}

multilib_src_configure() {
	local CPPFLAGS=${CPPFLAGS} ac_cv_func_fallocate opts
	lfs_fallocate_test
	if multilib_build_binaries; then
		export ac_cv_header_security_pam_misc_h=$(usex pam) #485486
		opts=(
			--enable-agetty
			$(use_enable bash-completion)
			$(use_enable caps setpriv)
			$(use_enable cramfs)
			$(use_enable cytune)
			$(use_enable fdformat)
			--with-ncurses=$(usex ncurses $(usex unicode auto yes) no)
			$(use_enable tty-helpers mesg)
			--enable-partx
			$(use_with python)
			--enable-raw
			--enable-rename
			--enable-schedutils
			$(use_enable tty-helpers wall)
			$(use_enable tty-helpers write)
			$(use_enable suid makeinstall-chown)
			$(use_enable suid makeinstall-setuid)
			$(use_with slang)
			$(use_with udev)
		)
	else
		export ac_cv_header_security_pam_misc_h=no #485486
		opts=(
			--disable-agetty
			--disable-bash-completion
			--disable-setpriv
			--disable-cramfs
			--disable-cytune
			--disable-fdformat
			--without-ncurses
			--disable-mesg
			--disable-partx
			--without-python
			--disable-raw
			--disable-rename
			--disable-schedutils
			--disable-wall
			--disable-write
			--disable-makeinstall-chown
			--disable-makeinstall-setuid
			--without-slang
			--without-udev
		)
	fi

	ECONF_SOURCE="${S}" \
	econf \
		--enable-fs-paths-extra=/usr/sbin:/bin:/usr/bin \
		$(use_enable nls) \
		--enable-agetty \
		--with-bashcompletiondir="$(get_bashcompdir)" \
		$(use_enable bash-completion) \
		$(use_enable caps setpriv) \
		$(use_enable cramfs) \
		$(use_enable cytune) \
		$(use_enable fdformat) \
		--with-ncurses=$(usex ncurses $(usex unicode auto yes) no) \
		--disable-kill \
		--disable-last \
		--disable-login \
		$(use_enable tty-helpers mesg) \
		--disable-nologin \
		--enable-partx \
		$(use_with python) \
		--enable-raw \
		--enable-rename \
		--disable-reset \
		--enable-schedutils \
		--disable-su \
		$(use_enable tty-helpers wall) \
		$(use_enable tty-helpers write) \
		$(use_enable suid makeinstall-chown) \
		$(use_enable suid makeinstall-setuid) \
		$(use_with selinux) \
		$(use_with slang) \
		$(use_enable static-libs static) \
		$(tc-has-tls || echo --disable-tls) \
		"${opts[@]}"
}

multilib_src_compile() {
	if multilib_build_binaries; then
		default
	else
		emake libuuid.la libblkid.la libmount.la
	fi
}

multilib_src_install() {
	if multilib_build_binaries; then
		emake DESTDIR="${D}" install
		use python && python_optimize
	else
		emake DESTDIR="${D}" install-usrlib_execLTLIBRARIES \
			install-pkgconfigDATA install-uuidincHEADERS \
			install-nodist_blkidincHEADERS install-nodist_mountincHEADERS
	fi

	# need the libs in /
	gen_usr_ldscript -a blkid mount uuid

	prune_libtool_files
}

multilib_src_install_all() {
	dodoc AUTHORS NEWS README* Documentation/{TODO,*.txt,releases/*}
}

pkg_postinst() {
	if ! use tty-helpers; then
		elog "The mesg/wall/write tools have been disabled due to USE=-tty-helpers."

Return to bug 490968

Lines 6-12 EAPI=5 Link Here

(-)util-linux-2.24.ebuild (-28 / +75 lines)
6		6
7	PYTHON_COMPAT=( python2_7 python3_{2,3} )	7	PYTHON_COMPAT=( python2_7 python3_{2,3} )
8		8
9	inherit eutils toolchain-funcs libtool flag-o-matic bash-completion-r1 python-single-r1	9	inherit eutils toolchain-funcs libtool flag-o-matic bash-completion-r1 python-single-r1 multilib-minimal
10		10
11	MY_PV=${PV/_/-}	11	MY_PV=${PV/_/-}
12	MY_P=${PN}-${MY_PV}	12	MY_P=${PN}-${MY_PV}
Lines 38-44 RDEPEND="!sys-process/schedutils Link Here
38	ncurses? ( >=sys-libs/ncurses-5.2-r2 )	38	ncurses? ( >=sys-libs/ncurses-5.2-r2 )
39	pam? ( sys-libs/pam )	39	pam? ( sys-libs/pam )
40	python? ( ${PYTHON_DEPS} )	40	python? ( ${PYTHON_DEPS} )
41	selinux? ( sys-libs/libselinux )	41	selinux? ( sys-libs/libselinux[${MULTILIB_USEDEP}] )
42	slang? ( sys-libs/slang )	42	slang? ( sys-libs/slang )
43	udev? ( virtual/udev )"	43	udev? ( virtual/udev )"
44	DEPEND="${RDEPEND}	44	DEPEND="${RDEPEND}
Lines 76-123 lfs_fallocate_test() { Link Here
76	rm -f "${T}"/fallocate.c	76	rm -f "${T}"/fallocate.c
77	}	77	}
78		78
79	src_configure() {	79	multilib_src_configure() {
		80	local CPPFLAGS=${CPPFLAGS} ac_cv_func_fallocate opts
80	lfs_fallocate_test	81	lfs_fallocate_test
81	export ac_cv_header_security_pam_misc_h=$(usex pam) #485486	82	if multilib_build_binaries; then
		83	export ac_cv_header_security_pam_misc_h=$(usex pam) #485486
		84	opts=(
		85	--enable-agetty
		86	$(use_enable bash-completion)
		87	$(use_enable caps setpriv)
		88	$(use_enable cramfs)
		89	$(use_enable cytune)
		90	$(use_enable fdformat)
		91	--with-ncurses=$(usex ncurses $(usex unicode auto yes) no)
		92	$(use_enable tty-helpers mesg)
		93	--enable-partx
		94	$(use_with python)
		95	--enable-raw
		96	--enable-rename
		97	--enable-schedutils
		98	$(use_enable tty-helpers wall)
		99	$(use_enable tty-helpers write)
		100	$(use_enable suid makeinstall-chown)
		101	$(use_enable suid makeinstall-setuid)
		102	$(use_with slang)
		103	$(use_with udev)
		104	)
		105	else
		106	export ac_cv_header_security_pam_misc_h=no #485486
		107	opts=(
		108	--disable-agetty
		109	--disable-bash-completion
		110	--disable-setpriv
		111	--disable-cramfs
		112	--disable-cytune
		113	--disable-fdformat
		114	--without-ncurses
		115	--disable-mesg
		116	--disable-partx
		117	--without-python
		118	--disable-raw
		119	--disable-rename
		120	--disable-schedutils
		121	--disable-wall
		122	--disable-write
		123	--disable-makeinstall-chown
		124	--disable-makeinstall-setuid
		125	--without-slang
		126	--without-udev
		127	)
		128	fi
		129
		130	ECONF_SOURCE="${S}" \
82	econf \	131	econf \
83	--enable-fs-paths-extra=/usr/sbin:/bin:/usr/bin \	132	--enable-fs-paths-extra=/usr/sbin:/bin:/usr/bin \
84	$(use_enable nls) \	133	$(use_enable nls) \
85	--enable-agetty \
86	--with-bashcompletiondir="$(get_bashcompdir)" \	134	--with-bashcompletiondir="$(get_bashcompdir)" \
87	$(use_enable bash-completion) \
88	$(use_enable caps setpriv) \
89	$(use_enable cramfs) \
90	$(use_enable cytune) \
91	$(use_enable fdformat) \
92	--with-ncurses=$(usex ncurses $(usex unicode auto yes) no) \
93	--disable-kill \	135	--disable-kill \
94	--disable-last \	136	--disable-last \
95	--disable-login \	137	--disable-login \
96	$(use_enable tty-helpers mesg) \
97	--disable-nologin \	138	--disable-nologin \
98	--enable-partx \
99	$(use_with python) \
100	--enable-raw \
101	--enable-rename \
102	--disable-reset \	139	--disable-reset \
103	--enable-schedutils \
104	--disable-su \	140	--disable-su \
105	$(use_enable tty-helpers wall) \
106	$(use_enable tty-helpers write) \
107	$(use_enable suid makeinstall-chown) \
108	$(use_enable suid makeinstall-setuid) \
109	$(use_with selinux) \	141	$(use_with selinux) \
110	$(use_with slang) \
111	$(use_enable static-libs static) \	142	$(use_enable static-libs static) \
112	$(use_with udev) \	143	$(tc-has-tls \|\| echo --disable-tls) \
113	$(tc-has-tls \|\| echo --disable-tls)	144	"${opts[@]}"
114	}	145	}
115		146
116	src_install() {	147	multilib_src_compile() {
117	default	148	if multilib_build_binaries; then
118	dodoc AUTHORS NEWS README* Documentation/{TODO,.txt,releases/}	149	default
		150	else
		151	emake libuuid.la libblkid.la libmount.la
		152	fi
		153	}
119		154
120	use python && python_optimize	155	multilib_src_install() {
		156	if multilib_build_binaries; then
		157	emake DESTDIR="${D}" install
		158	use python && python_optimize
		159	else
		160	emake DESTDIR="${D}" install-usrlib_execLTLIBRARIES \
		161	install-pkgconfigDATA install-uuidincHEADERS \
		162	install-nodist_blkidincHEADERS install-nodist_mountincHEADERS
		163	fi
121		164
122	# need the libs in /	165	# need the libs in /
123	gen_usr_ldscript -a blkid mount uuid	166	gen_usr_ldscript -a blkid mount uuid
Lines 126-131 src_install() { Link Here
126	prune_libtool_files	169	prune_libtool_files
127	}	170	}
128		171
		172	multilib_src_install_all() {
		173	dodoc AUTHORS NEWS README* Documentation/{TODO,.txt,releases/}
		174	}
		175
129	pkg_postinst() {	176	pkg_postinst() {
130	if ! use tty-helpers; then	177	if ! use tty-helpers; then
131	elog "The mesg/wall/write tools have been disabled due to USE=-tty-helpers."	178	elog "The mesg/wall/write tools have been disabled due to USE=-tty-helpers."