Gentoo Archives: gentoo-commits

From: Mikle Kolyada <zlogene@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/util-linux/
Date: Thu, 07 Feb 2019 09:19:53
Message-Id: 1549531175.4650adc6ac91c61e5c5957ecdcce28132fba920d.zlogene@gentoo
1 commit: 4650adc6ac91c61e5c5957ecdcce28132fba920d
2 Author: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
3 AuthorDate: Thu Feb 7 09:18:17 2019 +0000
4 Commit: Mikle Kolyada <zlogene <AT> gentoo <DOT> org>
5 CommitDate: Thu Feb 7 09:19:35 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4650adc6
7
8 sys-apps/util-linux: Drop old
9
10 Signed-off-by: Mikle Kolyada <zlogene <AT> gentoo.org>
11 Package-Manager: Portage-2.3.51, Repoman-2.3.11
12
13 sys-apps/util-linux/Manifest | 1 -
14 sys-apps/util-linux/util-linux-2.32-r4.ebuild | 238 --------------------------
15 2 files changed, 239 deletions(-)
16
17 diff --git a/sys-apps/util-linux/Manifest b/sys-apps/util-linux/Manifest
18 index f396d8c6da2..90c4804efe9 100644
19 --- a/sys-apps/util-linux/Manifest
20 +++ b/sys-apps/util-linux/Manifest
21 @@ -1,3 +1,2 @@
22 -DIST util-linux-2.32.tar.xz 4550128 BLAKE2B 0ce22bf93f98ac9827632094b2c3d50280da40394b910e483bf697c8751d532fea7006195baeef0dbc14708edd1204db8e2c87b22bd9f799911c61144a531bb0 SHA512 320c8d364f014aba16483dd26564d7cb47804337567c3e9c2dc495f3865f524e7480d3fec7ef5a05b6e99763b0278da70fffe6d2b88f3f1a832ada5932556482
23 DIST util-linux-2.33.1.tar.xz 4650936 BLAKE2B 9ee6bc1a1b800e8537f5552c28cf608f32e89c8ab716434a2de6b4b5e257c53065b9c11cd355f2ef759f69069071ef930790ecd55806deef300ce77f31e38e98 SHA512 94ada47e472b62a612c26fd5a5b7423e09366690a8a96f777191a5d920981eb0f224474bc2f128e827299bf60062770011332757e1551a8cd3764b5c70ae4ba2
24 DIST util-linux-2.33.tar.xz 4663072 BLAKE2B df601f6aa6dd1e77c722d5e7350a3b14c6099057487384eb8cd7adee8693711c1d24663f76682c958884559fddf61cc4b6d987bdca70f88e6cb14109e328e8a9 SHA512 5eb419607c5a2634117a604d425d6413763d1e48910acabc7e19d574a4c3fb0ceb34a68671a8e4fe396a4c6d611932082f77cd669d009e218bf64095da0d5689
25
26 diff --git a/sys-apps/util-linux/util-linux-2.32-r4.ebuild b/sys-apps/util-linux/util-linux-2.32-r4.ebuild
27 deleted file mode 100644
28 index f23de35db8b..00000000000
29 --- a/sys-apps/util-linux/util-linux-2.32-r4.ebuild
30 +++ /dev/null
31 @@ -1,238 +0,0 @@
32 -# Copyright 1999-2018 Gentoo Foundation
33 -# Distributed under the terms of the GNU General Public License v2
34 -
35 -EAPI=6
36 -
37 -PYTHON_COMPAT=( python2_7 )
38 -
39 -inherit toolchain-funcs libtool flag-o-matic bash-completion-r1 \
40 - pam python-single-r1 multilib-minimal multiprocessing 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="https://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-fbsd ~amd64-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/ https://github.com/karelzak/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 userland_GNU"
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 - nls? ( virtual/libintl[${MULTILIB_USEDEP}] )
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 - !net-wireless/rfkill
85 - !sys-process/schedutils
86 - !sys-apps/setarch
87 - !<sys-apps/sysvinit-2.88-r7
88 - !<sys-libs/e2fsprogs-libs-1.41.8
89 - !<sys-fs/e2fsprogs-1.41.8
90 - !<app-shells/bash-completion-2.7-r1"
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 - eapply "${FILESDIR}"/${P}-add-missing-lintl.patch
104 - touch -r "${S}"/configure "${S}"/libsmartcols/src/Makemodule.am || die
105 - touch -r "${S}"/configure "${S}"/libuuid/src/Makemodule.am || die
106 -
107 - # Prevent uuidd test failure due to socket path limit. #593304
108 - sed -i \
109 - -e "s|UUIDD_SOCKET=\"\$(mktemp -u \"\${TS_OUTDIR}/uuiddXXXXXXXXXXXXX\")\"|UUIDD_SOCKET=\"\$(mktemp -u \"${T}/uuiddXXXXXXXXXXXXX.sock\")\"|g" \
110 - tests/ts/uuid/uuidd || die "Failed to fix uuidd test"
111 -
112 - if ! use userland_GNU; then
113 - # test runner is using GNU-specific xargs call
114 - sed -i -e 's:xargs:gxargs:' tests/run.sh || die
115 - # test requires util-linux uuidgen (which we don't build)
116 - rm tests/ts/uuid/oids || die
117 - fi
118 -
119 - if [[ ${PV} == 9999 ]] ; then
120 - po/update-potfiles
121 - eautoreconf
122 - fi
123 -
124 - # Undo bad ncurses handling by upstream. #601530
125 - sed -i -E \
126 - -e '/NCURSES_/s:(ncursesw?)[56]-config:$PKG_CONFIG \1:' \
127 - -e 's:(ncursesw?)[56]-config --version:$PKG_CONFIG --exists --print-errors \1:' \
128 - configure || die
129 -
130 - elibtoolize
131 -}
132 -
133 -lfs_fallocate_test() {
134 - # Make sure we can use fallocate with LFS #300307
135 - cat <<-EOF > "${T}"/fallocate.${ABI}.c
136 - #define _GNU_SOURCE
137 - #include <fcntl.h>
138 - main() { return fallocate(0, 0, 0, 0); }
139 - EOF
140 - append-lfs-flags
141 - $(tc-getCC) ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} "${T}"/fallocate.${ABI}.c -o /dev/null >/dev/null 2>&1 \
142 - || export ac_cv_func_fallocate=no
143 - rm -f "${T}"/fallocate.${ABI}.c
144 -}
145 -
146 -multilib_src_configure() {
147 - lfs_fallocate_test
148 - # The scanf test in a run-time test which fails while cross-compiling.
149 - # Blindly assume a POSIX setup since we require libmount, and libmount
150 - # itself fails when the scanf test fails. #531856
151 - tc-is-cross-compiler && export scanf_cv_alloc_modifier=ms
152 - export ac_cv_header_security_pam_misc_h=$(multilib_native_usex pam) #485486
153 - export ac_cv_header_security_pam_appl_h=$(multilib_native_usex pam) #545042
154 -
155 - local myeconfargs=(
156 - --enable-fs-paths-extra="${EPREFIX}/usr/sbin:${EPREFIX}/bin:${EPREFIX}/usr/bin"
157 - --with-bashcompletiondir="$(get_bashcompdir)"
158 - $(multilib_native_use_enable suid makeinstall-chown)
159 - $(multilib_native_use_enable suid makeinstall-setuid)
160 - $(multilib_native_use_with python)
161 - $(multilib_native_use_with readline)
162 - $(multilib_native_use_with slang)
163 - $(multilib_native_use_with systemd)
164 - $(multilib_native_use_with udev)
165 - $(multilib_native_usex ncurses "$(use_with unicode ncursesw)" '--without-ncursesw')
166 - $(multilib_native_usex ncurses "$(use_with !unicode ncurses)" '--without-ncurses')
167 - $(tc-has-tls || echo --disable-tls)
168 - $(use_enable nls)
169 - $(use_enable unicode widechar)
170 - $(use_enable static-libs static)
171 - $(use_with selinux)
172 - $(usex ncurses '' '--without-tinfo')
173 - )
174 - # build programs only on GNU, on *BSD we want libraries only
175 - if multilib_is_native_abi && use userland_GNU; then
176 - myeconfargs+=(
177 - --disable-chfn-chsh
178 - --disable-login
179 - --disable-nologin
180 - --disable-su
181 - --enable-agetty
182 - --enable-bash-completion
183 - --enable-line
184 - --enable-partx
185 - --enable-raw
186 - --enable-rename
187 - --enable-rfkill
188 - --enable-schedutils
189 - --with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
190 - $(use_enable caps setpriv)
191 - $(use_enable cramfs)
192 - $(use_enable fdformat)
193 - $(use_enable tty-helpers mesg)
194 - $(use_enable tty-helpers wall)
195 - $(use_enable tty-helpers write)
196 - $(use_enable kill)
197 - )
198 - else
199 - myeconfargs+=(
200 - --disable-all-programs
201 - --disable-bash-completion
202 - --without-systemdsystemunitdir
203 - # build libraries
204 - --enable-libuuid
205 - --enable-libblkid
206 - --enable-libsmartcols
207 - --enable-libfdisk
208 - )
209 - if use userland_GNU; then
210 - # those libraries don't work on *BSD
211 - myeconfargs+=(
212 - --enable-libmount
213 - )
214 - fi
215 - fi
216 - ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
217 -}
218 -
219 -multilib_src_test() {
220 - emake check TS_OPTS="--parallel=$(makeopts_jobs) --nonroot"
221 -}
222 -
223 -multilib_src_install() {
224 - emake DESTDIR="${D}" install
225 -
226 - if multilib_is_native_abi && use userland_GNU; then
227 - # need the libs in /
228 - gen_usr_ldscript -a blkid fdisk mount smartcols uuid
229 -
230 - use python && python_optimize
231 - fi
232 -}
233 -
234 -multilib_src_install_all() {
235 - dodoc AUTHORS NEWS README* Documentation/{TODO,*.txt,releases/*}
236 -
237 - # e2fsprogs-libs didnt install .la files, and .pc work fine
238 - find "${ED}" -name "*.la" -delete || die
239 -
240 - if ! use userland_GNU; then
241 - # manpage collisions
242 - # TODO: figure out a good way to keep them
243 - rm "${ED%/}"/usr/share/man/man3/uuid* || die
244 - fi
245 -
246 - if use pam; then
247 - newpamd "${FILESDIR}/runuser.pamd" runuser
248 - newpamd "${FILESDIR}/runuser-l.pamd" runuser-l
249 - fi
250 -
251 - # Note:
252 - # Bash completion for "runuser" command is provided by same file which
253 - # would also provide bash completion for "su" command. However, we don't
254 - # use "su" command from this package.
255 - # This triggers a known QA warning which we ignore for now to magically
256 - # keep bash completion for "su" command which shadow package does not
257 - # provide.
258 -}
259 -
260 -pkg_postinst() {
261 - if ! use tty-helpers; then
262 - elog "The mesg/wall/write tools have been disabled due to USE=-tty-helpers."
263 - fi
264 -
265 - if [[ -z ${REPLACING_VERSIONS} ]]; then
266 - elog "The agetty util now clears the terminal by default. You"
267 - elog "might want to add --noclear to your /etc/inittab lines."
268 - fi
269 -}