Gentoo Archives: gentoo-commits

From: Lars Wendler <polynomial-c@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/util-linux/files/, sys-apps/util-linux/
Date: Wed, 26 Sep 2018 13:35:15
Message-Id: 1537968902.fd738e2f9e26c7b42779593cabf9634663fa4f5f.polynomial-c@gentoo
1 commit: fd738e2f9e26c7b42779593cabf9634663fa4f5f
2 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
3 AuthorDate: Wed Sep 26 13:34:15 2018 +0000
4 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
5 CommitDate: Wed Sep 26 13:35:02 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fd738e2f
7
8 sys-apps/util-linux: Removed old.
9
10 Package-Manager: Portage-2.3.50, Repoman-2.3.11
11
12 sys-apps/util-linux/Manifest | 1 -
13 .../util-linux-2.32_rc2-umount_completion.patch | 41 ----
14 sys-apps/util-linux/util-linux-2.30.2-r1.ebuild | 212 ------------------
15 sys-apps/util-linux/util-linux-2.32-r5.ebuild | 242 ---------------------
16 4 files changed, 496 deletions(-)
17
18 diff --git a/sys-apps/util-linux/Manifest b/sys-apps/util-linux/Manifest
19 index 18bd746f782..c05e3967f53 100644
20 --- a/sys-apps/util-linux/Manifest
21 +++ b/sys-apps/util-linux/Manifest
22 @@ -1,4 +1,3 @@
23 -DIST util-linux-2.30.2.tar.xz 4442624 BLAKE2B 7b76e255c9ee4d8b8f65f037a735808233edcdb8dce951038ae8983a3f4a6e493458622f6c7f6ce68d38672ac6dc5258b45b787c196dabede41cb19afc76e545 SHA512 b92ec16d5e8a405ad9ebbac8673bb49c5bf0a7f630118477f12c7a3c6b3b3ee5d56868632dd71fffd5c0434821207c2769f6859b9d398c2df770ec6487d7c32d
24 DIST util-linux-2.32.1.tar.xz 4561088 BLAKE2B 9e89b7fa2eacd51ad8c5cf90cc78df73de5d414c1039bb38784a376841806c1e0d38b702d29c6a8e91a2c3464fec1edcf68caaaa655400db2e5be483eb5efbcf SHA512 267fedae24a874ee4dc558081f6b8d07b33b955b0635f3348f021c111c17f2e95c01b2cbf909fe13c6ca448cbcf23c658c75f72f25749aa65e99f68fabb94698
25 DIST util-linux-2.32.tar.xz 4550128 BLAKE2B 0ce22bf93f98ac9827632094b2c3d50280da40394b910e483bf697c8751d532fea7006195baeef0dbc14708edd1204db8e2c87b22bd9f799911c61144a531bb0 SHA512 320c8d364f014aba16483dd26564d7cb47804337567c3e9c2dc495f3865f524e7480d3fec7ef5a05b6e99763b0278da70fffe6d2b88f3f1a832ada5932556482
26 DIST util-linux-2.33-rc1.tar.xz 4619236 BLAKE2B cee133c9d17fd86c5750d3a53e86d0beae2a53db7cf56b7602a7d497d5d615a85ed21ec8349b4a30b5d5dce3e29b3ac421e969b2a9230efca89ed8260f120352 SHA512 7a9de1a60854892f8b3215964a1a934d1fbcce92e159e542977094cbf12e156f37954764cf955e911f28411b8996ac1496c471d560d534204f9b6970dd605684
27
28 diff --git a/sys-apps/util-linux/files/util-linux-2.32_rc2-umount_completion.patch b/sys-apps/util-linux/files/util-linux-2.32_rc2-umount_completion.patch
29 deleted file mode 100644
30 index 1317c56f89e..00000000000
31 --- a/sys-apps/util-linux/files/util-linux-2.32_rc2-umount_completion.patch
32 +++ /dev/null
33 @@ -1,41 +0,0 @@
34 -From 75f03badd7ed9f1dd951863d75e756883d3acc55 Mon Sep 17 00:00:00 2001
35 -From: Karel Zak <kzak@××××××.com>
36 -Date: Thu, 16 Nov 2017 16:27:32 +0100
37 -Subject: [PATCH] bash-completion: (umount) use findmnt, escape a space in
38 - paths
39 -
40 - # mount /dev/sdc1 /mnt/test/foo\ bar
41 - # umount <tab>
42 -
43 -has to return "/mnt/test/foo\ bar".
44 -
45 -Changes:
46 -
47 - * don't use mount | awk output, we have findmnt
48 - * force compgen use \n as entries separator
49 -
50 -Addresses: https://github.com/karelzak/util-linux/issues/539
51 -Signed-off-by: Karel Zak <kzak@××××××.com>
52 ----
53 - bash-completion/umount | 9 +++++----
54 - 1 file changed, 5 insertions(+), 4 deletions(-)
55 -
56 -diff --git a/bash-completion/umount b/bash-completion/umount
57 -index d76cb9fff..98c90d61a 100644
58 ---- a/bash-completion/umount
59 -+++ b/bash-completion/umount
60 -@@ -40,9 +40,10 @@ _umount_module()
61 - return 0
62 - ;;
63 - esac
64 -- local DEVS_MPOINTS
65 -- DEVS_MPOINTS="$(mount | awk '{print $1, $3}')"
66 -- COMPREPLY=( $(compgen -W "$DEVS_MPOINTS" -- $cur) )
67 -- return 0
68 -+
69 -+ local oldifs=$IFS
70 -+ IFS=$'\n'
71 -+ COMPREPLY=( $( compgen -W '$(findmnt -lno TARGET | sed "s/\([[:blank:]]\)/\\\\\1/g")' -- "$cur" ) )
72 -+ IFS=$oldifs
73 - }
74 - complete -F _umount_module umount
75
76 diff --git a/sys-apps/util-linux/util-linux-2.30.2-r1.ebuild b/sys-apps/util-linux/util-linux-2.30.2-r1.ebuild
77 deleted file mode 100644
78 index dae5303c3ee..00000000000
79 --- a/sys-apps/util-linux/util-linux-2.30.2-r1.ebuild
80 +++ /dev/null
81 @@ -1,212 +0,0 @@
82 -# Copyright 1999-2018 Gentoo Foundation
83 -# Distributed under the terms of the GNU General Public License v2
84 -
85 -EAPI=6
86 -
87 -PYTHON_COMPAT=( python2_7 )
88 -
89 -inherit toolchain-funcs libtool flag-o-matic bash-completion-r1 \
90 - pam python-single-r1 multilib-minimal multiprocessing systemd
91 -
92 -MY_PV="${PV/_/-}"
93 -MY_P="${PN}-${MY_PV}"
94 -
95 -if [[ ${PV} == 9999 ]] ; then
96 - inherit git-r3 autotools
97 - EGIT_REPO_URI="git://git.kernel.org/pub/scm/utils/util-linux/util-linux.git"
98 -else
99 - [[ "${PV}" = *_rc* ]] || \
100 - KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~x86-linux"
101 - SRC_URI="mirror://kernel/linux/utils/util-linux/v${PV:0:4}/${MY_P}.tar.xz"
102 -fi
103 -
104 -DESCRIPTION="Various useful Linux utilities"
105 -HOMEPAGE="https://www.kernel.org/pub/linux/utils/util-linux/"
106 -
107 -LICENSE="GPL-2 LGPL-2.1 BSD-4 MIT public-domain"
108 -SLOT="0"
109 -IUSE="build caps +cramfs fdformat kill ncurses nls pam python +readline selinux slang static-libs +suid systemd test tty-helpers udev unicode"
110 -
111 -# Most lib deps here are related to programs rather than our libs,
112 -# so we rarely need to specify ${MULTILIB_USEDEP}.
113 -RDEPEND="caps? ( sys-libs/libcap-ng )
114 - cramfs? ( sys-libs/zlib )
115 - ncurses? ( >=sys-libs/ncurses-5.2-r2:0=[unicode?] )
116 - pam? ( sys-libs/pam )
117 - python? ( ${PYTHON_DEPS} )
118 - readline? ( sys-libs/readline:0= )
119 - selinux? ( >=sys-libs/libselinux-2.2.2-r4[${MULTILIB_USEDEP}] )
120 - slang? ( sys-libs/slang )
121 - !build? ( systemd? ( sys-apps/systemd ) )
122 - udev? ( virtual/libudev:= )"
123 -DEPEND="${RDEPEND}
124 - virtual/pkgconfig
125 - nls? ( sys-devel/gettext )
126 - test? ( sys-devel/bc )
127 - virtual/os-headers"
128 -RDEPEND+="
129 - kill? (
130 - !sys-apps/coreutils[kill]
131 - !sys-process/procps[kill]
132 - )
133 - !sys-process/schedutils
134 - !sys-apps/setarch
135 - !<sys-apps/sysvinit-2.88-r7
136 - !<sys-libs/e2fsprogs-libs-1.41.8
137 - !<sys-fs/e2fsprogs-1.41.8
138 - !<app-shells/bash-completion-2.3-r2
139 - !<sys-apps/s390-tools-1.36.1-r1"
140 -
141 -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
142 -
143 -S="${WORKDIR}/${MY_P}"
144 -
145 -PATCHES=(
146 - "${FILESDIR}/${PN}-2.32_rc2-umount_completion.patch" #649812
147 -)
148 -
149 -pkg_setup() {
150 - use python && python-single-r1_pkg_setup
151 -}
152 -
153 -src_prepare() {
154 - default
155 -
156 - # Prevent uuidd test failure due to socket path limit. #593304
157 - sed -i \
158 - -e "s|UUIDD_SOCKET=\"\$(mktemp -u \"\${TS_OUTDIR}/uuiddXXXXXXXXXXXXX\")\"|UUIDD_SOCKET=\"\$(mktemp -u \"${T}/uuiddXXXXXXXXXXXXX.sock\")\"|g" \
159 - tests/ts/uuid/uuidd || die "Failed to fix uuidd test"
160 -
161 - if [[ ${PV} == 9999 ]] ; then
162 - po/update-potfiles
163 - eautoreconf
164 - fi
165 -
166 - # Undo bad ncurses handling by upstream. #601530
167 - sed -i -E \
168 - -e '/NCURSES_/s:(ncursesw?)[56]-config:$PKG_CONFIG \1:' \
169 - -e 's:(ncursesw?)[56]-config --version:$PKG_CONFIG --exists --print-errors \1:' \
170 - configure || die
171 -
172 - elibtoolize
173 -}
174 -
175 -lfs_fallocate_test() {
176 - # Make sure we can use fallocate with LFS #300307
177 - cat <<-EOF > "${T}"/fallocate.${ABI}.c
178 - #define _GNU_SOURCE
179 - #include <fcntl.h>
180 - main() { return fallocate(0, 0, 0, 0); }
181 - EOF
182 - append-lfs-flags
183 - $(tc-getCC) ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} "${T}"/fallocate.${ABI}.c -o /dev/null >/dev/null 2>&1 \
184 - || export ac_cv_func_fallocate=no
185 - rm -f "${T}"/fallocate.${ABI}.c
186 -}
187 -
188 -multilib_src_configure() {
189 - lfs_fallocate_test
190 - # The scanf test in a run-time test which fails while cross-compiling.
191 - # Blindly assume a POSIX setup since we require libmount, and libmount
192 - # itself fails when the scanf test fails. #531856
193 - tc-is-cross-compiler && export scanf_cv_alloc_modifier=ms
194 - export ac_cv_header_security_pam_misc_h=$(multilib_native_usex pam) #485486
195 - export ac_cv_header_security_pam_appl_h=$(multilib_native_usex pam) #545042
196 -
197 - local myeconfargs=(
198 - --disable-chfn-chsh
199 - --disable-login
200 - --disable-nologin
201 - --disable-reset
202 - --disable-su
203 - --docdir='${datarootdir}'/doc/${PF}
204 - --enable-agetty
205 - --enable-bash-completion
206 - --enable-fs-paths-extra="${EPREFIX}/usr/sbin:${EPREFIX}/bin:${EPREFIX}/usr/bin"
207 - --enable-line
208 - --enable-partx
209 - --enable-raw
210 - --enable-rename
211 - --enable-schedutils
212 - --with-bashcompletiondir="$(get_bashcompdir)"
213 - --with-systemdsystemunitdir=$(multilib_native_usex systemd "$(systemd_get_systemunitdir)" "no")
214 - $(multilib_native_use_enable caps setpriv)
215 - $(multilib_native_use_enable cramfs)
216 - $(multilib_native_use_enable fdformat)
217 - $(multilib_native_use_enable nls)
218 - $(multilib_native_use_enable suid makeinstall-chown)
219 - $(multilib_native_use_enable suid makeinstall-setuid)
220 - $(multilib_native_use_enable tty-helpers mesg)
221 - $(multilib_native_use_enable tty-helpers wall)
222 - $(multilib_native_use_enable tty-helpers write)
223 - $(multilib_native_use_with python)
224 - $(multilib_native_use_with readline)
225 - $(multilib_native_use_with slang)
226 - $(multilib_native_use_with systemd)
227 - $(multilib_native_use_with udev)
228 - $(multilib_native_usex ncurses "$(use_with unicode ncursesw)" '--without-ncursesw')
229 - $(multilib_native_usex ncurses "$(use_with !unicode ncurses)" '--without-ncurses')
230 - $(tc-has-tls || echo --disable-tls)
231 - $(use_enable unicode widechar)
232 - $(use_enable kill)
233 - $(use_enable static-libs static)
234 - $(use_with selinux)
235 - $(usex ncurses '' '--without-tinfo')
236 - )
237 - ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
238 -}
239 -
240 -multilib_src_compile() {
241 - if multilib_is_native_abi; then
242 - default
243 - else
244 - # build libraries only
245 - emake -f Makefile -f - mylibs \
246 - <<< 'mylibs: $(usrlib_exec_LTLIBRARIES) $(pkgconfig_DATA)'
247 - fi
248 -}
249 -
250 -multilib_src_test() {
251 - multilib_is_native_abi && emake check TS_OPTS="--parallel=$(makeopts_jobs) --nonroot"
252 -}
253 -
254 -multilib_src_install() {
255 - if multilib_is_native_abi; then
256 - default
257 - else
258 - emake DESTDIR="${D}" install-usrlib_execLTLIBRARIES \
259 - install-pkgconfigDATA install-uuidincHEADERS \
260 - install-nodist_blkidincHEADERS install-nodist_mountincHEADERS \
261 - install-nodist_smartcolsincHEADERS install-nodist_fdiskincHEADERS
262 - fi
263 -
264 - if multilib_is_native_abi; then
265 - # need the libs in /
266 - gen_usr_ldscript -a blkid mount smartcols uuid
267 -
268 - use python && python_optimize
269 - fi
270 -}
271 -
272 -multilib_src_install_all() {
273 - dodoc AUTHORS NEWS README* Documentation/{TODO,*.txt,releases/*}
274 -
275 - # e2fsprogs-libs didnt install .la files, and .pc work fine
276 - find "${ED}" -name "*.la" -delete || die
277 -
278 - if use pam; then
279 - newpamd "${FILESDIR}/runuser.pamd" runuser
280 - newpamd "${FILESDIR}/runuser-l.pamd" runuser-l
281 - fi
282 -}
283 -
284 -pkg_postinst() {
285 - if ! use tty-helpers; then
286 - elog "The mesg/wall/write tools have been disabled due to USE=-tty-helpers."
287 - fi
288 -
289 - if [[ -z ${REPLACING_VERSIONS} ]]; then
290 - elog "The agetty util now clears the terminal by default. You"
291 - elog "might want to add --noclear to your /etc/inittab lines."
292 - fi
293 -}
294
295 diff --git a/sys-apps/util-linux/util-linux-2.32-r5.ebuild b/sys-apps/util-linux/util-linux-2.32-r5.ebuild
296 deleted file mode 100644
297 index 9c2f9a602d9..00000000000
298 --- a/sys-apps/util-linux/util-linux-2.32-r5.ebuild
299 +++ /dev/null
300 @@ -1,242 +0,0 @@
301 -# Copyright 1999-2018 Gentoo Foundation
302 -# Distributed under the terms of the GNU General Public License v2
303 -
304 -EAPI=6
305 -
306 -PYTHON_COMPAT=( python2_7 python3_{4,5,6,7} )
307 -
308 -inherit toolchain-funcs libtool flag-o-matic bash-completion-r1 \
309 - pam python-single-r1 multilib-minimal multiprocessing systemd
310 -
311 -MY_PV="${PV/_/-}"
312 -MY_P="${PN}-${MY_PV}"
313 -
314 -if [[ ${PV} == 9999 ]] ; then
315 - inherit git-r3 autotools
316 - EGIT_REPO_URI="https://git.kernel.org/pub/scm/utils/util-linux/util-linux.git"
317 -else
318 - [[ "${PV}" = *_rc* ]] || \
319 - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~amd64-linux ~x86-linux"
320 - SRC_URI="mirror://kernel/linux/utils/util-linux/v${PV:0:4}/${MY_P}.tar.xz"
321 -fi
322 -
323 -DESCRIPTION="Various useful Linux utilities"
324 -HOMEPAGE="https://www.kernel.org/pub/linux/utils/util-linux/ https://github.com/karelzak/util-linux"
325 -
326 -LICENSE="GPL-2 LGPL-2.1 BSD-4 MIT public-domain"
327 -SLOT="0"
328 -IUSE="build caps +cramfs fdformat kill ncurses nls pam python +readline selinux slang static-libs +suid systemd test tty-helpers udev unicode userland_GNU"
329 -
330 -# Most lib deps here are related to programs rather than our libs,
331 -# so we rarely need to specify ${MULTILIB_USEDEP}.
332 -RDEPEND="caps? ( sys-libs/libcap-ng )
333 - cramfs? ( sys-libs/zlib:= )
334 - ncurses? ( >=sys-libs/ncurses-5.2-r2:0=[unicode?] )
335 - nls? ( virtual/libintl[${MULTILIB_USEDEP}] )
336 - pam? ( sys-libs/pam )
337 - python? ( ${PYTHON_DEPS} )
338 - readline? ( sys-libs/readline:0= )
339 - selinux? ( >=sys-libs/libselinux-2.2.2-r4[${MULTILIB_USEDEP}] )
340 - slang? ( sys-libs/slang )
341 - !build? ( systemd? ( sys-apps/systemd ) )
342 - udev? ( virtual/libudev:= )"
343 -DEPEND="${RDEPEND}
344 - virtual/pkgconfig
345 - nls? ( sys-devel/gettext )
346 - test? ( sys-devel/bc )
347 - virtual/os-headers"
348 -RDEPEND+="
349 - kill? (
350 - !sys-apps/coreutils[kill]
351 - !sys-process/procps[kill]
352 - )
353 - !net-wireless/rfkill
354 - !sys-process/schedutils
355 - !sys-apps/setarch
356 - !<sys-apps/sysvinit-2.88-r7
357 - !<sys-libs/e2fsprogs-libs-1.41.8
358 - !<sys-fs/e2fsprogs-1.41.8
359 - !<app-shells/bash-completion-2.7-r1"
360 -
361 -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
362 -
363 -S="${WORKDIR}/${MY_P}"
364 -
365 -PATCHES=(
366 - "${FILESDIR}/util-linux-2.32-python3-tests.patch"
367 -)
368 -
369 -pkg_setup() {
370 - use python && python-single-r1_pkg_setup
371 -}
372 -
373 -src_prepare() {
374 - default
375 -
376 - eapply "${FILESDIR}"/${P}-add-missing-lintl.patch
377 - touch -r "${S}"/configure "${S}"/libsmartcols/src/Makemodule.am || die
378 - touch -r "${S}"/configure "${S}"/libuuid/src/Makemodule.am || die
379 -
380 - # Prevent uuidd test failure due to socket path limit. #593304
381 - sed -i \
382 - -e "s|UUIDD_SOCKET=\"\$(mktemp -u \"\${TS_OUTDIR}/uuiddXXXXXXXXXXXXX\")\"|UUIDD_SOCKET=\"\$(mktemp -u \"${T}/uuiddXXXXXXXXXXXXX.sock\")\"|g" \
383 - tests/ts/uuid/uuidd || die "Failed to fix uuidd test"
384 -
385 - if ! use userland_GNU; then
386 - # test runner is using GNU-specific xargs call
387 - sed -i -e 's:xargs:gxargs:' tests/run.sh || die
388 - # test requires util-linux uuidgen (which we don't build)
389 - rm tests/ts/uuid/oids || die
390 - fi
391 -
392 - if [[ ${PV} == 9999 ]] ; then
393 - po/update-potfiles
394 - eautoreconf
395 - fi
396 -
397 - # Undo bad ncurses handling by upstream. #601530
398 - sed -i -E \
399 - -e '/NCURSES_/s:(ncursesw?)[56]-config:$PKG_CONFIG \1:' \
400 - -e 's:(ncursesw?)[56]-config --version:$PKG_CONFIG --exists --print-errors \1:' \
401 - configure || die
402 -
403 - elibtoolize
404 -}
405 -
406 -lfs_fallocate_test() {
407 - # Make sure we can use fallocate with LFS #300307
408 - cat <<-EOF > "${T}"/fallocate.${ABI}.c
409 - #define _GNU_SOURCE
410 - #include <fcntl.h>
411 - main() { return fallocate(0, 0, 0, 0); }
412 - EOF
413 - append-lfs-flags
414 - $(tc-getCC) ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} "${T}"/fallocate.${ABI}.c -o /dev/null >/dev/null 2>&1 \
415 - || export ac_cv_func_fallocate=no
416 - rm -f "${T}"/fallocate.${ABI}.c
417 -}
418 -
419 -multilib_src_configure() {
420 - lfs_fallocate_test
421 - # The scanf test in a run-time test which fails while cross-compiling.
422 - # Blindly assume a POSIX setup since we require libmount, and libmount
423 - # itself fails when the scanf test fails. #531856
424 - tc-is-cross-compiler && export scanf_cv_alloc_modifier=ms
425 - export ac_cv_header_security_pam_misc_h=$(multilib_native_usex pam) #485486
426 - export ac_cv_header_security_pam_appl_h=$(multilib_native_usex pam) #545042
427 -
428 - local myeconfargs=(
429 - --enable-fs-paths-extra="${EPREFIX}/usr/sbin:${EPREFIX}/bin:${EPREFIX}/usr/bin"
430 - --with-bashcompletiondir="$(get_bashcompdir)"
431 - $(multilib_native_use_enable suid makeinstall-chown)
432 - $(multilib_native_use_enable suid makeinstall-setuid)
433 - $(multilib_native_use_with python)
434 - $(multilib_native_use_with readline)
435 - $(multilib_native_use_with slang)
436 - $(multilib_native_use_with systemd)
437 - $(multilib_native_use_with udev)
438 - $(multilib_native_usex ncurses "$(use_with unicode ncursesw)" '--without-ncursesw')
439 - $(multilib_native_usex ncurses "$(use_with !unicode ncurses)" '--without-ncurses')
440 - $(tc-has-tls || echo --disable-tls)
441 - $(use_enable nls)
442 - $(use_enable unicode widechar)
443 - $(use_enable static-libs static)
444 - $(use_with selinux)
445 - $(usex ncurses '' '--without-tinfo')
446 - )
447 - # build programs only on GNU, on *BSD we want libraries only
448 - if multilib_is_native_abi && use userland_GNU; then
449 - myeconfargs+=(
450 - --disable-chfn-chsh
451 - --disable-login
452 - --disable-nologin
453 - --disable-su
454 - --enable-agetty
455 - --enable-bash-completion
456 - --enable-line
457 - --enable-partx
458 - --enable-raw
459 - --enable-rename
460 - --enable-rfkill
461 - --enable-schedutils
462 - --with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
463 - $(use_enable caps setpriv)
464 - $(use_enable cramfs)
465 - $(use_enable fdformat)
466 - $(use_enable tty-helpers mesg)
467 - $(use_enable tty-helpers wall)
468 - $(use_enable tty-helpers write)
469 - $(use_enable kill)
470 - )
471 - else
472 - myeconfargs+=(
473 - --disable-all-programs
474 - --disable-bash-completion
475 - --without-systemdsystemunitdir
476 - # build libraries
477 - --enable-libuuid
478 - --enable-libblkid
479 - --enable-libsmartcols
480 - --enable-libfdisk
481 - )
482 - if use userland_GNU; then
483 - # those libraries don't work on *BSD
484 - myeconfargs+=(
485 - --enable-libmount
486 - )
487 - fi
488 - fi
489 - ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
490 -}
491 -
492 -multilib_src_test() {
493 - emake check TS_OPTS="--parallel=$(makeopts_jobs) --nonroot"
494 -}
495 -
496 -multilib_src_install() {
497 - emake DESTDIR="${D}" install
498 -
499 - if multilib_is_native_abi && use userland_GNU; then
500 - # need the libs in /
501 - gen_usr_ldscript -a blkid fdisk mount smartcols uuid
502 -
503 - use python && python_optimize
504 - fi
505 -}
506 -
507 -multilib_src_install_all() {
508 - dodoc AUTHORS NEWS README* Documentation/{TODO,*.txt,releases/*}
509 -
510 - # e2fsprogs-libs didnt install .la files, and .pc work fine
511 - find "${ED}" -name "*.la" -delete || die
512 -
513 - if ! use userland_GNU; then
514 - # manpage collisions
515 - # TODO: figure out a good way to keep them
516 - rm "${ED%/}"/usr/share/man/man3/uuid* || die
517 - fi
518 -
519 - if use pam; then
520 - newpamd "${FILESDIR}/runuser.pamd" runuser
521 - newpamd "${FILESDIR}/runuser-l.pamd" runuser-l
522 - fi
523 -
524 - # Note:
525 - # Bash completion for "runuser" command is provided by same file which
526 - # would also provide bash completion for "su" command. However, we don't
527 - # use "su" command from this package.
528 - # This triggers a known QA warning which we ignore for now to magically
529 - # keep bash completion for "su" command which shadow package does not
530 - # provide.
531 -}
532 -
533 -pkg_postinst() {
534 - if ! use tty-helpers; then
535 - elog "The mesg/wall/write tools have been disabled due to USE=-tty-helpers."
536 - fi
537 -
538 - if [[ -z ${REPLACING_VERSIONS} ]]; then
539 - elog "The agetty util now clears the terminal by default. You"
540 - elog "might want to add --noclear to your /etc/inittab lines."
541 - fi
542 -}