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/findutils/files/, sys-apps/findutils/
Date: Fri, 25 Dec 2015 10:53:31
Message-Id: 1451040798.f16269fb464df0b8999c017d84f8713a4ecaff93.polynomial-c@gentoo
1 commit: f16269fb464df0b8999c017d84f8713a4ecaff93
2 Author: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
3 AuthorDate: Fri Dec 25 10:53:18 2015 +0000
4 Commit: Lars Wendler <polynomial-c <AT> gentoo <DOT> org>
5 CommitDate: Fri Dec 25 10:53:18 2015 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f16269fb
7
8 sys-apps/findutils: Removed old.
9
10 Package-Manager: portage-2.2.26
11 Signed-off-by: Lars Wendler <polynomial-c <AT> gentoo.org>
12
13 sys-apps/findutils/Manifest | 2 -
14 .../files/findutils-4.5.14-test-bashisms.patch | 66 ---------------------
15 sys-apps/findutils/findutils-4.5.14-r1.ebuild | 63 --------------------
16 sys-apps/findutils/findutils-4.5.15.ebuild | 68 ----------------------
17 4 files changed, 199 deletions(-)
18
19 diff --git a/sys-apps/findutils/Manifest b/sys-apps/findutils/Manifest
20 index f0c8cb4..06df4af 100644
21 --- a/sys-apps/findutils/Manifest
22 +++ b/sys-apps/findutils/Manifest
23 @@ -1,5 +1,3 @@
24 DIST findutils-4.4.2.tar.gz 2149838 SHA256 434f32d171cbc0a5e72cfc5372c6fc4cb0e681f8dce566a0de5b6fccd702b62a SHA512 262d0a8301158e6541b9f24e4e043d8d8c1b196b18dbe59c3bedcf17b50c95708e33ab23a07e3bfb947ad495faafffdca3c296fb525794ca60f2dfd682f228c1 WHIRLPOOL 2af1467403ece2f290be6b9f69db013d386427ab553efcf750ce36bf608fab0d37708209c22bf61b8a82f41aa13bf25a247c62f78dc95446290b7a4bd35d3393
25 -DIST findutils-4.5.14.tar.gz 3536727 SHA256 0de3cf625a5c9f154eee3171e072515ffdde405244dd00502af617ac57b73ae2 SHA512 e26f0d58c316202d99d7dcc1c4d4d40591150dcf198dff2dab0f8ef5e4dc039a5ff42ef536bfc08d860f39ee4bd8215591b4cb460ff45f73007040fc5f99e66b WHIRLPOOL 116b725ffb76562a3f1e9bbfa475a791b873746a7ae362eea1a97f3b701c6e32508eafb10fe47a3ad8f56ef0e67fb04a5d98a7baf5371646945718e7aff5ad60
26 -DIST findutils-4.5.15.tar.gz 3815470 SHA256 bc843179f32cba7bec8192edc91b4ad0d0bf434e61b82c04d9d2c8115617d9fb SHA512 425e14ce956fcfe83412d49b63f9487cda2ce935b6f707c4fe7d4334449d1db47369bad8358979b2782ac749047bf6396e49fb92bef114518a1d6c133417e186 WHIRLPOOL f6a3761dc2c50faca0a7684731ed543676382ac4c23ed48804d70c243b53ddd34ba41c0e96fbb20a079d3e51b4a1f1773707d8b1ed7c4e44b4685544b1ae7470
27 DIST findutils-4.5.16.tar.gz 3869606 SHA256 d116b48cf2a90a457726f58e24842bfa6078447d0c53be0fd1593f2555f7caae SHA512 d03100ea0708448ac714e86b6bc8ae4d9667f46df1cf0d29e1cfad6f52656254a47a2dd7ef88aaa68f94f399e848cd9d0977e25eda3781cfcd20819dc9fa76d6 WHIRLPOOL d42c7028eccdb38229aa725fade1a6aa2b2a57a65f317ccff83cf3da5594463f7810c17cc10fa5ced89a4213780133a57fd61948dc5d03b300a57f927e103eb2
28 DIST findutils-4.5.17.tar.gz 3871981 SHA256 a41f171f0e05b6960ae1081dc21fb87f58bf939395d6559e297b59a493136a4f SHA512 a3f9a522e721e1d5c4d1b2839dcf85e829c531cb3eb63ec99765b0d5367c7a64b51ec4150e93be3fca5c620eebd3ca7a3bd7eee868663068658ee23b003bdd7a WHIRLPOOL da22ebab27435c32718d082a9991548745d13468558562590609e57478f586e7789a49e88138e9f23833189a4dc3d79fbbeaba8b3481f1cf812f1dd8a9db93b8
29
30 diff --git a/sys-apps/findutils/files/findutils-4.5.14-test-bashisms.patch b/sys-apps/findutils/files/findutils-4.5.14-test-bashisms.patch
31 deleted file mode 100644
32 index 0bfe701..0000000
33 --- a/sys-apps/findutils/files/findutils-4.5.14-test-bashisms.patch
34 +++ /dev/null
35 @@ -1,66 +0,0 @@
36 -From 284afcb4a01996bb1a56f87da1e7c541fd0a903c Mon Sep 17 00:00:00 2001
37 -From: Mike Frysinger <vapier@g.o>
38 -Date: Sat, 4 Apr 2015 18:34:51 -0400
39 -Subject: [PATCH] test: fix bashisms
40 -
41 -These test scripts use #!/bin/sh, but then try to use bash-specific
42 -[[...]] tests. Change them to [...] instead.
43 -
44 -Reported-by: Paolo Pedroni <paolo.pedroni@×××.it>
45 -URL: https://bugs.gentoo.org/531020
46 -
47 -* find/testsuite/binary_locations.sh: Change [[...]] to [...].
48 -* find/testsuite/sv-34079.sh: Likewise.
49 ----
50 - find/testsuite/binary_locations.sh | 6 +++---
51 - find/testsuite/sv-34079.sh | 4 ++--
52 - 2 files changed, 5 insertions(+), 5 deletions(-)
53 -
54 -diff --git a/find/testsuite/binary_locations.sh b/find/testsuite/binary_locations.sh
55 -index 96943a0..238d57f 100644
56 ---- a/find/testsuite/binary_locations.sh
57 -+++ b/find/testsuite/binary_locations.sh
58 -@@ -1,15 +1,15 @@
59 - # Source this file, don't execute it.
60 -
61 --if [[ -z "${testname}" ]]; then
62 -+if [ -z "${testname}" ]; then
63 - echo 'Please set $testname before sourcing binary_locations.sh.' >&2
64 - exit 1
65 - fi
66 -
67 - parent="$(cd .. && pwd)"
68 --if [[ -f "${parent}/ftsfind" ]]; then
69 -+if [ -f "${parent}/ftsfind" ]; then
70 - ftsfind="${parent}/ftsfind"
71 - oldfind="${parent}/find"
72 --elif [[ -f "${parent}/oldfind" ]]; then
73 -+elif [ -f "${parent}/oldfind" ]; then
74 - ftsfind="${parent}/find"
75 - oldfind="${parent}/oldfind"
76 - else
77 -diff --git a/find/testsuite/sv-34079.sh b/find/testsuite/sv-34079.sh
78 -index 5773a3f..928a9af 100755
79 ---- a/find/testsuite/sv-34079.sh
80 -+++ b/find/testsuite/sv-34079.sh
81 -@@ -41,7 +41,7 @@ make_test_data() {
82 - }
83 -
84 -
85 --if [[ -n "${RUN_VERY_EXPENSIVE_TESTS}" ]]; then
86 -+if [ -n "${RUN_VERY_EXPENSIVE_TESTS}" ]; then
87 - if outdir=$(mktemp -d); then
88 - # Create some test files.
89 - bad=""
90 -@@ -64,7 +64,7 @@ if [[ -n "${RUN_VERY_EXPENSIVE_TESTS}" ]]; then
91 - bad="failed to set up the test in ${outdir}"
92 - fi
93 - rm -rf "${outdir}" || exit 1
94 -- if [[ -n "${bad}" ]]; then
95 -+ if [ -n "${bad}" ]; then
96 - echo "${bad}" >&2
97 - exit 1
98 - fi
99 ---
100 -2.3.5
101 -
102
103 diff --git a/sys-apps/findutils/findutils-4.5.14-r1.ebuild b/sys-apps/findutils/findutils-4.5.14-r1.ebuild
104 deleted file mode 100644
105 index f4f5a44..0000000
106 --- a/sys-apps/findutils/findutils-4.5.14-r1.ebuild
107 +++ /dev/null
108 @@ -1,63 +0,0 @@
109 -# Copyright 1999-2015 Gentoo Foundation
110 -# Distributed under the terms of the GNU General Public License v2
111 -# $Id$
112 -
113 -EAPI="4"
114 -
115 -PYTHON_COMPAT=( python2_7 )
116 -
117 -inherit eutils flag-o-matic toolchain-funcs python-any-r1
118 -
119 -DESCRIPTION="GNU utilities for finding files"
120 -HOMEPAGE="https://www.gnu.org/software/findutils/"
121 -SRC_URI="mirror://gnu-alpha/${PN}/${P}.tar.gz"
122 -
123 -LICENSE="GPL-3+"
124 -SLOT="0"
125 -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
126 -IUSE="debug nls selinux static"
127 -
128 -RDEPEND="selinux? ( sys-libs/libselinux )
129 - nls? ( virtual/libintl )"
130 -DEPEND="${RDEPEND}
131 - test? ( ${PYTHON_DEPS} )
132 - nls? ( sys-devel/gettext )"
133 -
134 -pkg_setup() {
135 - use test && python-any-r1_pkg_setup
136 -}
137 -
138 -src_prepare() {
139 - epatch "${FILESDIR}"/${P}-test-bashisms.patch #531020
140 - # Don't build or install locate because it conflicts with slocate,
141 - # which is a secure version of locate. See bug 18729
142 - sed -i '/^SUBDIRS/s/locate//' Makefile.in
143 -
144 - # Disable gnulib build test that has no impact on the source.
145 - # Re-enable w/next version bump (and gnulib is updated). #554728
146 - [[ ${PV} != "4.5.14" ]] && die "re-enable test #554728"
147 - echo 'exit 0' > tests/test-update-copyright.sh || die
148 -}
149 -
150 -src_configure() {
151 - use static && append-ldflags -static
152 -
153 - program_prefix=$(usex userland_GNU '' g)
154 - econf \
155 - --with-packager="Gentoo" \
156 - --with-packager-version="${PVR}" \
157 - --with-packager-bug-reports="https://bugs.gentoo.org/" \
158 - --program-prefix=${program_prefix} \
159 - $(use_enable debug) \
160 - $(use_enable nls) \
161 - $(use_with selinux) \
162 - --libexecdir='$(libdir)'/find
163 -}
164 -
165 -src_install() {
166 - default
167 -
168 - # We don't need this, so punt it.
169 - rm "${ED}"/usr/bin/${program_prefix}oldfind \
170 - "${ED}"/usr/share/man/man1/${program_prefix}oldfind.1 || die
171 -}
172
173 diff --git a/sys-apps/findutils/findutils-4.5.15.ebuild b/sys-apps/findutils/findutils-4.5.15.ebuild
174 deleted file mode 100644
175 index 71678a5..0000000
176 --- a/sys-apps/findutils/findutils-4.5.15.ebuild
177 +++ /dev/null
178 @@ -1,68 +0,0 @@
179 -# Copyright 1999-2015 Gentoo Foundation
180 -# Distributed under the terms of the GNU General Public License v2
181 -# $Id$
182 -
183 -EAPI="5"
184 -
185 -PYTHON_COMPAT=( python{2_7,3_3,3_4} )
186 -
187 -inherit eutils flag-o-matic toolchain-funcs python-any-r1
188 -
189 -DESCRIPTION="GNU utilities for finding files"
190 -HOMEPAGE="https://www.gnu.org/software/findutils/"
191 -SRC_URI="mirror://gnu-alpha/${PN}/${P}.tar.gz"
192 -
193 -LICENSE="GPL-3+"
194 -SLOT="0"
195 -KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86 ~ppc-aix ~amd64-fbsd ~sparc-fbsd ~x86-fbsd ~x64-freebsd ~x86-freebsd ~ia64-hpux ~x86-interix ~amd64-linux ~arm-linux ~ia64-linux ~x86-linux ~ppc-macos ~x64-macos ~x86-macos ~m68k-mint ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
196 -IUSE="debug nls selinux static test"
197 -
198 -RDEPEND="selinux? ( sys-libs/libselinux )
199 - nls? ( virtual/libintl )"
200 -DEPEND="${RDEPEND}
201 - test? ( ${PYTHON_DEPS} )
202 - nls? ( sys-devel/gettext )"
203 -
204 -pkg_setup() {
205 - use test && python-any-r1_pkg_setup
206 -}
207 -
208 -src_prepare() {
209 - # Don't build or install locate because it conflicts with slocate,
210 - # which is a secure version of locate. See bug 18729
211 - sed -i '/^SUBDIRS/s/locate//' Makefile.in
212 -
213 - # Disable gnulib build test that has no impact on the source.
214 - # Re-enable w/next version bump (and gnulib is updated). #554728
215 - [[ ${PV} != "4.5.15" ]] && die "re-enable test #554728"
216 - echo 'exit 0' > tests/test-update-copyright.sh || die
217 -}
218 -
219 -src_configure() {
220 - use static && append-ldflags -static
221 -
222 - program_prefix=$(usex userland_GNU '' g)
223 - econf \
224 - --with-packager="Gentoo" \
225 - --with-packager-version="${PVR}" \
226 - --with-packager-bug-reports="https://bugs.gentoo.org/" \
227 - --program-prefix=${program_prefix} \
228 - $(use_enable debug) \
229 - $(use_enable nls) \
230 - $(use_with selinux) \
231 - --libexecdir='$(libdir)'/find
232 -}
233 -
234 -src_compile() {
235 - # We don't build locate, but the docs want a file in there.
236 - emake -C locate dblocation.texi
237 - default
238 -}
239 -
240 -src_install() {
241 - default
242 -
243 - # We don't need this, so punt it.
244 - rm "${ED}"/usr/bin/${program_prefix}oldfind \
245 - "${ED}"/usr/share/man/man1/${program_prefix}oldfind.1 || die
246 -}