Gentoo Archives: gentoo-commits

From: Mike Frysinger <vapier@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/attr/files/, sys-apps/attr/
Date: Wed, 30 Mar 2016 23:49:02
Message-Id: 1459381663.9377cf897a40960f69b297907759024499996184.vapier@gentoo
1 commit: 9377cf897a40960f69b297907759024499996184
2 Author: Mike Frysinger <vapier <AT> gentoo <DOT> org>
3 AuthorDate: Wed Mar 30 22:56:33 2016 +0000
4 Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org>
5 CommitDate: Wed Mar 30 23:47:43 2016 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9377cf89
7
8 sys-apps/attr: drop old <2.4.47-r2 versions
9
10 sys-apps/attr/Manifest | 1 -
11 sys-apps/attr/attr-2.4.46-r2.ebuild | 54 -------
12 sys-apps/attr/attr-2.4.47-r1.ebuild | 69 --------
13 sys-apps/attr/files/attr-2.4.44-gettext.patch | 63 --------
14 sys-apps/attr/files/attr-2.4.46-config-shell.patch | 53 ------
15 .../attr/files/attr-2.4.46-generic-syscalls.patch | 180 ---------------------
16 6 files changed, 420 deletions(-)
17
18 diff --git a/sys-apps/attr/Manifest b/sys-apps/attr/Manifest
19 index 88c14e5..81a1c13 100644
20 --- a/sys-apps/attr/Manifest
21 +++ b/sys-apps/attr/Manifest
22 @@ -1,2 +1 @@
23 -DIST attr-2.4.46.src.tar.gz 338181 SHA256 dcd69bdca7ff166bc45141eddbcf21967999a6b66b0544be12a1cc2fd6340e1f SHA512 f1b8e6e4d1aa9f5c1b51d5d08684c9fdfa4b7d22efc1a77c13e4d5f0ae8e053bbb3d49a1c1e3c4143f63c9752ed534a2d009e0ab49cea880032620edbe8fdbb5 WHIRLPOOL 300f3be50a015f2d6d44a4707c31a312015c308899acdf146dfbbdb373336f5de7696f4832dba9543abd9cdfceccd84ef602d672fb88a125210e2622a13cf8fa
24 DIST attr-2.4.47.src.tar.gz 343692 SHA256 25772f653ac5b2e3ceeb89df50e4688891e21f723c460636548971652af0a859 SHA512 2a333f63655758298650cf8f89c175efdc0112dcc4013e8d023e2a9a69f177e4bcb1f1d10b6666d6f2027dca4dec0833d54749952ab153d28367e1a72e6e2831 WHIRLPOOL a012f7a0225e63d4d195fae7027e64c0c92edb039622bfdec611b2facbcde83eb5fc921ecfe95c50f54f7c9b518f57a0555dcedc148cc8ff6e73371668a40557
25
26 diff --git a/sys-apps/attr/attr-2.4.46-r2.ebuild b/sys-apps/attr/attr-2.4.46-r2.ebuild
27 deleted file mode 100644
28 index 5d19e57..0000000
29 --- a/sys-apps/attr/attr-2.4.46-r2.ebuild
30 +++ /dev/null
31 @@ -1,54 +0,0 @@
32 -# Copyright 1999-2014 Gentoo Foundation
33 -# Distributed under the terms of the GNU General Public License v2
34 -# $Id$
35 -
36 -EAPI="4"
37 -
38 -inherit eutils toolchain-funcs
39 -
40 -DESCRIPTION="Extended attributes tools"
41 -HOMEPAGE="http://savannah.nongnu.org/projects/attr"
42 -SRC_URI="mirror://nongnu/${PN}/${P}.src.tar.gz"
43 -
44 -LICENSE="LGPL-2.1"
45 -SLOT="0"
46 -KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~arm-linux ~x86-linux"
47 -IUSE="nls static-libs"
48 -
49 -DEPEND="nls? ( sys-devel/gettext )
50 - sys-devel/autoconf"
51 -RDEPEND=""
52 -
53 -src_prepare() {
54 - epatch "${FILESDIR}"/${PN}-2.4.44-gettext.patch
55 - epatch "${FILESDIR}"/${PN}-2.4.46-config-shell.patch #366671
56 - epatch "${FILESDIR}"/${PN}-2.4.46-generic-syscalls.patch #460702
57 - sed -i \
58 - -e "/^PKG_DOC_DIR/s:@pkg_name@:${PF}:" \
59 - -e '/HAVE_ZIPPED_MANPAGES/s:=.*:=false:' \
60 - include/builddefs.in \
61 - || die "failed to update builddefs"
62 - strip-linguas -u po
63 -}
64 -
65 -src_configure() {
66 - unset PLATFORM #184564
67 - export OPTIMIZER=${CFLAGS}
68 - export DEBUG=-DNDEBUG
69 -
70 - econf \
71 - $(use_enable nls gettext) \
72 - --enable-shared $(use_enable static-libs static) \
73 - --libexecdir="${EPREFIX}"/usr/$(get_libdir) \
74 - --bindir="${EPREFIX}"/bin
75 -}
76 -
77 -src_install() {
78 - emake DIST_ROOT="${D}" install install-lib install-dev || die
79 - use static-libs || find "${D}" -name '*.la' -delete
80 - # the man-pages packages provides the man2 files
81 - rm -r "${ED}"/usr/share/man/man2
82 -
83 - # we install attr into /bin, so we need the shared lib with it
84 - gen_usr_ldscript -a attr
85 -}
86
87 diff --git a/sys-apps/attr/attr-2.4.47-r1.ebuild b/sys-apps/attr/attr-2.4.47-r1.ebuild
88 deleted file mode 100644
89 index f0db984..0000000
90 --- a/sys-apps/attr/attr-2.4.47-r1.ebuild
91 +++ /dev/null
92 @@ -1,69 +0,0 @@
93 -# Copyright 1999-2014 Gentoo Foundation
94 -# Distributed under the terms of the GNU General Public License v2
95 -# $Id$
96 -
97 -EAPI="4"
98 -
99 -inherit eutils toolchain-funcs multilib-minimal
100 -
101 -DESCRIPTION="Extended attributes tools"
102 -HOMEPAGE="http://savannah.nongnu.org/projects/attr"
103 -SRC_URI="mirror://nongnu/${PN}/${P}.src.tar.gz"
104 -
105 -LICENSE="LGPL-2.1"
106 -SLOT="0"
107 -KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~arm-linux ~x86-linux"
108 -IUSE="nls static-libs"
109 -
110 -DEPEND="nls? ( sys-devel/gettext )
111 - sys-devel/autoconf"
112 -RDEPEND="abi_x86_32? (
113 - !<=app-emulation/emul-linux-x86-baselibs-20130224-r9
114 - !app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
115 - )"
116 -
117 -src_prepare() {
118 - sed -i \
119 - -e "/^PKG_DOC_DIR/s:@pkg_name@:${PF}:" \
120 - -e '/HAVE_ZIPPED_MANPAGES/s:=.*:=false:' \
121 - include/builddefs.in \
122 - || die
123 - strip-linguas -u po
124 - multilib_copy_sources # https://savannah.nongnu.org/bugs/index.php?39736
125 -}
126 -
127 -multilib_src_configure() {
128 - unset PLATFORM #184564
129 - export OPTIMIZER=${CFLAGS}
130 - export DEBUG=-DNDEBUG
131 -
132 - econf \
133 - $(use_enable nls gettext) \
134 - --enable-shared $(use_enable static-libs static) \
135 - --libexecdir="${EPREFIX}"/usr/$(get_libdir) \
136 - --bindir="${EPREFIX}"/bin
137 -}
138 -
139 -multilib_src_compile() {
140 - emake $(multilib_is_native_abi || echo TOOL_SUBDIRS=)
141 -}
142 -
143 -multilib_src_install() {
144 - emake \
145 - $(multilib_is_native_abi || echo TOOL_SUBDIRS=) \
146 - DIST_ROOT="${D}" \
147 - install install-lib install-dev
148 -
149 - if multilib_is_native_abi; then
150 - # we install attr into /bin, so we need the shared lib with it
151 - gen_usr_ldscript -a attr
152 - # the man-pages packages provides the man2 files
153 - # note: man-pages are installed by TOOL_SUBDIRS
154 - rm -r "${ED}"/usr/share/man/man2 || die
155 - fi
156 -}
157 -
158 -multilib_src_install_all() {
159 - use static-libs || prune_libtool_files --all
160 - einstalldocs
161 -}
162
163 diff --git a/sys-apps/attr/files/attr-2.4.44-gettext.patch b/sys-apps/attr/files/attr-2.4.44-gettext.patch
164 deleted file mode 100644
165 index 49c2d32..0000000
166 --- a/sys-apps/attr/files/attr-2.4.44-gettext.patch
167 +++ /dev/null
168 @@ -1,63 +0,0 @@
169 ---- include/gettext.h
170 -+++ include/gettext.h
171 -@@ -0,0 +1,10 @@
172 -+#include <config.h>
173 -+#ifdef ENABLE_GETTEXT
174 -+# include <libintl.h>
175 -+# define _(x) gettext(x)
176 -+#else
177 -+# define _(x) (x)
178 -+# define textdomain(d) do { } while (0)
179 -+# define bindtextdomain(d,dir) do { } while (0)
180 -+#endif
181 -+#include <locale.h>
182 ---- attr/attr.c
183 -+++ attr/attr.c
184 -@@ -26,6 +26,7 @@
185 - #include <errno.h>
186 - #include <string.h>
187 - #include <locale.h>
188 -+#include "gettext.h"
189 -
190 - #include <attr/attributes.h>
191 - #include "config.h"
192 ---- libattr/attr_copy_file.c.orig 2007-09-20 02:51:37.000000000 -0400
193 -+++ libattr/attr_copy_file.c 2007-09-20 02:51:51.000000000 -0400
194 -@@ -19,6 +19,7 @@
195 -
196 - #if defined (HAVE_CONFIG_H)
197 - #include "config.h"
198 -+#include "gettext.h"
199 - #endif
200 -
201 - #include <sys/types.h>
202 ---- libattr/attr_copy_fd.c.orig 2007-09-20 02:52:23.000000000 -0400
203 -+++ libattr/attr_copy_fd.c 2007-09-20 02:52:31.000000000 -0400
204 -@@ -19,6 +19,7 @@
205 -
206 - #if defined (HAVE_CONFIG_H)
207 - #include "config.h"
208 -+#include "gettext.h"
209 - #endif
210 -
211 - #include <sys/types.h>
212 ---- getfattr/getfattr.c.orig 2007-09-20 02:52:49.000000000 -0400
213 -+++ getfattr/getfattr.c 2007-09-20 02:52:59.000000000 -0400
214 -@@ -30,6 +30,7 @@
215 - #include <regex.h>
216 - #include <ftw.h>
217 - #include <locale.h>
218 -+#include "gettext.h"
219 -
220 - #include <attr/xattr.h>
221 - #include "config.h"
222 ---- setfattr/setfattr.c.orig 2007-09-20 02:53:12.000000000 -0400
223 -+++ setfattr/setfattr.c 2007-09-20 02:53:20.000000000 -0400
224 -@@ -28,6 +28,7 @@
225 - #include <getopt.h>
226 - #include <locale.h>
227 - #include <ctype.h>
228 -+#include "gettext.h"
229 -
230 - #include <attr/xattr.h>
231 - #include "config.h"
232
233 diff --git a/sys-apps/attr/files/attr-2.4.46-config-shell.patch b/sys-apps/attr/files/attr-2.4.46-config-shell.patch
234 deleted file mode 100644
235 index b6660e6..0000000
236 --- a/sys-apps/attr/files/attr-2.4.46-config-shell.patch
237 +++ /dev/null
238 @@ -1,53 +0,0 @@
239 -https://bugs.gentoo.org/366671
240 -
241 -From 10bfb16245ec4b55c1f5b6dc5554913bc9b13c9c Mon Sep 17 00:00:00 2001
242 -From: Mike Frysinger <vapier@g.o>
243 -Date: Mon, 16 May 2011 01:59:52 -0400
244 -Subject: [PATCH] use SHELL from configure
245 -
246 -If /bin/sh is not a functional enough shell, configure will select a
247 -SHELL of /bin/bash or better. But the current build helpers always
248 -hardcode /bin/sh, so if libtool itself configures itself for /bin/bash,
249 -things will fail when it attempts to do:
250 - SHELL = /bin/sh
251 - LIBTOOL = $(SHELL) .../libtool
252 - ...
253 - eval: 1: base_compile+= -pipe: not found
254 - ...
255 -
256 -So rather than hardcoding SHELL to /bin/sh, set it to @SHELL@ and let
257 -configure find a good value for us.
258 -
259 -Signed-off-by: Mike Frysinger <vapier@g.o>
260 ----
261 - include/builddefs.in | 1 +
262 - include/buildmacros | 1 -
263 - 2 files changed, 1 insertions(+), 1 deletions(-)
264 -
265 -diff --git a/include/builddefs.in b/include/builddefs.in
266 -index d054a56..434ce95 100644
267 ---- a/include/builddefs.in
268 -+++ b/include/builddefs.in
269 -@@ -46,6 +46,7 @@ MAKE = @make@
270 - ECHO = @echo@
271 - SORT = @sort@
272 - LN_S = @LN_S@
273 -+SHELL = @SHELL@
274 - LIBTOOL = @LIBTOOL@
275 - MAKEDEPEND = @makedepend@
276 -
277 -diff --git a/include/buildmacros b/include/buildmacros
278 -index ab89182..8efb32e 100644
279 ---- a/include/buildmacros
280 -+++ b/include/buildmacros
281 -@@ -42,7 +42,6 @@ OBJECTS = $(ASFILES:.s=.o) \
282 -
283 - INSTALL = $(TOPDIR)/include/install-sh -o $(PKG_USER) -g $(PKG_GROUP)
284 -
285 --SHELL = /bin/sh
286 - IMAGES_DIR = $(TOPDIR)/all-images
287 - DIST_DIR = $(TOPDIR)/dist
288 -
289 ---
290 -1.7.5.rc3
291 -
292
293 diff --git a/sys-apps/attr/files/attr-2.4.46-generic-syscalls.patch b/sys-apps/attr/files/attr-2.4.46-generic-syscalls.patch
294 deleted file mode 100644
295 index d12fcd2..0000000
296 --- a/sys-apps/attr/files/attr-2.4.46-generic-syscalls.patch
297 +++ /dev/null
298 @@ -1,180 +0,0 @@
299 -http://lists.nongnu.org/archive/html/acl-devel/2012-12/msg00000.html
300 -https://bugs.gentoo.org/460702
301 -
302 ---- a/libattr/syscalls.c
303 -+++ b/libattr/syscalls.c
304 -@@ -23,172 +23,10 @@
305 -
306 - #include <errno.h>
307 - #include <unistd.h>
308 -+#include <sys/syscall.h>
309 -
310 --#if defined (__i386__)
311 -+#if defined (__NR_setxattr)
312 - # define HAVE_XATTR_SYSCALLS 1
313 --# define __NR_setxattr 226
314 --# define __NR_lsetxattr 227
315 --# define __NR_fsetxattr 228
316 --# define __NR_getxattr 229
317 --# define __NR_lgetxattr 230
318 --# define __NR_fgetxattr 231
319 --# define __NR_listxattr 232
320 --# define __NR_llistxattr 233
321 --# define __NR_flistxattr 234
322 --# define __NR_removexattr 235
323 --# define __NR_lremovexattr 236
324 --# define __NR_fremovexattr 237
325 --#elif defined (__sparc__)
326 --# define HAVE_XATTR_SYSCALLS 1
327 --# define __NR_setxattr 169
328 --# define __NR_lsetxattr 170
329 --# define __NR_fsetxattr 171
330 --# define __NR_getxattr 172
331 --# define __NR_lgetxattr 173
332 --# define __NR_fgetxattr 177
333 --# define __NR_listxattr 178
334 --# define __NR_llistxattr 179
335 --# define __NR_flistxattr 180
336 --# define __NR_removexattr 181
337 --# define __NR_lremovexattr 182
338 --# define __NR_fremovexattr 186
339 --#elif defined (__ia64__)
340 --# define HAVE_XATTR_SYSCALLS 1
341 --# define __NR_setxattr 1217
342 --# define __NR_lsetxattr 1218
343 --# define __NR_fsetxattr 1219
344 --# define __NR_getxattr 1220
345 --# define __NR_lgetxattr 1221
346 --# define __NR_fgetxattr 1222
347 --# define __NR_listxattr 1223
348 --# define __NR_llistxattr 1224
349 --# define __NR_flistxattr 1225
350 --# define __NR_removexattr 1226
351 --# define __NR_lremovexattr 1227
352 --# define __NR_fremovexattr 1228
353 --#elif defined (__powerpc__)
354 --# define HAVE_XATTR_SYSCALLS 1
355 --# define __NR_setxattr 209
356 --# define __NR_lsetxattr 210
357 --# define __NR_fsetxattr 211
358 --# define __NR_getxattr 212
359 --# define __NR_lgetxattr 213
360 --# define __NR_fgetxattr 214
361 --# define __NR_listxattr 215
362 --# define __NR_llistxattr 216
363 --# define __NR_flistxattr 217
364 --# define __NR_removexattr 218
365 --# define __NR_lremovexattr 219
366 --# define __NR_fremovexattr 220
367 --#elif defined (__x86_64__)
368 --# define HAVE_XATTR_SYSCALLS 1
369 --# define __NR_setxattr 188
370 --# define __NR_lsetxattr 189
371 --# define __NR_fsetxattr 190
372 --# define __NR_getxattr 191
373 --# define __NR_lgetxattr 192
374 --# define __NR_fgetxattr 193
375 --# define __NR_listxattr 194
376 --# define __NR_llistxattr 195
377 --# define __NR_flistxattr 196
378 --# define __NR_removexattr 197
379 --# define __NR_lremovexattr 198
380 --# define __NR_fremovexattr 199
381 --#elif defined (__s390__)
382 --# define HAVE_XATTR_SYSCALLS 1
383 --# define __NR_setxattr 224
384 --# define __NR_lsetxattr 225
385 --# define __NR_fsetxattr 226
386 --# define __NR_getxattr 227
387 --# define __NR_lgetxattr 228
388 --# define __NR_fgetxattr 229
389 --# define __NR_listxattr 230
390 --# define __NR_llistxattr 231
391 --# define __NR_flistxattr 232
392 --# define __NR_removexattr 233
393 --# define __NR_lremovexattr 234
394 --# define __NR_fremovexattr 235
395 --#elif defined (__arm__)
396 --# define HAVE_XATTR_SYSCALLS 1
397 --# if defined(__ARM_EABI__) || defined(__thumb__)
398 --# define __NR_SYSCALL_BASE 0
399 --# else
400 --# define __NR_SYSCALL_BASE 0x900000
401 --# endif
402 --# define __NR_setxattr (__NR_SYSCALL_BASE+226)
403 --# define __NR_lsetxattr (__NR_SYSCALL_BASE+227)
404 --# define __NR_fsetxattr (__NR_SYSCALL_BASE+228)
405 --# define __NR_getxattr (__NR_SYSCALL_BASE+229)
406 --# define __NR_lgetxattr (__NR_SYSCALL_BASE+230)
407 --# define __NR_fgetxattr (__NR_SYSCALL_BASE+231)
408 --# define __NR_listxattr (__NR_SYSCALL_BASE+232)
409 --# define __NR_llistxattr (__NR_SYSCALL_BASE+233)
410 --# define __NR_flistxattr (__NR_SYSCALL_BASE+234)
411 --# define __NR_removexattr (__NR_SYSCALL_BASE+235)
412 --# define __NR_lremovexattr (__NR_SYSCALL_BASE+236)
413 --# define __NR_fremovexattr (__NR_SYSCALL_BASE+237)
414 --#elif defined (__mips64)
415 --# define HAVE_XATTR_SYSCALLS 1
416 --# ifdef __LP64__ /* mips64 using n64 ABI */
417 --# define __NR_Linux 5000
418 --# else /* mips64 using n32 ABI */
419 --# define __NR_Linux 6000
420 --# endif
421 --# define __NR_setxattr (__NR_Linux + 180)
422 --# define __NR_lsetxattr (__NR_Linux + 181)
423 --# define __NR_fsetxattr (__NR_Linux + 182)
424 --# define __NR_getxattr (__NR_Linux + 183)
425 --# define __NR_lgetxattr (__NR_Linux + 184)
426 --# define __NR_fgetxattr (__NR_Linux + 185)
427 --# define __NR_listxattr (__NR_Linux + 186)
428 --# define __NR_llistxattr (__NR_Linux + 187)
429 --# define __NR_flistxattr (__NR_Linux + 188)
430 --# define __NR_removexattr (__NR_Linux + 189)
431 --# define __NR_lremovexattr (__NR_Linux + 190)
432 --# define __NR_fremovexattr (__NR_Linux + 191)
433 --#elif defined (__mips__) /* mips32, or mips64 using o32 ABI */
434 --# define HAVE_XATTR_SYSCALLS 1
435 --# define __NR_Linux 4000
436 --# define __NR_setxattr (__NR_Linux + 224)
437 --# define __NR_lsetxattr (__NR_Linux + 225)
438 --# define __NR_fsetxattr (__NR_Linux + 226)
439 --# define __NR_getxattr (__NR_Linux + 227)
440 --# define __NR_lgetxattr (__NR_Linux + 228)
441 --# define __NR_fgetxattr (__NR_Linux + 229)
442 --# define __NR_listxattr (__NR_Linux + 230)
443 --# define __NR_llistxattr (__NR_Linux + 231)
444 --# define __NR_flistxattr (__NR_Linux + 232)
445 --# define __NR_removexattr (__NR_Linux + 233)
446 --# define __NR_lremovexattr (__NR_Linux + 234)
447 --# define __NR_fremovexattr (__NR_Linux + 235)
448 --#elif defined (__alpha__)
449 --# define HAVE_XATTR_SYSCALLS 1
450 --# define __NR_setxattr 382
451 --# define __NR_lsetxattr 383
452 --# define __NR_fsetxattr 384
453 --# define __NR_getxattr 385
454 --# define __NR_lgetxattr 386
455 --# define __NR_fgetxattr 387
456 --# define __NR_listxattr 388
457 --# define __NR_llistxattr 389
458 --# define __NR_flistxattr 390
459 --# define __NR_removexattr 391
460 --# define __NR_lremovexattr 392
461 --# define __NR_fremovexattr 393
462 --#elif defined (__mc68000__)
463 --# define HAVE_XATTR_SYSCALLS 1
464 --# define __NR_setxattr 223
465 --# define __NR_lsetxattr 224
466 --# define __NR_fsetxattr 225
467 --# define __NR_getxattr 226
468 --# define __NR_lgetxattr 227
469 --# define __NR_fgetxattr 228
470 --# define __NR_listxattr 229
471 --# define __NR_llistxattr 230
472 --# define __NR_flistxattr 231
473 --# define __NR_removexattr 232
474 --# define __NR_lremovexattr 233
475 --# define __NR_fremovexattr 234
476 - #else
477 - # warning "Extended attribute syscalls undefined for this architecture"
478 - # define HAVE_XATTR_SYSCALLS 0