| 1 |
commit: f917c3be712532a2d71a3ed79e0bac3e52162564 |
| 2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Aug 14 13:18:58 2017 +0000 |
| 4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Aug 14 13:36:10 2017 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f917c3be |
| 7 |
|
| 8 |
sys-apps/util-linux: Synced live ebuild. |
| 9 |
|
| 10 |
Package-Manager: Portage-2.3.7, Repoman-2.3.3 |
| 11 |
|
| 12 |
sys-apps/util-linux/util-linux-9999.ebuild | 31 +++++++++++++++++++----------- |
| 13 |
1 file changed, 20 insertions(+), 11 deletions(-) |
| 14 |
|
| 15 |
diff --git a/sys-apps/util-linux/util-linux-9999.ebuild b/sys-apps/util-linux/util-linux-9999.ebuild |
| 16 |
index c86046927fc..c8d83a120f7 100644 |
| 17 |
--- a/sys-apps/util-linux/util-linux-9999.ebuild |
| 18 |
+++ b/sys-apps/util-linux/util-linux-9999.ebuild |
| 19 |
@@ -1,18 +1,18 @@ |
| 20 |
# Copyright 1999-2017 Gentoo Foundation |
| 21 |
# Distributed under the terms of the GNU General Public License v2 |
| 22 |
|
| 23 |
-EAPI="5" |
| 24 |
+EAPI=6 |
| 25 |
|
| 26 |
PYTHON_COMPAT=( python2_7 python3_{4,5,6} ) |
| 27 |
|
| 28 |
-inherit eutils toolchain-funcs libtool flag-o-matic bash-completion-r1 \ |
| 29 |
- python-single-r1 multilib-minimal systemd |
| 30 |
+inherit ltprune toolchain-funcs libtool flag-o-matic bash-completion-r1 \ |
| 31 |
+ pam python-single-r1 multilib-minimal systemd |
| 32 |
|
| 33 |
-MY_PV=${PV/_/-} |
| 34 |
-MY_P=${PN}-${MY_PV} |
| 35 |
+MY_PV="${PV/_/-}" |
| 36 |
+MY_P="${PN}-${MY_PV}" |
| 37 |
|
| 38 |
if [[ ${PV} == 9999 ]] ; then |
| 39 |
- inherit git-2 autotools |
| 40 |
+ inherit git-r3 autotools |
| 41 |
EGIT_REPO_URI="git://git.kernel.org/pub/scm/utils/util-linux/util-linux.git" |
| 42 |
else |
| 43 |
[[ "${PV}" = *_rc* ]] || \ |
| 44 |
@@ -66,13 +66,18 @@ pkg_setup() { |
| 45 |
} |
| 46 |
|
| 47 |
src_prepare() { |
| 48 |
+ default |
| 49 |
+ |
| 50 |
if [[ ${PV} == 9999 ]] ; then |
| 51 |
po/update-potfiles |
| 52 |
eautoreconf |
| 53 |
fi |
| 54 |
+ # Undo bad ncurses handling by upstream. #601530 |
| 55 |
+ sed -i -E \ |
| 56 |
+ -e '/NCURSES_/s:(ncursesw?)[56]-config:$PKG_CONFIG \1:' \ |
| 57 |
+ -e 's:(ncursesw?)[56]-config --version:$PKG_CONFIG --exists --print-errors \1:' \ |
| 58 |
+ configure || die |
| 59 |
elibtoolize |
| 60 |
- |
| 61 |
- epatch_user |
| 62 |
} |
| 63 |
|
| 64 |
lfs_fallocate_test() { |
| 65 |
@@ -113,7 +118,7 @@ multilib_src_configure() { |
| 66 |
--enable-rename |
| 67 |
--enable-schedutils |
| 68 |
--with-bashcompletiondir="$(get_bashcompdir)" |
| 69 |
- --with-systemdsystemunitdir=$(multilib_native_usex systemd "$(systemd_get_unitdir)" "no") |
| 70 |
+ --with-systemdsystemunitdir=$(multilib_native_usex systemd "$(systemd_get_systemunitdir)" "no") |
| 71 |
$(multilib_native_use_enable caps setpriv) |
| 72 |
$(multilib_native_use_enable cramfs) |
| 73 |
$(multilib_native_use_enable fdformat) |
| 74 |
@@ -137,8 +142,7 @@ multilib_src_configure() { |
| 75 |
$(use_with selinux) |
| 76 |
$(usex ncurses '' '--without-tinfo') |
| 77 |
) |
| 78 |
- ECONF_SOURCE=${S} \ |
| 79 |
- econf "${myeconfargs[@]}" |
| 80 |
+ ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" |
| 81 |
} |
| 82 |
|
| 83 |
multilib_src_compile() { |
| 84 |
@@ -178,6 +182,11 @@ multilib_src_install_all() { |
| 85 |
|
| 86 |
# e2fsprogs-libs didnt install .la files, and .pc work fine |
| 87 |
prune_libtool_files |
| 88 |
+ |
| 89 |
+ if use pam; then |
| 90 |
+ newpamd "${FILESDIR}/runuser.pamd" runuser |
| 91 |
+ newpamd "${FILESDIR}/runuser-l.pamd" runuser-l |
| 92 |
+ fi |
| 93 |
} |
| 94 |
|
| 95 |
pkg_postinst() { |
Archives