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: Wed, 04 Oct 2017 00:34:35
Message-Id: 1507077268.be47754fae3f00b133c8c6a59c5163d758cb1c85.polynomial-c@gentoo
1 commit: be47754fae3f00b133c8c6a59c5163d758cb1c85
2 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
3 AuthorDate: Wed Oct 4 00:34:06 2017 +0000
4 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
5 CommitDate: Wed Oct 4 00:34:28 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=be47754f
7
8 sys-apps/util-linux: Bump to version 2.30.2
9
10 Package-Manager: Portage-2.3.11, Repoman-2.3.3
11
12 sys-apps/util-linux/Manifest | 1 +
13 sys-apps/util-linux/util-linux-2.30.2.ebuild | 201 +++++++++++++++++++++++++++
14 2 files changed, 202 insertions(+)
15
16 diff --git a/sys-apps/util-linux/Manifest b/sys-apps/util-linux/Manifest
17 index a2eb8178913..44cda4b2155 100644
18 --- a/sys-apps/util-linux/Manifest
19 +++ b/sys-apps/util-linux/Manifest
20 @@ -1,4 +1,5 @@
21 DIST util-linux-2.28.2.tar.xz 4149700 SHA256 b89d37146f20bede93a42c847bce881a17e6dbd8066ff2db2bee733fa409f0cd SHA512 ac1c2d4c92bbc4eabed464cb0334c1d9b21e58df0f07f0b26e7adcfa188879de8632d195b65a4358c5e11e14ac6e09a1c6206265bbf1fab4ce122414bee7e940 WHIRLPOOL 1735e33620dba30cc1f42e60b707adb72234006b7fea242ac98c389295617bd0225563bcffa76b9d0753dfa100775dd9a2b73614843645ce667db5536842e308
22 DIST util-linux-2.29.2.tar.xz 4277668 SHA256 accea4d678209f97f634f40a93b7e9fcad5915d1f4749f6c47bee6bf110fe8e3 SHA512 0a87e6758531f74276f3de7607ef545f324b9b36b444aa5d163140c5fb0f4f7602655d7ec9939f92550dcb320d922cd69521a2183199d463795e67d3c27fce79 WHIRLPOOL 1f45711e593c76c6e208a28892ed2bf2622adb5fa1334867e13c6bf775a8903c2f1ebf18c3238d96fe139c5b60d61abf496251cf594a339209ce044f2bb8c17a
23 DIST util-linux-2.30.1.tar.xz 4459284 SHA256 1be4363a91ac428c9e43fc04dc6d2c66a19ec1e36f1105bd4b481540be13b841 SHA512 bcf1807198660c133c380e13d6ba5dcdb7470c47bcaeea03ccc5a78a0d834e3df3d13ae5ffc35fd7f8fff7ba062629d4b1f5cde78452b846c9315c51c9e108f5 WHIRLPOOL 19e78768cf2fd2d73bb7b45cb826101b4653bf49c9838bda10f05e508f06b117bb846ce517726465384bfe94ba24981f261d7b5091458242fb0c14d593d4b29e
24 +DIST util-linux-2.30.2.tar.xz 4442624 SHA256 7b5be5489e9b5b7177832836467aba1c87bf0e9bcbcb5a6f35d76cd4782589dc SHA512 b92ec16d5e8a405ad9ebbac8673bb49c5bf0a7f630118477f12c7a3c6b3b3ee5d56868632dd71fffd5c0434821207c2769f6859b9d398c2df770ec6487d7c32d WHIRLPOOL 771d2af788241db337be1e11be499d42b67ec86fa43da2eb161914194d1f002e95d9080793117a4b58a57691df8677ac59e9356ae2da7076ca48188c185a1843
25 DIST util-linux-2.31-rc1.tar.xz 4459892 SHA256 25771b2feb19bed4bf50597c597b2fed4f7580db135fb63a9421ceeeee123436 SHA512 027815da2ee4d342ff1578d5bba71ea63dc1cd6816ad753c644b5422b693e9dfe35ab158101ac9d7f8b7dbee1d2cf97e4930b24ed247eba7be1312e5292c3f9f WHIRLPOOL 6309c11499ee310b754780a31229385ee1fe87f31a84969b490d93d32d294f3a9c096c909abb363f06378e87bea3015bc7150620493989838ae47a4140912b18
26
27 diff --git a/sys-apps/util-linux/util-linux-2.30.2.ebuild b/sys-apps/util-linux/util-linux-2.30.2.ebuild
28 new file mode 100644
29 index 00000000000..c8d83a120f7
30 --- /dev/null
31 +++ b/sys-apps/util-linux/util-linux-2.30.2.ebuild
32 @@ -0,0 +1,201 @@
33 +# Copyright 1999-2017 Gentoo Foundation
34 +# Distributed under the terms of the GNU General Public License v2
35 +
36 +EAPI=6
37 +
38 +PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
39 +
40 +inherit ltprune toolchain-funcs libtool flag-o-matic bash-completion-r1 \
41 + pam python-single-r1 multilib-minimal systemd
42 +
43 +MY_PV="${PV/_/-}"
44 +MY_P="${PN}-${MY_PV}"
45 +
46 +if [[ ${PV} == 9999 ]] ; then
47 + inherit git-r3 autotools
48 + EGIT_REPO_URI="git://git.kernel.org/pub/scm/utils/util-linux/util-linux.git"
49 +else
50 + [[ "${PV}" = *_rc* ]] || \
51 + KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux"
52 + SRC_URI="mirror://kernel/linux/utils/util-linux/v${PV:0:4}/${MY_P}.tar.xz"
53 +fi
54 +
55 +DESCRIPTION="Various useful Linux utilities"
56 +HOMEPAGE="https://www.kernel.org/pub/linux/utils/util-linux/"
57 +
58 +LICENSE="GPL-2 LGPL-2.1 BSD-4 MIT public-domain"
59 +SLOT="0"
60 +IUSE="build caps +cramfs fdformat kill ncurses nls pam python +readline selinux slang static-libs +suid systemd test tty-helpers udev unicode"
61 +
62 +# Most lib deps here are related to programs rather than our libs,
63 +# so we rarely need to specify ${MULTILIB_USEDEP}.
64 +RDEPEND="caps? ( sys-libs/libcap-ng )
65 + cramfs? ( sys-libs/zlib )
66 + ncurses? ( >=sys-libs/ncurses-5.2-r2:0=[unicode?] )
67 + pam? ( sys-libs/pam )
68 + python? ( ${PYTHON_DEPS} )
69 + readline? ( sys-libs/readline:0= )
70 + selinux? ( >=sys-libs/libselinux-2.2.2-r4[${MULTILIB_USEDEP}] )
71 + slang? ( sys-libs/slang )
72 + !build? ( systemd? ( sys-apps/systemd ) )
73 + udev? ( virtual/libudev:= )"
74 +DEPEND="${RDEPEND}
75 + virtual/pkgconfig
76 + nls? ( sys-devel/gettext )
77 + test? ( sys-devel/bc )
78 + virtual/os-headers"
79 +RDEPEND+="
80 + kill? (
81 + !sys-apps/coreutils[kill]
82 + !sys-process/procps[kill]
83 + )
84 + !sys-process/schedutils
85 + !sys-apps/setarch
86 + !<sys-apps/sysvinit-2.88-r7
87 + !sys-block/eject
88 + !<sys-libs/e2fsprogs-libs-1.41.8
89 + !<sys-fs/e2fsprogs-1.41.8
90 + !<app-shells/bash-completion-2.3-r2"
91 +
92 +REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
93 +
94 +S="${WORKDIR}/${MY_P}"
95 +
96 +pkg_setup() {
97 + use python && python-single-r1_pkg_setup
98 +}
99 +
100 +src_prepare() {
101 + default
102 +
103 + if [[ ${PV} == 9999 ]] ; then
104 + po/update-potfiles
105 + eautoreconf
106 + fi
107 + # Undo bad ncurses handling by upstream. #601530
108 + sed -i -E \
109 + -e '/NCURSES_/s:(ncursesw?)[56]-config:$PKG_CONFIG \1:' \
110 + -e 's:(ncursesw?)[56]-config --version:$PKG_CONFIG --exists --print-errors \1:' \
111 + configure || die
112 + elibtoolize
113 +}
114 +
115 +lfs_fallocate_test() {
116 + # Make sure we can use fallocate with LFS #300307
117 + cat <<-EOF > "${T}"/fallocate.${ABI}.c
118 + #define _GNU_SOURCE
119 + #include <fcntl.h>
120 + main() { return fallocate(0, 0, 0, 0); }
121 + EOF
122 + append-lfs-flags
123 + $(tc-getCC) ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} "${T}"/fallocate.${ABI}.c -o /dev/null >/dev/null 2>&1 \
124 + || export ac_cv_func_fallocate=no
125 + rm -f "${T}"/fallocate.${ABI}.c
126 +}
127 +
128 +multilib_src_configure() {
129 + lfs_fallocate_test
130 + # The scanf test in a run-time test which fails while cross-compiling.
131 + # Blindly assume a POSIX setup since we require libmount, and libmount
132 + # itself fails when the scanf test fails. #531856
133 + tc-is-cross-compiler && export scanf_cv_alloc_modifier=ms
134 + export ac_cv_header_security_pam_misc_h=$(multilib_native_usex pam) #485486
135 + export ac_cv_header_security_pam_appl_h=$(multilib_native_usex pam) #545042
136 +
137 + local myeconfargs=(
138 + --disable-chfn-chsh
139 + --disable-login
140 + --disable-nologin
141 + --disable-reset
142 + --disable-su
143 + --docdir='${datarootdir}'/doc/${PF}
144 + --enable-agetty
145 + --enable-bash-completion
146 + --enable-fs-paths-extra="${EPREFIX}/usr/sbin:${EPREFIX}/bin:${EPREFIX}/usr/bin"
147 + --enable-line
148 + --enable-partx
149 + --enable-raw
150 + --enable-rename
151 + --enable-schedutils
152 + --with-bashcompletiondir="$(get_bashcompdir)"
153 + --with-systemdsystemunitdir=$(multilib_native_usex systemd "$(systemd_get_systemunitdir)" "no")
154 + $(multilib_native_use_enable caps setpriv)
155 + $(multilib_native_use_enable cramfs)
156 + $(multilib_native_use_enable fdformat)
157 + $(multilib_native_use_enable nls)
158 + $(multilib_native_use_enable suid makeinstall-chown)
159 + $(multilib_native_use_enable suid makeinstall-setuid)
160 + $(multilib_native_use_enable tty-helpers mesg)
161 + $(multilib_native_use_enable tty-helpers wall)
162 + $(multilib_native_use_enable tty-helpers write)
163 + $(multilib_native_use_with python)
164 + $(multilib_native_use_with readline)
165 + $(multilib_native_use_with slang)
166 + $(multilib_native_use_with systemd)
167 + $(multilib_native_use_with udev)
168 + $(multilib_native_usex ncurses "$(use_with unicode ncursesw)" '--without-ncursesw')
169 + $(multilib_native_usex ncurses "$(use_with !unicode ncurses)" '--without-ncurses')
170 + $(tc-has-tls || echo --disable-tls)
171 + $(use_enable unicode widechar)
172 + $(use_enable kill)
173 + $(use_enable static-libs static)
174 + $(use_with selinux)
175 + $(usex ncurses '' '--without-tinfo')
176 + )
177 + ECONF_SOURCE="${S}" 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 +}