Gentoo Archives: gentoo-commits

From: "Lars Wendler (polynomial-c)" <polynomial-c@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in sys-apps/util-linux: metadata.xml ChangeLog util-linux-2.25.1.ebuild util-linux-2.25.ebuild util-linux-2.22.2.ebuild
Date: Fri, 05 Sep 2014 13:20:42
Message-Id: 20140905132022.F3E084C81@oystercatcher.gentoo.org
1 polynomial-c 14/09/05 13:20:22
2
3 Modified: metadata.xml ChangeLog
4 Added: util-linux-2.25.1.ebuild
5 Removed: util-linux-2.25.ebuild util-linux-2.22.2.ebuild
6 Log:
7 Version bump. Removed old
8
9 (Portage version: 2.2.12/cvs/Linux x86_64, signed Manifest commit with key 0x981CA6FC)
10
11 Revision Changes Path
12 1.18 sys-apps/util-linux/metadata.xml
13
14 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/util-linux/metadata.xml?rev=1.18&view=markup
15 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/util-linux/metadata.xml?rev=1.18&content-type=text/plain
16 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/util-linux/metadata.xml?r1=1.17&r2=1.18
17
18 Index: metadata.xml
19 ===================================================================
20 RCS file: /var/cvsroot/gentoo-x86/sys-apps/util-linux/metadata.xml,v
21 retrieving revision 1.17
22 retrieving revision 1.18
23 diff -u -r1.17 -r1.18
24 --- metadata.xml 4 Jan 2014 18:34:59 -0000 1.17
25 +++ metadata.xml 5 Sep 2014 13:20:22 -0000 1.18
26 @@ -6,10 +6,8 @@
27 <flag name='caps'>build setpriv helper (run programs with diff capabilities)</flag>
28 <flag name='cramfs'>build mkfs/fsck helpers for cramfs filesystems</flag>
29 <flag name='cytune'>build cytune for Cyclades-Z multiport serial cards</flag>
30 - <flag name='ddate'>build ddate helper (Discordian dates)</flag>
31 <flag name='fdformat'>build fdformat (floppy disk format)</flag>
32 <flag name='pam'>build runuser helper</flag>
33 - <flag name='perl'>install the chkdupexe helper script</flag>
34 <flag name='suid'>
35 install mount/umount as setuid so non-root users may mount/umount devices,
36 and wall/write as setgid so non-root users can notify other users
37
38
39
40 1.484 sys-apps/util-linux/ChangeLog
41
42 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/util-linux/ChangeLog?rev=1.484&view=markup
43 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/util-linux/ChangeLog?rev=1.484&content-type=text/plain
44 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/util-linux/ChangeLog?r1=1.483&r2=1.484
45
46 Index: ChangeLog
47 ===================================================================
48 RCS file: /var/cvsroot/gentoo-x86/sys-apps/util-linux/ChangeLog,v
49 retrieving revision 1.483
50 retrieving revision 1.484
51 diff -u -r1.483 -r1.484
52 --- ChangeLog 26 Aug 2014 19:59:37 -0000 1.483
53 +++ ChangeLog 5 Sep 2014 13:20:22 -0000 1.484
54 @@ -1,6 +1,14 @@
55 # ChangeLog for sys-apps/util-linux
56 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
57 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/ChangeLog,v 1.483 2014/08/26 19:59:37 mgorny Exp $
58 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/ChangeLog,v 1.484 2014/09/05 13:20:22 polynomial-c Exp $
59 +
60 +*util-linux-2.25.1 (05 Sep 2014)
61 +
62 + 05 Sep 2014; Lars Wendler <polynomial-c@g.o>
63 + -util-linux-2.22.2.ebuild, -util-linux-2.25.ebuild,
64 + +util-linux-2.25.1.ebuild, -files/util-linux-2.25-lscpu-pic.patch,
65 + metadata.xml:
66 + Version bump. Removed old.
67
68 26 Aug 2014; Michał Górny <mgorny@g.o> util-linux-2.24.2.ebuild,
69 util-linux-2.25.ebuild, util-linux-9999.ebuild:
70
71
72
73 1.1 sys-apps/util-linux/util-linux-2.25.1.ebuild
74
75 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/util-linux/util-linux-2.25.1.ebuild?rev=1.1&view=markup
76 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/util-linux/util-linux-2.25.1.ebuild?rev=1.1&content-type=text/plain
77
78 Index: util-linux-2.25.1.ebuild
79 ===================================================================
80 # Copyright 1999-2014 Gentoo Foundation
81 # Distributed under the terms of the GNU General Public License v2
82 # $Header: /var/cvsroot/gentoo-x86/sys-apps/util-linux/util-linux-2.25.1.ebuild,v 1.1 2014/09/05 13:20:22 polynomial-c Exp $
83
84 EAPI="4"
85
86 PYTHON_COMPAT=( python2_7 python3_{2,3,4} )
87
88 inherit eutils toolchain-funcs libtool flag-o-matic bash-completion-r1 \
89 python-single-r1 multilib-minimal
90
91 MY_PV=${PV/_/-}
92 MY_P=${PN}-${MY_PV}
93
94 if [[ ${PV} == 9999 ]] ; then
95 inherit git-2 autotools
96 EGIT_REPO_URI="git://git.kernel.org/pub/scm/utils/util-linux/util-linux.git"
97 else
98 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-linux ~arm-linux ~x86-linux"
99 SRC_URI="mirror://kernel/linux/utils/util-linux/v${PV:0:4}/${MY_P}.tar.xz"
100 fi
101
102 DESCRIPTION="Various useful Linux utilities"
103 HOMEPAGE="http://www.kernel.org/pub/linux/utils/util-linux/"
104
105 LICENSE="GPL-2 LGPL-2.1 BSD-4 MIT public-domain"
106 SLOT="0"
107 IUSE="caps +cramfs fdformat ncurses nls pam python selinux slang static-libs +suid test tty-helpers udev unicode"
108
109 RDEPEND="!sys-process/schedutils
110 !sys-apps/setarch
111 !<sys-apps/sysvinit-2.88-r7
112 !sys-block/eject
113 !<sys-libs/e2fsprogs-libs-1.41.8
114 !<sys-fs/e2fsprogs-1.41.8
115 !<app-shells/bash-completion-1.3-r2
116 caps? ( sys-libs/libcap-ng )
117 cramfs? ( sys-libs/zlib )
118 ncurses? ( >=sys-libs/ncurses-5.2-r2 )
119 pam? ( sys-libs/pam )
120 python? ( ${PYTHON_DEPS} )
121 selinux? ( >=sys-libs/libselinux-2.2.2-r4[${MULTILIB_USEDEP}] )
122 slang? ( sys-libs/slang )
123 udev? ( virtual/udev )
124 abi_x86_32? (
125 !<=app-emulation/emul-linux-x86-baselibs-20140406-r2
126 !app-emulation/emul-linux-x86-baselibs[-abi_x86_32]
127 )"
128 DEPEND="${RDEPEND}
129 virtual/pkgconfig
130 nls? ( sys-devel/gettext )
131 test? ( sys-devel/bc )
132 virtual/os-headers"
133
134 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
135
136 S=${WORKDIR}/${MY_P}
137
138 pkg_setup() {
139 use python && python-single-r1_pkg_setup
140 }
141
142 src_prepare() {
143 if [[ ${PV} == 9999 ]] ; then
144 po/update-potfiles
145 eautoreconf
146 fi
147 elibtoolize
148 }
149
150 lfs_fallocate_test() {
151 # Make sure we can use fallocate with LFS #300307
152 cat <<-EOF > "${T}"/fallocate.${ABI}.c
153 #define _GNU_SOURCE
154 #include <fcntl.h>
155 main() { return fallocate(0, 0, 0, 0); }
156 EOF
157 append-lfs-flags
158 $(tc-getCC) ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} "${T}"/fallocate.${ABI}.c -o /dev/null >/dev/null 2>&1 \
159 || export ac_cv_func_fallocate=no
160 rm -f "${T}"/fallocate.${ABI}.c
161 }
162
163 multilib_src_configure() {
164 lfs_fallocate_test
165 export ac_cv_header_security_pam_misc_h=$(multilib_native_usex pam) #485486
166 # We manually set --libdir to the default since on prefix, econf will set it to
167 # a value which the configure script does not recognize. This makes it set the
168 # usrlib_execdir to a bad value. bug #518898#c2, fixed upstream for >2.25
169 ECONF_SOURCE=${S} \
170 econf \
171 --enable-fs-paths-extra="${EPREFIX}/usr/sbin:${EPREFIX}/bin:${EPREFIX}/usr/bin" \
172 --libdir='${prefix}/'"$(get_libdir)" \
173 $(multilib_native_use_enable nls) \
174 --enable-agetty \
175 --with-bashcompletiondir="$(get_bashcompdir)" \
176 --enable-bash-completion \
177 $(multilib_native_use_enable caps setpriv) \
178 --disable-chfn-chsh \
179 $(multilib_native_use_enable cramfs) \
180 $(multilib_native_use_enable fdformat) \
181 --with-ncurses=$(multilib_native_usex ncurses $(usex unicode auto yes) no) \
182 --disable-kill \
183 --disable-login \
184 $(multilib_native_use_enable tty-helpers mesg) \
185 --disable-nologin \
186 --enable-partx \
187 $(multilib_native_use_with python) \
188 --enable-raw \
189 --enable-rename \
190 --disable-reset \
191 --enable-schedutils \
192 --disable-su \
193 $(multilib_native_use_enable tty-helpers wall) \
194 $(multilib_native_use_enable tty-helpers write) \
195 $(multilib_native_use_enable suid makeinstall-chown) \
196 $(multilib_native_use_enable suid makeinstall-setuid) \
197 $(use_with selinux) \
198 $(multilib_native_use_with slang) \
199 $(use_enable static-libs static) \
200 $(multilib_native_use_with udev) \
201 $(tc-has-tls || echo --disable-tls)
202 }
203
204 multilib_src_compile() {
205 if multilib_is_native_abi; then
206 default
207 else
208 # build libraries only
209 emake -f Makefile -f - mylibs \
210 <<< 'mylibs: $(usrlib_exec_LTLIBRARIES) $(pkgconfig_DATA)'
211 fi
212 }
213
214 multilib_src_test() {
215 multilib_is_native_abi && emake check
216 }
217
218 multilib_src_install() {
219 if multilib_is_native_abi; then
220 default
221 else
222 emake DESTDIR="${D}" install-usrlib_execLTLIBRARIES \
223 install-pkgconfigDATA install-uuidincHEADERS \
224 install-nodist_blkidincHEADERS install-nodist_mountincHEADERS \
225 install-nodist_smartcolsincHEADERS
226 fi
227
228 if multilib_is_native_abi; then
229 # need the libs in /
230 gen_usr_ldscript -a blkid mount smartcols uuid
231
232 use python && python_optimize
233 fi
234 }
235
236 multilib_src_install_all() {
237 dodoc AUTHORS NEWS README* Documentation/{TODO,*.txt,releases/*}
238
239 # e2fsprogs-libs didnt install .la files, and .pc work fine
240 prune_libtool_files
241 }
242
243 pkg_postinst() {
244 if ! use tty-helpers; then
245 elog "The mesg/wall/write tools have been disabled due to USE=-tty-helpers."
246 fi
247
248 if [[ -z ${REPLACING_VERSIONS} ]]; then
249 elog "The agetty util now clears the terminal by default. You"
250 elog "might want to add --noclear to your /etc/inittab lines."
251 fi
252 }