Gentoo Archives: gentoo-commits

From: "Mike Frysinger (vapier)" <vapier@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] gentoo-x86 commit in sys-apps/coreutils: metadata.xml coreutils-8.23.ebuild ChangeLog
Date: Mon, 28 Jul 2014 09:44:53
Message-Id: 20140728094448.A4C292004E@flycatcher.gentoo.org
1 vapier 14/07/28 09:44:48
2
3 Modified: metadata.xml ChangeLog
4 Added: coreutils-8.23.ebuild
5 Log:
6 Version bump.
7
8 (Portage version: 2.2.10/cvs/Linux x86_64, signed Manifest commit with key D2E96200)
9
10 Revision Changes Path
11 1.5 sys-apps/coreutils/metadata.xml
12
13 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/coreutils/metadata.xml?rev=1.5&view=markup
14 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/coreutils/metadata.xml?rev=1.5&content-type=text/plain
15 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/coreutils/metadata.xml?r1=1.4&r2=1.5
16
17 Index: metadata.xml
18 ===================================================================
19 RCS file: /var/cvsroot/gentoo-x86/sys-apps/coreutils/metadata.xml,v
20 retrieving revision 1.4
21 retrieving revision 1.5
22 diff -u -r1.4 -r1.5
23 --- metadata.xml 5 Jun 2013 00:35:14 -0000 1.4
24 +++ metadata.xml 28 Jul 2014 09:44:48 -0000 1.5
25 @@ -5,4 +5,7 @@
26 <upstream>
27 <remote-id type="cpe">cpe:/a:gnu:coreutils</remote-id>
28 </upstream>
29 +<use>
30 + <flag name='multicall'>Build all tools into a single `coreutils` program akin to busybox to save space</flag>
31 +</use>
32 </pkgmetadata>
33
34
35
36 1.391 sys-apps/coreutils/ChangeLog
37
38 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/coreutils/ChangeLog?rev=1.391&view=markup
39 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/coreutils/ChangeLog?rev=1.391&content-type=text/plain
40 diff : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/coreutils/ChangeLog?r1=1.390&r2=1.391
41
42 Index: ChangeLog
43 ===================================================================
44 RCS file: /var/cvsroot/gentoo-x86/sys-apps/coreutils/ChangeLog,v
45 retrieving revision 1.390
46 retrieving revision 1.391
47 diff -u -r1.390 -r1.391
48 --- ChangeLog 8 May 2014 19:42:07 -0000 1.390
49 +++ ChangeLog 28 Jul 2014 09:44:48 -0000 1.391
50 @@ -1,6 +1,12 @@
51 # ChangeLog for sys-apps/coreutils
52 # Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
53 -# $Header: /var/cvsroot/gentoo-x86/sys-apps/coreutils/ChangeLog,v 1.390 2014/05/08 19:42:07 vapier Exp $
54 +# $Header: /var/cvsroot/gentoo-x86/sys-apps/coreutils/ChangeLog,v 1.391 2014/07/28 09:44:48 vapier Exp $
55 +
56 +*coreutils-8.23 (28 Jul 2014)
57 +
58 + 28 Jul 2014; Mike Frysinger <vapier@g.o> +coreutils-8.23.ebuild,
59 + metadata.xml:
60 + Version bump.
61
62 08 May 2014; Mike Frysinger <vapier@g.o> coreutils-8.22-r1.ebuild:
63 Drop old migration logic as we have moved way beyond it and it causes issues
64
65
66
67 1.1 sys-apps/coreutils/coreutils-8.23.ebuild
68
69 file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/coreutils/coreutils-8.23.ebuild?rev=1.1&view=markup
70 plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/sys-apps/coreutils/coreutils-8.23.ebuild?rev=1.1&content-type=text/plain
71
72 Index: coreutils-8.23.ebuild
73 ===================================================================
74 # Copyright 1999-2014 Gentoo Foundation
75 # Distributed under the terms of the GNU General Public License v2
76 # $Header: /var/cvsroot/gentoo-x86/sys-apps/coreutils/coreutils-8.23.ebuild,v 1.1 2014/07/28 09:44:48 vapier Exp $
77
78 # To generate the man pages, unpack the upstream tarball and run:
79 # ./configure --enable-install-program=arch,coreutils
80 # make
81 # cd ..
82 # tar cf - coreutils-*/man/*.[0-9] | xz > coreutils-<ver>-man.tar.xz
83
84 EAPI="4"
85
86 inherit eutils flag-o-matic toolchain-funcs
87
88 PATCH_VER="1.0"
89 DESCRIPTION="Standard GNU file utilities (chmod, cp, dd, dir, ls...), text utilities (sort, tr, head, wc..), and shell utilities (whoami, who,...)"
90 HOMEPAGE="http://www.gnu.org/software/coreutils/"
91 SRC_URI="mirror://gnu/${PN}/${P}.tar.xz
92 mirror://gentoo/${P}-patches-${PATCH_VER}.tar.xz
93 http://dev.gentoo.org/~vapier/dist/${P}-patches-${PATCH_VER}.tar.xz
94 mirror://gentoo/${P}-man.tar.xz
95 http://dev.gentoo.org/~vapier/dist/${P}-man.tar.xz"
96
97 LICENSE="GPL-3"
98 SLOT="0"
99 KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~amd64-fbsd ~arm-linux ~x86-linux"
100 IUSE="acl caps gmp multicall nls selinux static userland_BSD vanilla xattr"
101
102 LIB_DEPEND="acl? ( sys-apps/acl[static-libs] )
103 caps? ( sys-libs/libcap )
104 gmp? ( dev-libs/gmp[static-libs] )
105 xattr? ( !userland_BSD? ( sys-apps/attr[static-libs] ) )"
106 RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs]} )
107 selinux? ( sys-libs/libselinux )
108 nls? ( virtual/libintl )
109 !app-misc/realpath
110 !<sys-apps/util-linux-2.13
111 !sys-apps/stat
112 !net-mail/base64
113 !sys-apps/mktemp
114 !<app-forensics/tct-1.18-r1
115 !<net-fs/netatalk-2.0.3-r4
116 !<sci-chemistry/ccp4-6.1.1"
117 DEPEND="${RDEPEND}
118 static? ( ${LIB_DEPEND} )
119 app-arch/xz-utils"
120
121 src_prepare() {
122 if ! use vanilla ; then
123 use_if_iuse unicode || rm -f "${WORKDIR}"/patch/000_all_coreutils-i18n.patch
124 EPATCH_SUFFIX="patch" \
125 PATCHDIR="${WORKDIR}/patch" \
126 EPATCH_EXCLUDE="001_all_coreutils-gen-progress-bar.patch" \
127 epatch
128 fi
129
130 # Since we've patched many .c files, the make process will try to
131 # re-build the manpages by running `./bin --help`. When doing a
132 # cross-compile, we can't do that since 'bin' isn't a native bin.
133 # Also, it's not like we changed the usage on any of these things,
134 # so let's just update the timestamps and skip the help2man step.
135 set -- man/*.x
136 touch ${@/%x/1}
137
138 # Avoid perl dep for compiled in dircolors default #348642
139 if ! has_version dev-lang/perl ; then
140 touch src/dircolors.h
141 touch ${@/%x/1}
142 fi
143 }
144
145 src_configure() {
146 local myconf=''
147 if tc-is-cross-compiler && [[ ${CHOST} == *linux* ]] ; then
148 export fu_cv_sys_stat_statfs2_bsize=yes #311569
149 export gl_cv_func_realpath_works=yes #416629
150 fi
151
152 export gl_cv_func_mknod_works=yes #409919
153 use static && append-ldflags -static && sed -i '/elf_sys=yes/s:yes:no:' configure #321821
154 use selinux || export ac_cv_{header_selinux_{context,flash,selinux}_h,search_setfilecon}=no #301782
155 use userland_BSD && myconf="${myconf} -program-prefix=g --program-transform-name=s/stat/nustat/"
156 # kill/uptime - procps
157 # groups/su - shadow
158 # hostname - net-tools
159 econf \
160 --with-packager="Gentoo" \
161 --with-packager-version="${PVR} (p${PATCH_VER:-0})" \
162 --with-packager-bug-reports="http://bugs.gentoo.org/" \
163 --enable-install-program="arch" \
164 --enable-no-install-program="groups,hostname,kill,su,uptime" \
165 --enable-largefile \
166 $(use caps || echo --disable-libcap) \
167 $(use_enable nls) \
168 $(use_enable acl) \
169 $(use_enable multicall single-binary) \
170 $(use_enable xattr) \
171 $(use_with gmp) \
172 ${myconf}
173 }
174
175 src_test() {
176 # Non-root tests will fail if the full path isnt
177 # accessible to non-root users
178 chmod -R go-w "${WORKDIR}"
179 chmod a+rx "${WORKDIR}"
180
181 # coreutils tests like to do `mount` and such with temp dirs
182 # so make sure /etc/mtab is writable #265725
183 # make sure /dev/loop* can be mounted #269758
184 mkdir -p "${T}"/mount-wrappers
185 mkwrap() {
186 local w ww
187 for w in "$@" ; do
188 ww="${T}/mount-wrappers/${w}"
189 cat <<-EOF > "${ww}"
190 #!${EPREFIX}/bin/sh
191 exec env SANDBOX_WRITE="\${SANDBOX_WRITE}:/etc/mtab:/dev/loop" $(type -P $w) "\$@"
192 EOF
193 chmod a+rx "${ww}"
194 done
195 }
196 mkwrap mount umount
197
198 addwrite /dev/full
199 #export RUN_EXPENSIVE_TESTS="yes"
200 #export FETISH_GROUPS="portage wheel"
201 env PATH="${T}/mount-wrappers:${PATH}" \
202 emake -j1 -k check
203 }
204
205 src_install() {
206 default
207
208 insinto /etc
209 newins src/dircolors.hin DIR_COLORS
210
211 if [[ ${USERLAND} == "GNU" ]] ; then
212 cd "${ED}"/usr/bin
213 dodir /bin
214 # move critical binaries into /bin (required by FHS)
215 local fhs="cat chgrp chmod chown cp date dd df echo false ln ls
216 mkdir mknod mv pwd rm rmdir stty sync true uname"
217 mv ${fhs} ../../bin/ || die "could not move fhs bins"
218 # move critical binaries into /bin (common scripts)
219 local com="basename chroot cut dir dirname du env expr head mkfifo
220 mktemp readlink seq sleep sort tail touch tr tty vdir wc yes"
221 mv ${com} ../../bin/ || die "could not move common bins"
222 # create a symlink for uname in /usr/bin/ since autotools require it
223 local x
224 for x in ${com} uname ; do
225 dosym /bin/${x} /usr/bin/${x}
226 done
227 else
228 # For now, drop the man pages, collides with the ones of the system.
229 rm -rf "${ED}"/usr/share/man
230 fi
231
232 }
233
234 pkg_postinst() {
235 ewarn "Make sure you run 'hash -r' in your active shells."
236 ewarn "You should also re-source your shell settings for LS_COLORS"
237 ewarn " changes, such as: source /etc/profile"
238
239 # Help out users using experimental filesystems
240 if grep -qs btrfs "${EROOT}"/etc/fstab /proc/mounts ; then
241 case $(uname -r) in
242 2.6.[12][0-9]|2.6.3[0-7]*)
243 ewarn "You are running a system with a buggy btrfs driver."
244 ewarn "Please upgrade your kernel to avoid silent corruption."
245 ewarn "See: https://bugs.gentoo.org/353907"
246 ;;
247 esac
248 fi
249 }