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/
Date: Thu, 25 May 2017 21:22:59
Message-Id: 1495747366.a18b0f04ff1de57f0e61e8d92995497dcf99caca.polynomial-c@gentoo
1 commit: a18b0f04ff1de57f0e61e8d92995497dcf99caca
2 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
3 AuthorDate: Thu May 25 21:17:55 2017 +0000
4 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
5 CommitDate: Thu May 25 21:22:46 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a18b0f04
7
8 sys-apps/util-linux: Bump to version 2.30_rc2
9
10 Package-Manager: Portage-2.3.6, Repoman-2.3.2
11
12 sys-apps/util-linux/Manifest | 1 +
13 sys-apps/util-linux/util-linux-2.30_rc2.ebuild | 202 +++++++++++++++++++++++++
14 2 files changed, 203 insertions(+)
15
16 diff --git a/sys-apps/util-linux/Manifest b/sys-apps/util-linux/Manifest
17 index 7b5ad0ce270..cc57bb33ef8 100644
18 --- a/sys-apps/util-linux/Manifest
19 +++ b/sys-apps/util-linux/Manifest
20 @@ -2,3 +2,4 @@ DIST util-linux-2.26.2.tar.xz 3863868 SHA256 0e29bda142528a48a0a953c39ff63093651
21 DIST util-linux-2.28.2.tar.xz 4149700 SHA256 b89d37146f20bede93a42c847bce881a17e6dbd8066ff2db2bee733fa409f0cd SHA512 ac1c2d4c92bbc4eabed464cb0334c1d9b21e58df0f07f0b26e7adcfa188879de8632d195b65a4358c5e11e14ac6e09a1c6206265bbf1fab4ce122414bee7e940 WHIRLPOOL 1735e33620dba30cc1f42e60b707adb72234006b7fea242ac98c389295617bd0225563bcffa76b9d0753dfa100775dd9a2b73614843645ce667db5536842e308
22 DIST util-linux-2.29.1.tar.xz 4278756 SHA256 0ce40600b934ec2fecfa6bfc4efe6982d051ba96c2832b05201347aec582f54f SHA512 221fc7651eb0534c55206eaf9184b2eb55d9f838cd0e1623cadac5d4ac57a118d96cdd770b6492b39381dd1316b81553866bc0f8c25dbb52dac9641f2fa0f7fa WHIRLPOOL d509168960b0ad54ade4d03dc39dca1dcf0bb0a5b51a594f04bc02ff3a6c89fc5966cff4653dfc826f75f8864497da600c7a86039099845b98e6f9d7981cff98
23 DIST util-linux-2.29.2.tar.xz 4277668 SHA256 accea4d678209f97f634f40a93b7e9fcad5915d1f4749f6c47bee6bf110fe8e3 SHA512 0a87e6758531f74276f3de7607ef545f324b9b36b444aa5d163140c5fb0f4f7602655d7ec9939f92550dcb320d922cd69521a2183199d463795e67d3c27fce79 WHIRLPOOL 1f45711e593c76c6e208a28892ed2bf2622adb5fa1334867e13c6bf775a8903c2f1ebf18c3238d96fe139c5b60d61abf496251cf594a339209ce044f2bb8c17a
24 +DIST util-linux-2.30-rc2.tar.xz 4376864 SHA256 5cdb28f6221ab68cb593c5e3fb01bb7cce9466a42bad031411eea6b5adc08c5d SHA512 df03ca776af6838c06387e017fdf38abb29adc1d29df56ce7c55d1df5a5ab16d6123e649c63734e75a0239f89b994147f261edd5e78e16881fd5ec12a4365763 WHIRLPOOL 7961bbc51117dd7ee2768ecfaef20758db882bdd888ff0495cba41860caf91354a78332d5131bdedb0cbb7fa2380485e15bbbc80ee8cd6f927787816c9d04e83
25
26 diff --git a/sys-apps/util-linux/util-linux-2.30_rc2.ebuild b/sys-apps/util-linux/util-linux-2.30_rc2.ebuild
27 new file mode 100644
28 index 00000000000..37dbeaf6c98
29 --- /dev/null
30 +++ b/sys-apps/util-linux/util-linux-2.30_rc2.ebuild
31 @@ -0,0 +1,202 @@
32 +# Copyright 1999-2017 Gentoo Foundation
33 +# Distributed under the terms of the GNU General Public License v2
34 +
35 +EAPI="5"
36 +
37 +PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
38 +
39 +inherit eutils toolchain-funcs libtool flag-o-matic bash-completion-r1 \
40 + pam python-single-r1 multilib-minimal systemd
41 +
42 +MY_PV=${PV/_/-}
43 +MY_P=${PN}-${MY_PV}
44 +
45 +if [[ ${PV} == 9999 ]] ; then
46 + inherit git-2 autotools
47 + EGIT_REPO_URI="git://git.kernel.org/pub/scm/utils/util-linux/util-linux.git"
48 +else
49 + [[ "${PV}" = *_rc* ]] || \
50 + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux"
51 + SRC_URI="mirror://kernel/linux/utils/util-linux/v${PV:0:4}/${MY_P}.tar.xz"
52 +fi
53 +
54 +DESCRIPTION="Various useful Linux utilities"
55 +HOMEPAGE="https://www.kernel.org/pub/linux/utils/util-linux/"
56 +
57 +LICENSE="GPL-2 LGPL-2.1 BSD-4 MIT public-domain"
58 +SLOT="0"
59 +IUSE="build caps +cramfs fdformat kill ncurses nls pam python +readline selinux slang static-libs +suid systemd test tty-helpers udev unicode"
60 +
61 +# Most lib deps here are related to programs rather than our libs,
62 +# so we rarely need to specify ${MULTILIB_USEDEP}.
63 +RDEPEND="caps? ( sys-libs/libcap-ng )
64 + cramfs? ( sys-libs/zlib )
65 + ncurses? ( >=sys-libs/ncurses-5.2-r2:0=[unicode?] )
66 + pam? ( sys-libs/pam )
67 + python? ( ${PYTHON_DEPS} )
68 + readline? ( sys-libs/readline:0= )
69 + selinux? ( >=sys-libs/libselinux-2.2.2-r4[${MULTILIB_USEDEP}] )
70 + slang? ( sys-libs/slang )
71 + !build? ( systemd? ( sys-apps/systemd ) )
72 + udev? ( virtual/libudev:= )"
73 +DEPEND="${RDEPEND}
74 + virtual/pkgconfig
75 + nls? ( sys-devel/gettext )
76 + test? ( sys-devel/bc )
77 + virtual/os-headers"
78 +RDEPEND+="
79 + kill? (
80 + !sys-apps/coreutils[kill]
81 + !sys-process/procps[kill]
82 + )
83 + !sys-process/schedutils
84 + !sys-apps/setarch
85 + !<sys-apps/sysvinit-2.88-r7
86 + !sys-block/eject
87 + !<sys-libs/e2fsprogs-libs-1.41.8
88 + !<sys-fs/e2fsprogs-1.41.8
89 + !<app-shells/bash-completion-2.3-r2"
90 +
91 +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
92 +
93 +S="${WORKDIR}/${MY_P}"
94 +
95 +pkg_setup() {
96 + use python && python-single-r1_pkg_setup
97 +}
98 +
99 +src_prepare() {
100 + if [[ ${PV} == 9999 ]] ; then
101 + po/update-potfiles
102 + eautoreconf
103 + fi
104 + # Undo bad ncurses handling by upstream. #601530
105 + sed -i -E \
106 + -e '/NCURSES_/s:(ncursesw?)[56]-config:$PKG_CONFIG \1:' \
107 + -e 's:(ncursesw?)[56]-config --version:$PKG_CONFIG --exists --print-errors \1:' \
108 + configure || die
109 + elibtoolize
110 +
111 + epatch_user
112 +}
113 +
114 +lfs_fallocate_test() {
115 + # Make sure we can use fallocate with LFS #300307
116 + cat <<-EOF > "${T}"/fallocate.${ABI}.c
117 + #define _GNU_SOURCE
118 + #include <fcntl.h>
119 + main() { return fallocate(0, 0, 0, 0); }
120 + EOF
121 + append-lfs-flags
122 + $(tc-getCC) ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} "${T}"/fallocate.${ABI}.c -o /dev/null >/dev/null 2>&1 \
123 + || export ac_cv_func_fallocate=no
124 + rm -f "${T}"/fallocate.${ABI}.c
125 +}
126 +
127 +multilib_src_configure() {
128 + lfs_fallocate_test
129 + # The scanf test in a run-time test which fails while cross-compiling.
130 + # Blindly assume a POSIX setup since we require libmount, and libmount
131 + # itself fails when the scanf test fails. #531856
132 + tc-is-cross-compiler && export scanf_cv_alloc_modifier=ms
133 + export ac_cv_header_security_pam_misc_h=$(multilib_native_usex pam) #485486
134 + export ac_cv_header_security_pam_appl_h=$(multilib_native_usex pam) #545042
135 +
136 + local myeconfargs=(
137 + --disable-chfn-chsh
138 + --disable-login
139 + --disable-nologin
140 + --disable-reset
141 + --disable-su
142 + --docdir='${datarootdir}'/doc/${PF}
143 + --enable-agetty
144 + --enable-bash-completion
145 + --enable-fs-paths-extra="${EPREFIX}/usr/sbin:${EPREFIX}/bin:${EPREFIX}/usr/bin"
146 + --enable-line
147 + --enable-partx
148 + --enable-raw
149 + --enable-rename
150 + --enable-schedutils
151 + --with-bashcompletiondir="$(get_bashcompdir)"
152 + --with-systemdsystemunitdir=$(multilib_native_usex systemd "$(systemd_get_unitdir)" "no")
153 + $(multilib_native_use_enable caps setpriv)
154 + $(multilib_native_use_enable cramfs)
155 + $(multilib_native_use_enable fdformat)
156 + $(multilib_native_use_enable nls)
157 + $(multilib_native_use_enable suid makeinstall-chown)
158 + $(multilib_native_use_enable suid makeinstall-setuid)
159 + $(multilib_native_use_enable tty-helpers mesg)
160 + $(multilib_native_use_enable tty-helpers wall)
161 + $(multilib_native_use_enable tty-helpers write)
162 + $(multilib_native_use_with python)
163 + $(multilib_native_use_with readline)
164 + $(multilib_native_use_with slang)
165 + $(multilib_native_use_with systemd)
166 + $(multilib_native_use_with udev)
167 + $(multilib_native_usex ncurses "$(use_with unicode ncursesw)" '--without-ncursesw')
168 + $(multilib_native_usex ncurses "$(use_with !unicode ncurses)" '--without-ncurses')
169 + $(tc-has-tls || echo --disable-tls)
170 + $(use_enable unicode widechar)
171 + $(use_enable kill)
172 + $(use_enable static-libs static)
173 + $(use_with selinux)
174 + $(usex ncurses '' '--without-tinfo')
175 + )
176 + ECONF_SOURCE=${S} \
177 + econf "${myeconfargs[@]}"
178 +}
179 +
180 +multilib_src_compile() {
181 + if multilib_is_native_abi; then
182 + default
183 + else
184 + # build libraries only
185 + emake -f Makefile -f - mylibs \
186 + <<< 'mylibs: $(usrlib_exec_LTLIBRARIES) $(pkgconfig_DATA)'
187 + fi
188 +}
189 +
190 +multilib_src_test() {
191 + multilib_is_native_abi && emake check
192 +}
193 +
194 +multilib_src_install() {
195 + if multilib_is_native_abi; then
196 + default
197 + else
198 + emake DESTDIR="${D}" install-usrlib_execLTLIBRARIES \
199 + install-pkgconfigDATA install-uuidincHEADERS \
200 + install-nodist_blkidincHEADERS install-nodist_mountincHEADERS \
201 + install-nodist_smartcolsincHEADERS install-nodist_fdiskincHEADERS
202 + fi
203 +
204 + if multilib_is_native_abi; then
205 + # need the libs in /
206 + gen_usr_ldscript -a blkid mount smartcols uuid
207 +
208 + use python && python_optimize
209 + fi
210 +}
211 +
212 +multilib_src_install_all() {
213 + dodoc AUTHORS NEWS README* Documentation/{TODO,*.txt,releases/*}
214 +
215 + # e2fsprogs-libs didnt install .la files, and .pc work fine
216 + prune_libtool_files
217 +
218 + if use pam; then
219 + newpamd "${FILESDIR}/runuser.pamd" runuser
220 + newpamd "${FILESDIR}/runuser-l.pamd" runuser-l
221 + fi
222 +}
223 +
224 +pkg_postinst() {
225 + if ! use tty-helpers; then
226 + elog "The mesg/wall/write tools have been disabled due to USE=-tty-helpers."
227 + fi
228 +
229 + if [[ -z ${REPLACING_VERSIONS} ]]; then
230 + elog "The agetty util now clears the terminal by default. You"
231 + elog "might want to add --noclear to your /etc/inittab lines."
232 + fi
233 +}