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: Fri, 02 Mar 2018 07:52:10
Message-Id: 1519977119.1b8755052354989bd1a7ef629017de20d3dfa885.polynomial-c@gentoo
1 commit: 1b8755052354989bd1a7ef629017de20d3dfa885
2 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
3 AuthorDate: Fri Mar 2 07:51:59 2018 +0000
4 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
5 CommitDate: Fri Mar 2 07:51:59 2018 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1b875505
7
8 sys-apps/util-linux: Removed old.
9
10 Package-Manager: Portage-2.3.24, Repoman-2.3.6
11
12 sys-apps/util-linux/Manifest | 1 -
13 sys-apps/util-linux/util-linux-2.32_rc1.ebuild | 202 -------------------------
14 2 files changed, 203 deletions(-)
15
16 diff --git a/sys-apps/util-linux/Manifest b/sys-apps/util-linux/Manifest
17 index 22c234321c2..856fed3eca1 100644
18 --- a/sys-apps/util-linux/Manifest
19 +++ b/sys-apps/util-linux/Manifest
20 @@ -1,5 +1,4 @@
21 DIST util-linux-2.30.2.tar.xz 4442624 BLAKE2B 7b76e255c9ee4d8b8f65f037a735808233edcdb8dce951038ae8983a3f4a6e493458622f6c7f6ce68d38672ac6dc5258b45b787c196dabede41cb19afc76e545 SHA512 b92ec16d5e8a405ad9ebbac8673bb49c5bf0a7f630118477f12c7a3c6b3b3ee5d56868632dd71fffd5c0434821207c2769f6859b9d398c2df770ec6487d7c32d
22 DIST util-linux-2.31.1.tar.xz 4510096 BLAKE2B f2e4a398fe4ecc0bbfb7c2240698e3a37deed57eb48a028ddfb578ecc057c1c928b2082d13014f0dfdaf5a8274ee3a13993fdbc19b7e05e5a992505ac90de79a SHA512 d45c1e62e39f5d5c7a642071e7ccce44fe4ecaafec54d8c9a4e9d526280a6e25723bfa0eb068401e291579c0d067661775bbe085190d13ff16493f47360b7760
23 DIST util-linux-2.31.tar.xz 4503892 BLAKE2B 8a9e2fc674cacbfabfc76cc0ab671f3fdb35d49de9f4ae8660b49df9e196878c2459d8fc57f6c9b6d2ad73cc56d970656ffcbc22deed97bb7a0cc28490a1fbb0 SHA512 48b668526e96a132736b882090d0e33c20b4b3a0e1760502d83118ed98ccc9423d310848a2bb73f82f85e9c19f6191075ae2c5269b007e76be1fbd7b6b88fbf5
24 -DIST util-linux-2.32-rc1.tar.xz 4540628 BLAKE2B 2ece393a3ba334cd1e39e38b47330ea588b67034be2fcdd88ff38ac06c8c20099d177119e4e186d207df02d2aefed03470ec2f3538497df3b2cb6fef9c63dbb7 SHA512 46ccffb1b10b9b386ac04d1d627ae291a2e710f723546d527c6ffdf30e276694f8c19d4cbb563a0a5f1e5a30f1b4be7a5009f7de5a26b11d761138861c711fc1
25 DIST util-linux-2.32-rc2.tar.xz 4552488 BLAKE2B 31b17eff5e500f27e80f8354ebd71fa04c6c3faa8c17a36399362de5f6f8de7ae0344844325053dd680ba5b1ac48ed1b28ab20f76a1ea89d065dd01d1ae1215a SHA512 a7c3b5b84fa78aded1fc7b4e3111c140512f5e2e5851162659423a3905eadd746d65beedd3faf813b77e823d63f3c9b33db1f44f7b85e9006ff64f82fb3cadb7
26
27 diff --git a/sys-apps/util-linux/util-linux-2.32_rc1.ebuild b/sys-apps/util-linux/util-linux-2.32_rc1.ebuild
28 deleted file mode 100644
29 index ee5b6efcc21..00000000000
30 --- a/sys-apps/util-linux/util-linux-2.32_rc1.ebuild
31 +++ /dev/null
32 @@ -1,202 +0,0 @@
33 -# Copyright 1999-2018 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 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 - !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 - !<sys-apps/s390-tools-1.36.1-r1"
92 -
93 -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
94 -
95 -S="${WORKDIR}/${MY_P}"
96 -
97 -pkg_setup() {
98 - use python && python-single-r1_pkg_setup
99 -}
100 -
101 -src_prepare() {
102 - default
103 -
104 - if [[ ${PV} == 9999 ]] ; then
105 - po/update-potfiles
106 - eautoreconf
107 - fi
108 - # Undo bad ncurses handling by upstream. #601530
109 - sed -i -E \
110 - -e '/NCURSES_/s:(ncursesw?)[56]-config:$PKG_CONFIG \1:' \
111 - -e 's:(ncursesw?)[56]-config --version:$PKG_CONFIG --exists --print-errors \1:' \
112 - configure || die
113 - elibtoolize
114 -}
115 -
116 -lfs_fallocate_test() {
117 - # Make sure we can use fallocate with LFS #300307
118 - cat <<-EOF > "${T}"/fallocate.${ABI}.c
119 - #define _GNU_SOURCE
120 - #include <fcntl.h>
121 - main() { return fallocate(0, 0, 0, 0); }
122 - EOF
123 - append-lfs-flags
124 - $(tc-getCC) ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} "${T}"/fallocate.${ABI}.c -o /dev/null >/dev/null 2>&1 \
125 - || export ac_cv_func_fallocate=no
126 - rm -f "${T}"/fallocate.${ABI}.c
127 -}
128 -
129 -multilib_src_configure() {
130 - lfs_fallocate_test
131 - # The scanf test in a run-time test which fails while cross-compiling.
132 - # Blindly assume a POSIX setup since we require libmount, and libmount
133 - # itself fails when the scanf test fails. #531856
134 - tc-is-cross-compiler && export scanf_cv_alloc_modifier=ms
135 - export ac_cv_header_security_pam_misc_h=$(multilib_native_usex pam) #485486
136 - export ac_cv_header_security_pam_appl_h=$(multilib_native_usex pam) #545042
137 -
138 - local myeconfargs=(
139 - --disable-chfn-chsh
140 - --disable-login
141 - --disable-nologin
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 - find "${ED}" -name "*.la" -delete || die
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 -}