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: Sat, 30 Sep 2017 01:07:55
Message-Id: 1506733656.a2ebebb99150227b851da5b529760b34422d5308.polynomial-c@gentoo
1 commit: a2ebebb99150227b851da5b529760b34422d5308
2 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
3 AuthorDate: Sat Sep 30 00:54:51 2017 +0000
4 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
5 CommitDate: Sat Sep 30 01:07:36 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a2ebebb9
7
8 sys-apps/util-linux: Bump to version 2.31_rc1
9
10 Package-Manager: Portage-2.3.10, Repoman-2.3.3
11
12 sys-apps/util-linux/Manifest | 1 +
13 sys-apps/util-linux/util-linux-2.31_rc1.ebuild | 203 +++++++++++++++++++++++++
14 2 files changed, 204 insertions(+)
15
16 diff --git a/sys-apps/util-linux/Manifest b/sys-apps/util-linux/Manifest
17 index 23af16656c6..009e604fa11 100644
18 --- a/sys-apps/util-linux/Manifest
19 +++ b/sys-apps/util-linux/Manifest
20 @@ -2,3 +2,4 @@ DIST util-linux-2.28.2.tar.xz 4149700 SHA256 b89d37146f20bede93a42c847bce881a17e
21 DIST util-linux-2.29.2.tar.xz 4277668 SHA256 accea4d678209f97f634f40a93b7e9fcad5915d1f4749f6c47bee6bf110fe8e3 SHA512 0a87e6758531f74276f3de7607ef545f324b9b36b444aa5d163140c5fb0f4f7602655d7ec9939f92550dcb320d922cd69521a2183199d463795e67d3c27fce79 WHIRLPOOL 1f45711e593c76c6e208a28892ed2bf2622adb5fa1334867e13c6bf775a8903c2f1ebf18c3238d96fe139c5b60d61abf496251cf594a339209ce044f2bb8c17a
22 DIST util-linux-2.30.1.tar.xz 4459284 SHA256 1be4363a91ac428c9e43fc04dc6d2c66a19ec1e36f1105bd4b481540be13b841 SHA512 bcf1807198660c133c380e13d6ba5dcdb7470c47bcaeea03ccc5a78a0d834e3df3d13ae5ffc35fd7f8fff7ba062629d4b1f5cde78452b846c9315c51c9e108f5 WHIRLPOOL 19e78768cf2fd2d73bb7b45cb826101b4653bf49c9838bda10f05e508f06b117bb846ce517726465384bfe94ba24981f261d7b5091458242fb0c14d593d4b29e
23 DIST util-linux-2.30.tar.xz 4478016 SHA256 c208a4ff6906cb7f57940aa5bc3a6eed146e50a7cc0a092f52ef2ab65057a08d SHA512 30e311768718508066829567200e975fd08a22360915b27c8839f368fe6d84c8eca6c2f69a60f113d934eea9934e49f05cd98c3db7fd6bc5ad8f7f770badbc97 WHIRLPOOL 11749d9842e6de9ba0b164b533ac6eeae26557eed8da601eedc1505c5da88d0a6ef25586efb17c68ba0644a5ba8110188587c197f360b75191f1d4f90691d23b
24 +DIST util-linux-2.31-rc1.tar.xz 4459892 SHA256 25771b2feb19bed4bf50597c597b2fed4f7580db135fb63a9421ceeeee123436 SHA512 027815da2ee4d342ff1578d5bba71ea63dc1cd6816ad753c644b5422b693e9dfe35ab158101ac9d7f8b7dbee1d2cf97e4930b24ed247eba7be1312e5292c3f9f WHIRLPOOL 6309c11499ee310b754780a31229385ee1fe87f31a84969b490d93d32d294f3a9c096c909abb363f06378e87bea3015bc7150620493989838ae47a4140912b18
25
26 diff --git a/sys-apps/util-linux/util-linux-2.31_rc1.ebuild b/sys-apps/util-linux/util-linux-2.31_rc1.ebuild
27 new file mode 100644
28 index 00000000000..b23afd5b653
29 --- /dev/null
30 +++ b/sys-apps/util-linux/util-linux-2.31_rc1.ebuild
31 @@ -0,0 +1,203 @@
32 +# Copyright 1999-2017 Gentoo Foundation
33 +# Distributed under the terms of the GNU General Public License v2
34 +
35 +EAPI=6
36 +
37 +PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
38 +
39 +inherit ltprune 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-r3 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 + !net-wireless/rfkill
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-rfkill
152 + --enable-schedutils
153 + --with-bashcompletiondir="$(get_bashcompdir)"
154 + --with-systemdsystemunitdir=$(multilib_native_usex systemd "$(systemd_get_systemunitdir)" "no")
155 + $(multilib_native_use_enable caps setpriv)
156 + $(multilib_native_use_enable cramfs)
157 + $(multilib_native_use_enable fdformat)
158 + $(multilib_native_use_enable nls)
159 + $(multilib_native_use_enable suid makeinstall-chown)
160 + $(multilib_native_use_enable suid makeinstall-setuid)
161 + $(multilib_native_use_enable tty-helpers mesg)
162 + $(multilib_native_use_enable tty-helpers wall)
163 + $(multilib_native_use_enable tty-helpers write)
164 + $(multilib_native_use_with python)
165 + $(multilib_native_use_with readline)
166 + $(multilib_native_use_with slang)
167 + $(multilib_native_use_with systemd)
168 + $(multilib_native_use_with udev)
169 + $(multilib_native_usex ncurses "$(use_with unicode ncursesw)" '--without-ncursesw')
170 + $(multilib_native_usex ncurses "$(use_with !unicode ncurses)" '--without-ncurses')
171 + $(tc-has-tls || echo --disable-tls)
172 + $(use_enable unicode widechar)
173 + $(use_enable kill)
174 + $(use_enable static-libs static)
175 + $(use_with selinux)
176 + $(usex ncurses '' '--without-tinfo')
177 + )
178 + ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
179 +}
180 +
181 +multilib_src_compile() {
182 + if multilib_is_native_abi; then
183 + default
184 + else
185 + # build libraries only
186 + emake -f Makefile -f - mylibs \
187 + <<< 'mylibs: $(usrlib_exec_LTLIBRARIES) $(pkgconfig_DATA)'
188 + fi
189 +}
190 +
191 +multilib_src_test() {
192 + multilib_is_native_abi && emake check
193 +}
194 +
195 +multilib_src_install() {
196 + if multilib_is_native_abi; then
197 + default
198 + else
199 + emake DESTDIR="${D}" install-usrlib_execLTLIBRARIES \
200 + install-pkgconfigDATA install-uuidincHEADERS \
201 + install-nodist_blkidincHEADERS install-nodist_mountincHEADERS \
202 + install-nodist_smartcolsincHEADERS install-nodist_fdiskincHEADERS
203 + fi
204 +
205 + if multilib_is_native_abi; then
206 + # need the libs in /
207 + gen_usr_ldscript -a blkid mount smartcols uuid
208 +
209 + use python && python_optimize
210 + fi
211 +}
212 +
213 +multilib_src_install_all() {
214 + dodoc AUTHORS NEWS README* Documentation/{TODO,*.txt,releases/*}
215 +
216 + # e2fsprogs-libs didnt install .la files, and .pc work fine
217 + prune_libtool_files
218 +
219 + if use pam; then
220 + newpamd "${FILESDIR}/runuser.pamd" runuser
221 + newpamd "${FILESDIR}/runuser-l.pamd" runuser-l
222 + fi
223 +}
224 +
225 +pkg_postinst() {
226 + if ! use tty-helpers; then
227 + elog "The mesg/wall/write tools have been disabled due to USE=-tty-helpers."
228 + fi
229 +
230 + if [[ -z ${REPLACING_VERSIONS} ]]; then
231 + elog "The agetty util now clears the terminal by default. You"
232 + elog "might want to add --noclear to your /etc/inittab lines."
233 + fi
234 +}