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:56
Message-Id: 1506733661.023a462282be2a7ddf709a4578e4a02555e16c88.polynomial-c@gentoo
1 commit: 023a462282be2a7ddf709a4578e4a02555e16c88
2 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
3 AuthorDate: Sat Sep 30 01:02:17 2017 +0000
4 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
5 CommitDate: Sat Sep 30 01:07:41 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=023a4622
7
8 sys-apps/util-linux: Removed old.
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.30.ebuild | 208 -----------------------------
14 2 files changed, 209 deletions(-)
15
16 diff --git a/sys-apps/util-linux/Manifest b/sys-apps/util-linux/Manifest
17 index 009e604fa11..a2eb8178913 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.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.tar.xz 4478016 SHA256 c208a4ff6906cb7f57940aa5bc3a6eed146e50a7cc0a092f52ef2ab65057a08d SHA512 30e311768718508066829567200e975fd08a22360915b27c8839f368fe6d84c8eca6c2f69a60f113d934eea9934e49f05cd98c3db7fd6bc5ad8f7f770badbc97 WHIRLPOOL 11749d9842e6de9ba0b164b533ac6eeae26557eed8da601eedc1505c5da88d0a6ef25586efb17c68ba0644a5ba8110188587c197f360b75191f1d4f90691d23b
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.ebuild b/sys-apps/util-linux/util-linux-2.30.ebuild
28 deleted file mode 100644
29 index b016bb8652f..00000000000
30 --- a/sys-apps/util-linux/util-linux-2.30.ebuild
31 +++ /dev/null
32 @@ -1,208 +0,0 @@
33 -# Copyright 1999-2017 Gentoo Foundation
34 -# Distributed under the terms of the GNU General Public License v2
35 -
36 -EAPI="5"
37 -
38 -PYTHON_COMPAT=( python2_7 python3_{4,5,6} )
39 -
40 -inherit eutils 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-2 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 -PATCHES=(
97 - "${FILESDIR}"/${PN}-2.30-pylibmount_segfault.patch
98 -)
99 -
100 -pkg_setup() {
101 - use python && python-single-r1_pkg_setup
102 -}
103 -
104 -src_prepare() {
105 - epatch "${PATCHES[@]}"
106 -
107 - if [[ ${PV} == 9999 ]] ; then
108 - po/update-potfiles
109 - eautoreconf
110 - fi
111 - # Undo bad ncurses handling by upstream. #601530
112 - sed -i -E \
113 - -e '/NCURSES_/s:(ncursesw?)[56]-config:$PKG_CONFIG \1:' \
114 - -e 's:(ncursesw?)[56]-config --version:$PKG_CONFIG --exists --print-errors \1:' \
115 - configure || die
116 - elibtoolize
117 -
118 - epatch_user
119 -}
120 -
121 -lfs_fallocate_test() {
122 - # Make sure we can use fallocate with LFS #300307
123 - cat <<-EOF > "${T}"/fallocate.${ABI}.c
124 - #define _GNU_SOURCE
125 - #include <fcntl.h>
126 - main() { return fallocate(0, 0, 0, 0); }
127 - EOF
128 - append-lfs-flags
129 - $(tc-getCC) ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} "${T}"/fallocate.${ABI}.c -o /dev/null >/dev/null 2>&1 \
130 - || export ac_cv_func_fallocate=no
131 - rm -f "${T}"/fallocate.${ABI}.c
132 -}
133 -
134 -multilib_src_configure() {
135 - lfs_fallocate_test
136 - # The scanf test in a run-time test which fails while cross-compiling.
137 - # Blindly assume a POSIX setup since we require libmount, and libmount
138 - # itself fails when the scanf test fails. #531856
139 - tc-is-cross-compiler && export scanf_cv_alloc_modifier=ms
140 - export ac_cv_header_security_pam_misc_h=$(multilib_native_usex pam) #485486
141 - export ac_cv_header_security_pam_appl_h=$(multilib_native_usex pam) #545042
142 -
143 - local myeconfargs=(
144 - --disable-chfn-chsh
145 - --disable-login
146 - --disable-nologin
147 - --disable-reset
148 - --disable-su
149 - --docdir='${datarootdir}'/doc/${PF}
150 - --enable-agetty
151 - --enable-bash-completion
152 - --enable-fs-paths-extra="${EPREFIX}/usr/sbin:${EPREFIX}/bin:${EPREFIX}/usr/bin"
153 - --enable-line
154 - --enable-partx
155 - --enable-raw
156 - --enable-rename
157 - --enable-schedutils
158 - --with-bashcompletiondir="$(get_bashcompdir)"
159 - --with-systemdsystemunitdir=$(multilib_native_usex systemd "$(systemd_get_unitdir)" "no")
160 - $(multilib_native_use_enable caps setpriv)
161 - $(multilib_native_use_enable cramfs)
162 - $(multilib_native_use_enable fdformat)
163 - $(multilib_native_use_enable nls)
164 - $(multilib_native_use_enable suid makeinstall-chown)
165 - $(multilib_native_use_enable suid makeinstall-setuid)
166 - $(multilib_native_use_enable tty-helpers mesg)
167 - $(multilib_native_use_enable tty-helpers wall)
168 - $(multilib_native_use_enable tty-helpers write)
169 - $(multilib_native_use_with python)
170 - $(multilib_native_use_with readline)
171 - $(multilib_native_use_with slang)
172 - $(multilib_native_use_with systemd)
173 - $(multilib_native_use_with udev)
174 - $(multilib_native_usex ncurses "$(use_with unicode ncursesw)" '--without-ncursesw')
175 - $(multilib_native_usex ncurses "$(use_with !unicode ncurses)" '--without-ncurses')
176 - $(tc-has-tls || echo --disable-tls)
177 - $(use_enable unicode widechar)
178 - $(use_enable kill)
179 - $(use_enable static-libs static)
180 - $(use_with selinux)
181 - $(usex ncurses '' '--without-tinfo')
182 - )
183 - ECONF_SOURCE=${S} \
184 - econf "${myeconfargs[@]}"
185 -}
186 -
187 -multilib_src_compile() {
188 - if multilib_is_native_abi; then
189 - default
190 - else
191 - # build libraries only
192 - emake -f Makefile -f - mylibs \
193 - <<< 'mylibs: $(usrlib_exec_LTLIBRARIES) $(pkgconfig_DATA)'
194 - fi
195 -}
196 -
197 -multilib_src_test() {
198 - multilib_is_native_abi && emake check
199 -}
200 -
201 -multilib_src_install() {
202 - if multilib_is_native_abi; then
203 - default
204 - else
205 - emake DESTDIR="${D}" install-usrlib_execLTLIBRARIES \
206 - install-pkgconfigDATA install-uuidincHEADERS \
207 - install-nodist_blkidincHEADERS install-nodist_mountincHEADERS \
208 - install-nodist_smartcolsincHEADERS install-nodist_fdiskincHEADERS
209 - fi
210 -
211 - if multilib_is_native_abi; then
212 - # need the libs in /
213 - gen_usr_ldscript -a blkid mount smartcols uuid
214 -
215 - use python && python_optimize
216 - fi
217 -}
218 -
219 -multilib_src_install_all() {
220 - dodoc AUTHORS NEWS README* Documentation/{TODO,*.txt,releases/*}
221 -
222 - # e2fsprogs-libs didnt install .la files, and .pc work fine
223 - prune_libtool_files
224 -
225 - if use pam; then
226 - newpamd "${FILESDIR}/runuser.pamd" runuser
227 - newpamd "${FILESDIR}/runuser-l.pamd" runuser-l
228 - fi
229 -}
230 -
231 -pkg_postinst() {
232 - if ! use tty-helpers; then
233 - elog "The mesg/wall/write tools have been disabled due to USE=-tty-helpers."
234 - fi
235 -
236 - if [[ -z ${REPLACING_VERSIONS} ]]; then
237 - elog "The agetty util now clears the terminal by default. You"
238 - elog "might want to add --noclear to your /etc/inittab lines."
239 - fi
240 -}