1 |
commit: d2d27c36b62a1756d3402ffff49ba525bdbc8679 |
2 |
Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
3 |
AuthorDate: Thu May 25 21:20:40 2017 +0000 |
4 |
Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org> |
5 |
CommitDate: Thu May 25 21:22:48 2017 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d2d27c36 |
7 |
|
8 |
sys-apps/util-linux: Synced live ebuild. |
9 |
|
10 |
Package-Manager: Portage-2.3.6, Repoman-2.3.2 |
11 |
|
12 |
sys-apps/util-linux/util-linux-9999.ebuild | 52 ++++++++++++++++-------------- |
13 |
1 file changed, 27 insertions(+), 25 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 72b70fc3954..c86046927fc 100644 |
17 |
--- a/sys-apps/util-linux/util-linux-9999.ebuild |
18 |
+++ b/sys-apps/util-linux/util-linux-9999.ebuild |
19 |
@@ -15,6 +15,7 @@ if [[ ${PV} == 9999 ]] ; then |
20 |
inherit git-2 autotools |
21 |
EGIT_REPO_URI="git://git.kernel.org/pub/scm/utils/util-linux/util-linux.git" |
22 |
else |
23 |
+ [[ "${PV}" = *_rc* ]] || \ |
24 |
KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux" |
25 |
SRC_URI="mirror://kernel/linux/utils/util-linux/v${PV:0:4}/${MY_P}.tar.xz" |
26 |
fi |
27 |
@@ -58,7 +59,7 @@ RDEPEND+=" |
28 |
|
29 |
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" |
30 |
|
31 |
-S=${WORKDIR}/${MY_P} |
32 |
+S="${WORKDIR}/${MY_P}" |
33 |
|
34 |
pkg_setup() { |
35 |
use python && python-single-r1_pkg_setup |
36 |
@@ -97,43 +98,44 @@ multilib_src_configure() { |
37 |
export ac_cv_header_security_pam_appl_h=$(multilib_native_usex pam) #545042 |
38 |
|
39 |
local myeconfargs=( |
40 |
- --enable-fs-paths-extra="${EPREFIX}/usr/sbin:${EPREFIX}/bin:${EPREFIX}/usr/bin" |
41 |
- --docdir='${datarootdir}'/doc/${PF} |
42 |
- $(multilib_native_use_enable nls) |
43 |
- --enable-agetty |
44 |
- --with-bashcompletiondir="$(get_bashcompdir)" |
45 |
- --enable-bash-completion |
46 |
- $(multilib_native_use_enable caps setpriv) |
47 |
--disable-chfn-chsh |
48 |
- $(multilib_native_use_enable cramfs) |
49 |
- $(multilib_native_use_enable fdformat) |
50 |
- $(multilib_native_usex ncurses "$(use_with unicode ncursesw)" '--without-ncursesw') |
51 |
- $(multilib_native_usex ncurses "$(use_with !unicode ncurses)" '--without-ncurses') |
52 |
- $(usex ncurses '' '--without-tinfo') |
53 |
- $(use_enable unicode widechar) |
54 |
- $(use_enable kill) |
55 |
--disable-login |
56 |
- $(multilib_native_use_enable tty-helpers mesg) |
57 |
--disable-nologin |
58 |
+ --disable-reset |
59 |
+ --disable-su |
60 |
+ --docdir='${datarootdir}'/doc/${PF} |
61 |
+ --enable-agetty |
62 |
+ --enable-bash-completion |
63 |
+ --enable-fs-paths-extra="${EPREFIX}/usr/sbin:${EPREFIX}/bin:${EPREFIX}/usr/bin" |
64 |
+ --enable-line |
65 |
--enable-partx |
66 |
- $(multilib_native_use_with python) |
67 |
--enable-raw |
68 |
- $(multilib_native_use_with readline) |
69 |
--enable-rename |
70 |
- --disable-reset |
71 |
--enable-schedutils |
72 |
- --disable-su |
73 |
- $(multilib_native_use_enable tty-helpers wall) |
74 |
- $(multilib_native_use_enable tty-helpers write) |
75 |
+ --with-bashcompletiondir="$(get_bashcompdir)" |
76 |
+ --with-systemdsystemunitdir=$(multilib_native_usex systemd "$(systemd_get_unitdir)" "no") |
77 |
+ $(multilib_native_use_enable caps setpriv) |
78 |
+ $(multilib_native_use_enable cramfs) |
79 |
+ $(multilib_native_use_enable fdformat) |
80 |
+ $(multilib_native_use_enable nls) |
81 |
$(multilib_native_use_enable suid makeinstall-chown) |
82 |
$(multilib_native_use_enable suid makeinstall-setuid) |
83 |
- $(use_with selinux) |
84 |
+ $(multilib_native_use_enable tty-helpers mesg) |
85 |
+ $(multilib_native_use_enable tty-helpers wall) |
86 |
+ $(multilib_native_use_enable tty-helpers write) |
87 |
+ $(multilib_native_use_with python) |
88 |
+ $(multilib_native_use_with readline) |
89 |
$(multilib_native_use_with slang) |
90 |
- $(use_enable static-libs static) |
91 |
$(multilib_native_use_with systemd) |
92 |
- --with-systemdsystemunitdir=$(multilib_native_usex systemd "$(systemd_get_unitdir)" "no") |
93 |
$(multilib_native_use_with udev) |
94 |
+ $(multilib_native_usex ncurses "$(use_with unicode ncursesw)" '--without-ncursesw') |
95 |
+ $(multilib_native_usex ncurses "$(use_with !unicode ncurses)" '--without-ncurses') |
96 |
$(tc-has-tls || echo --disable-tls) |
97 |
+ $(use_enable unicode widechar) |
98 |
+ $(use_enable kill) |
99 |
+ $(use_enable static-libs static) |
100 |
+ $(use_with selinux) |
101 |
+ $(usex ncurses '' '--without-tinfo') |
102 |
) |
103 |
ECONF_SOURCE=${S} \ |
104 |
econf "${myeconfargs[@]}" |