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: Tue, 07 Feb 2017 13:19:02
Message-Id: 1486473531.e028697f2401c2ffc53933aecc5c8298d308d14c.polynomial-c@gentoo
1 commit: e028697f2401c2ffc53933aecc5c8298d308d14c
2 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
3 AuthorDate: Tue Feb 7 12:24:37 2017 +0000
4 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
5 CommitDate: Tue Feb 7 13:18:51 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e028697f
7
8 sys-apps/util-linux: Removed old.
9
10 Package-Manager: Portage-2.3.3, Repoman-2.3.1
11
12 sys-apps/util-linux/Manifest | 1 -
13 sys-apps/util-linux/util-linux-2.29.ebuild | 187 -----------------------------
14 2 files changed, 188 deletions(-)
15
16 diff --git a/sys-apps/util-linux/Manifest b/sys-apps/util-linux/Manifest
17 index 7cadb19..5d3786b 100644
18 --- a/sys-apps/util-linux/Manifest
19 +++ b/sys-apps/util-linux/Manifest
20 @@ -1,4 +1,3 @@
21 DIST util-linux-2.26.2.tar.xz 3863868 SHA256 0e29bda142528a48a0a953c39ff63093651a4809042e1790fbd6aa8663fd9666 SHA512 1cb8e2f32882b3f496d31c250a45cfb61bedb79f7a2802b358c23134d4257fa9bc9cde8888cfa1aaba12109f82b93345c6dc0bec2d11629ffa084f2a4476a91b WHIRLPOOL 699ff057f9930fe53f44090817c64ffe089345e7aba4c836e18cd3d2088881add805640b0e41b8d60bc08e3632be919025417feb9c2ddda454c87821a59122ed
22 DIST util-linux-2.28.2.tar.xz 4149700 SHA256 b89d37146f20bede93a42c847bce881a17e6dbd8066ff2db2bee733fa409f0cd SHA512 ac1c2d4c92bbc4eabed464cb0334c1d9b21e58df0f07f0b26e7adcfa188879de8632d195b65a4358c5e11e14ac6e09a1c6206265bbf1fab4ce122414bee7e940 WHIRLPOOL 1735e33620dba30cc1f42e60b707adb72234006b7fea242ac98c389295617bd0225563bcffa76b9d0753dfa100775dd9a2b73614843645ce667db5536842e308
23 DIST util-linux-2.29.1.tar.xz 4278756 SHA256 0ce40600b934ec2fecfa6bfc4efe6982d051ba96c2832b05201347aec582f54f SHA512 221fc7651eb0534c55206eaf9184b2eb55d9f838cd0e1623cadac5d4ac57a118d96cdd770b6492b39381dd1316b81553866bc0f8c25dbb52dac9641f2fa0f7fa WHIRLPOOL d509168960b0ad54ade4d03dc39dca1dcf0bb0a5b51a594f04bc02ff3a6c89fc5966cff4653dfc826f75f8864497da600c7a86039099845b98e6f9d7981cff98
24 -DIST util-linux-2.29.tar.xz 4249020 SHA256 2c59ea67cc7b564104f60532f6e0a95fe17a91acb870ba8fd7e986f273abf9e7 SHA512 ec6d5b2ef49069341dbb805ccdaca7a2e4d6aaa4d06f34c1de24e538ed971bd83749b6c5a6ce75d72d86817edb6b4eb3396579d18cdb523eb02b92427f41d7f3 WHIRLPOOL b07750566086a183175c6ec6eb935ce2e37ffaf5eeca4b58ea7e823c6dfdd63dd52543b7009014ace20ef9cb9be363cfade85bcbfbd4fa7ac388e0eefbb80f05
25
26 diff --git a/sys-apps/util-linux/util-linux-2.29.ebuild b/sys-apps/util-linux/util-linux-2.29.ebuild
27 deleted file mode 100644
28 index c531a56..00000000
29 --- a/sys-apps/util-linux/util-linux-2.29.ebuild
30 +++ /dev/null
31 @@ -1,187 +0,0 @@
32 -# Copyright 1999-2016 Gentoo Foundation
33 -# Distributed under the terms of the GNU General Public License v2
34 -
35 -EAPI="5"
36 -
37 -PYTHON_COMPAT=( python2_7 python3_{4,5} )
38 -
39 -inherit eutils toolchain-funcs libtool flag-o-matic bash-completion-r1 \
40 - 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-2 autotools
47 - EGIT_REPO_URI="git://git.kernel.org/pub/scm/utils/util-linux/util-linux.git"
48 -else
49 - KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux"
50 - SRC_URI="mirror://kernel/linux/utils/util-linux/v${PV:0:4}/${MY_P}.tar.xz"
51 -fi
52 -
53 -DESCRIPTION="Various useful Linux utilities"
54 -HOMEPAGE="https://www.kernel.org/pub/linux/utils/util-linux/"
55 -
56 -LICENSE="GPL-2 LGPL-2.1 BSD-4 MIT public-domain"
57 -SLOT="0"
58 -IUSE="build caps +cramfs fdformat kill ncurses nls pam python +readline selinux slang static-libs +suid systemd test tty-helpers udev unicode"
59 -
60 -# Most lib deps here are related to programs rather than our libs,
61 -# so we rarely need to specify ${MULTILIB_USEDEP}.
62 -RDEPEND="caps? ( sys-libs/libcap-ng )
63 - cramfs? ( sys-libs/zlib )
64 - ncurses? ( >=sys-libs/ncurses-5.2-r2:0=[unicode?] )
65 - pam? ( sys-libs/pam )
66 - python? ( ${PYTHON_DEPS} )
67 - readline? ( sys-libs/readline:0= )
68 - selinux? ( >=sys-libs/libselinux-2.2.2-r4[${MULTILIB_USEDEP}] )
69 - slang? ( sys-libs/slang )
70 - !build? ( systemd? ( sys-apps/systemd ) )
71 - udev? ( virtual/libudev:= )"
72 -DEPEND="${RDEPEND}
73 - virtual/pkgconfig
74 - nls? ( sys-devel/gettext )
75 - test? ( sys-devel/bc )
76 - virtual/os-headers"
77 -RDEPEND+="
78 - kill? (
79 - !sys-apps/coreutils[kill]
80 - !sys-process/procps[kill]
81 - )
82 - !sys-process/schedutils
83 - !sys-apps/setarch
84 - !<sys-apps/sysvinit-2.88-r7
85 - !sys-block/eject
86 - !<sys-libs/e2fsprogs-libs-1.41.8
87 - !<sys-fs/e2fsprogs-1.41.8
88 - !<app-shells/bash-completion-2.3-r2"
89 -
90 -REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
91 -
92 -S=${WORKDIR}/${MY_P}
93 -
94 -pkg_setup() {
95 - use python && python-single-r1_pkg_setup
96 -}
97 -
98 -src_prepare() {
99 - if [[ ${PV} == 9999 ]] ; then
100 - po/update-potfiles
101 - eautoreconf
102 - fi
103 - # Undo bad ncurses handling by upstream. #601530
104 - sed -i -E \
105 - -e '/NCURSES_/s:(ncursesw?)[56]-config:$PKG_CONFIG \1:' \
106 - -e 's:(ncursesw?)[56]-config --version:$PKG_CONFIG --exists --print-errors \1:' \
107 - configure || die
108 - elibtoolize
109 -}
110 -
111 -lfs_fallocate_test() {
112 - # Make sure we can use fallocate with LFS #300307
113 - cat <<-EOF > "${T}"/fallocate.${ABI}.c
114 - #define _GNU_SOURCE
115 - #include <fcntl.h>
116 - main() { return fallocate(0, 0, 0, 0); }
117 - EOF
118 - append-lfs-flags
119 - $(tc-getCC) ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} "${T}"/fallocate.${ABI}.c -o /dev/null >/dev/null 2>&1 \
120 - || export ac_cv_func_fallocate=no
121 - rm -f "${T}"/fallocate.${ABI}.c
122 -}
123 -
124 -multilib_src_configure() {
125 - lfs_fallocate_test
126 - # The scanf test in a run-time test which fails while cross-compiling.
127 - # Blindly assume a POSIX setup since we require libmount, and libmount
128 - # itself fails when the scanf test fails. #531856
129 - tc-is-cross-compiler && export scanf_cv_alloc_modifier=ms
130 - export ac_cv_header_security_pam_misc_h=$(multilib_native_usex pam) #485486
131 - export ac_cv_header_security_pam_appl_h=$(multilib_native_usex pam) #545042
132 - ECONF_SOURCE=${S} \
133 - econf \
134 - --enable-fs-paths-extra="${EPREFIX}/usr/sbin:${EPREFIX}/bin:${EPREFIX}/usr/bin" \
135 - --docdir='${datarootdir}'/doc/${PF} \
136 - $(multilib_native_use_enable nls) \
137 - --enable-agetty \
138 - --with-bashcompletiondir="$(get_bashcompdir)" \
139 - --enable-bash-completion \
140 - $(multilib_native_use_enable caps setpriv) \
141 - --disable-chfn-chsh \
142 - $(multilib_native_use_enable cramfs) \
143 - $(multilib_native_use_enable fdformat) \
144 - --with-ncurses=$(multilib_native_usex ncurses $(usex unicode auto yes) no) \
145 - $(use_enable kill) \
146 - --disable-login \
147 - $(multilib_native_use_enable tty-helpers mesg) \
148 - --disable-nologin \
149 - --enable-partx \
150 - $(multilib_native_use_with python) \
151 - --enable-raw \
152 - $(multilib_native_use_with readline) \
153 - --enable-rename \
154 - --disable-reset \
155 - --enable-schedutils \
156 - --disable-su \
157 - $(multilib_native_use_enable tty-helpers wall) \
158 - $(multilib_native_use_enable tty-helpers write) \
159 - $(multilib_native_use_enable suid makeinstall-chown) \
160 - $(multilib_native_use_enable suid makeinstall-setuid) \
161 - $(use_with selinux) \
162 - $(multilib_native_use_with slang) \
163 - $(use_enable static-libs static) \
164 - $(multilib_native_use_with systemd) \
165 - --with-systemdsystemunitdir=$(multilib_native_usex systemd "$(systemd_get_unitdir)" "no") \
166 - $(multilib_native_use_with udev) \
167 - $(tc-has-tls || echo --disable-tls)
168 -}
169 -
170 -multilib_src_compile() {
171 - if multilib_is_native_abi; then
172 - default
173 - else
174 - # build libraries only
175 - emake -f Makefile -f - mylibs \
176 - <<< 'mylibs: $(usrlib_exec_LTLIBRARIES) $(pkgconfig_DATA)'
177 - fi
178 -}
179 -
180 -multilib_src_test() {
181 - multilib_is_native_abi && emake check
182 -}
183 -
184 -multilib_src_install() {
185 - if multilib_is_native_abi; then
186 - default
187 - else
188 - emake DESTDIR="${D}" install-usrlib_execLTLIBRARIES \
189 - install-pkgconfigDATA install-uuidincHEADERS \
190 - install-nodist_blkidincHEADERS install-nodist_mountincHEADERS \
191 - install-nodist_smartcolsincHEADERS install-nodist_fdiskincHEADERS
192 - fi
193 -
194 - if multilib_is_native_abi; then
195 - # need the libs in /
196 - gen_usr_ldscript -a blkid mount smartcols uuid
197 -
198 - use python && python_optimize
199 - fi
200 -}
201 -
202 -multilib_src_install_all() {
203 - dodoc AUTHORS NEWS README* Documentation/{TODO,*.txt,releases/*}
204 -
205 - # e2fsprogs-libs didnt install .la files, and .pc work fine
206 - prune_libtool_files
207 -}
208 -
209 -pkg_postinst() {
210 - if ! use tty-helpers; then
211 - elog "The mesg/wall/write tools have been disabled due to USE=-tty-helpers."
212 - fi
213 -
214 - if [[ -z ${REPLACING_VERSIONS} ]]; then
215 - elog "The agetty util now clears the terminal by default. You"
216 - elog "might want to add --noclear to your /etc/inittab lines."
217 - fi
218 -}