public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: sys-apps/attr/files/, sys-apps/attr/
@ 2016-03-30 23:48 Mike Frysinger
  0 siblings, 0 replies; 2+ messages in thread
From: Mike Frysinger @ 2016-03-30 23:48 UTC (permalink / raw
  To: gentoo-commits

commit:     9377cf897a40960f69b297907759024499996184
Author:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
AuthorDate: Wed Mar 30 22:56:33 2016 +0000
Commit:     Mike Frysinger <vapier <AT> gentoo <DOT> org>
CommitDate: Wed Mar 30 23:47:43 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9377cf89

sys-apps/attr: drop old <2.4.47-r2 versions

 sys-apps/attr/Manifest                             |   1 -
 sys-apps/attr/attr-2.4.46-r2.ebuild                |  54 -------
 sys-apps/attr/attr-2.4.47-r1.ebuild                |  69 --------
 sys-apps/attr/files/attr-2.4.44-gettext.patch      |  63 --------
 sys-apps/attr/files/attr-2.4.46-config-shell.patch |  53 ------
 .../attr/files/attr-2.4.46-generic-syscalls.patch  | 180 ---------------------
 6 files changed, 420 deletions(-)

diff --git a/sys-apps/attr/Manifest b/sys-apps/attr/Manifest
index 88c14e5..81a1c13 100644
--- a/sys-apps/attr/Manifest
+++ b/sys-apps/attr/Manifest
@@ -1,2 +1 @@
-DIST attr-2.4.46.src.tar.gz 338181 SHA256 dcd69bdca7ff166bc45141eddbcf21967999a6b66b0544be12a1cc2fd6340e1f SHA512 f1b8e6e4d1aa9f5c1b51d5d08684c9fdfa4b7d22efc1a77c13e4d5f0ae8e053bbb3d49a1c1e3c4143f63c9752ed534a2d009e0ab49cea880032620edbe8fdbb5 WHIRLPOOL 300f3be50a015f2d6d44a4707c31a312015c308899acdf146dfbbdb373336f5de7696f4832dba9543abd9cdfceccd84ef602d672fb88a125210e2622a13cf8fa
 DIST attr-2.4.47.src.tar.gz 343692 SHA256 25772f653ac5b2e3ceeb89df50e4688891e21f723c460636548971652af0a859 SHA512 2a333f63655758298650cf8f89c175efdc0112dcc4013e8d023e2a9a69f177e4bcb1f1d10b6666d6f2027dca4dec0833d54749952ab153d28367e1a72e6e2831 WHIRLPOOL a012f7a0225e63d4d195fae7027e64c0c92edb039622bfdec611b2facbcde83eb5fc921ecfe95c50f54f7c9b518f57a0555dcedc148cc8ff6e73371668a40557

diff --git a/sys-apps/attr/attr-2.4.46-r2.ebuild b/sys-apps/attr/attr-2.4.46-r2.ebuild
deleted file mode 100644
index 5d19e57..0000000
--- a/sys-apps/attr/attr-2.4.46-r2.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-
-inherit eutils toolchain-funcs
-
-DESCRIPTION="Extended attributes tools"
-HOMEPAGE="http://savannah.nongnu.org/projects/attr"
-SRC_URI="mirror://nongnu/${PN}/${P}.src.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~arm-linux ~x86-linux"
-IUSE="nls static-libs"
-
-DEPEND="nls? ( sys-devel/gettext )
-	sys-devel/autoconf"
-RDEPEND=""
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-2.4.44-gettext.patch
-	epatch "${FILESDIR}"/${PN}-2.4.46-config-shell.patch #366671
-	epatch "${FILESDIR}"/${PN}-2.4.46-generic-syscalls.patch #460702
-	sed -i \
-		-e "/^PKG_DOC_DIR/s:@pkg_name@:${PF}:" \
-		-e '/HAVE_ZIPPED_MANPAGES/s:=.*:=false:' \
-		include/builddefs.in \
-		|| die "failed to update builddefs"
-	strip-linguas -u po
-}
-
-src_configure() {
-	unset PLATFORM #184564
-	export OPTIMIZER=${CFLAGS}
-	export DEBUG=-DNDEBUG
-
-	econf \
-		$(use_enable nls gettext) \
-		--enable-shared $(use_enable static-libs static) \
-		--libexecdir="${EPREFIX}"/usr/$(get_libdir) \
-		--bindir="${EPREFIX}"/bin
-}
-
-src_install() {
-	emake DIST_ROOT="${D}" install install-lib install-dev || die
-	use static-libs || find "${D}" -name '*.la' -delete
-	# the man-pages packages provides the man2 files
-	rm -r "${ED}"/usr/share/man/man2
-
-	# we install attr into /bin, so we need the shared lib with it
-	gen_usr_ldscript -a attr
-}

diff --git a/sys-apps/attr/attr-2.4.47-r1.ebuild b/sys-apps/attr/attr-2.4.47-r1.ebuild
deleted file mode 100644
index f0db984..0000000
--- a/sys-apps/attr/attr-2.4.47-r1.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI="4"
-
-inherit eutils toolchain-funcs multilib-minimal
-
-DESCRIPTION="Extended attributes tools"
-HOMEPAGE="http://savannah.nongnu.org/projects/attr"
-SRC_URI="mirror://nongnu/${PN}/${P}.src.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="alpha amd64 arm arm64 hppa ia64 m68k ~mips ppc ppc64 s390 sh sparc x86 ~amd64-linux ~arm-linux ~x86-linux"
-IUSE="nls static-libs"
-
-DEPEND="nls? ( sys-devel/gettext )
-	sys-devel/autoconf"
-RDEPEND="abi_x86_32? (
-		!<=app-emulation/emul-linux-x86-baselibs-20130224-r9
-		!app-emulation/emul-linux-x86-baselibs[-abi_x86_32(-)]
-	)"
-
-src_prepare() {
-	sed -i \
-		-e "/^PKG_DOC_DIR/s:@pkg_name@:${PF}:" \
-		-e '/HAVE_ZIPPED_MANPAGES/s:=.*:=false:' \
-		include/builddefs.in \
-		|| die
-	strip-linguas -u po
-	multilib_copy_sources # https://savannah.nongnu.org/bugs/index.php?39736
-}
-
-multilib_src_configure() {
-	unset PLATFORM #184564
-	export OPTIMIZER=${CFLAGS}
-	export DEBUG=-DNDEBUG
-
-	econf \
-		$(use_enable nls gettext) \
-		--enable-shared $(use_enable static-libs static) \
-		--libexecdir="${EPREFIX}"/usr/$(get_libdir) \
-		--bindir="${EPREFIX}"/bin
-}
-
-multilib_src_compile() {
-	emake $(multilib_is_native_abi || echo TOOL_SUBDIRS=)
-}
-
-multilib_src_install() {
-	emake \
-		$(multilib_is_native_abi || echo TOOL_SUBDIRS=) \
-		DIST_ROOT="${D}" \
-		install install-lib install-dev
-
-	if multilib_is_native_abi; then
-		# we install attr into /bin, so we need the shared lib with it
-		gen_usr_ldscript -a attr
-		# the man-pages packages provides the man2 files
-		# note: man-pages are installed by TOOL_SUBDIRS
-		rm -r "${ED}"/usr/share/man/man2 || die
-	fi
-}
-
-multilib_src_install_all() {
-	use static-libs || prune_libtool_files --all
-	einstalldocs
-}

diff --git a/sys-apps/attr/files/attr-2.4.44-gettext.patch b/sys-apps/attr/files/attr-2.4.44-gettext.patch
deleted file mode 100644
index 49c2d32..0000000
--- a/sys-apps/attr/files/attr-2.4.44-gettext.patch
+++ /dev/null
@@ -1,63 +0,0 @@
---- include/gettext.h
-+++ include/gettext.h
-@@ -0,0 +1,10 @@
-+#include <config.h>
-+#ifdef ENABLE_GETTEXT
-+# include <libintl.h>
-+# define _(x)           gettext(x)
-+#else
-+# define _(x)           (x)
-+# define textdomain(d)      do { } while (0)
-+# define bindtextdomain(d,dir)  do { } while (0)
-+#endif
-+#include <locale.h>
---- attr/attr.c
-+++ attr/attr.c
-@@ -26,6 +26,7 @@
- #include <errno.h>
- #include <string.h>
- #include <locale.h>
-+#include "gettext.h"
- 
- #include <attr/attributes.h>
- #include "config.h"
---- libattr/attr_copy_file.c.orig	2007-09-20 02:51:37.000000000 -0400
-+++ libattr/attr_copy_file.c	2007-09-20 02:51:51.000000000 -0400
-@@ -19,6 +19,7 @@
- 
- #if defined (HAVE_CONFIG_H)
- #include "config.h"
-+#include "gettext.h"
- #endif
- 
- #include <sys/types.h>
---- libattr/attr_copy_fd.c.orig	2007-09-20 02:52:23.000000000 -0400
-+++ libattr/attr_copy_fd.c	2007-09-20 02:52:31.000000000 -0400
-@@ -19,6 +19,7 @@
- 
- #if defined (HAVE_CONFIG_H)
- #include "config.h"
-+#include "gettext.h"
- #endif
- 
- #include <sys/types.h>
---- getfattr/getfattr.c.orig	2007-09-20 02:52:49.000000000 -0400
-+++ getfattr/getfattr.c	2007-09-20 02:52:59.000000000 -0400
-@@ -30,6 +30,7 @@
- #include <regex.h>
- #include <ftw.h>
- #include <locale.h>
-+#include "gettext.h"
- 
- #include <attr/xattr.h>
- #include "config.h"
---- setfattr/setfattr.c.orig	2007-09-20 02:53:12.000000000 -0400
-+++ setfattr/setfattr.c	2007-09-20 02:53:20.000000000 -0400
-@@ -28,6 +28,7 @@
- #include <getopt.h>
- #include <locale.h>
- #include <ctype.h>
-+#include "gettext.h"
- 
- #include <attr/xattr.h>
- #include "config.h"

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
deleted file mode 100644
index b6660e6..0000000
--- a/sys-apps/attr/files/attr-2.4.46-config-shell.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-https://bugs.gentoo.org/366671
-
-From 10bfb16245ec4b55c1f5b6dc5554913bc9b13c9c Mon Sep 17 00:00:00 2001
-From: Mike Frysinger <vapier@gentoo.org>
-Date: Mon, 16 May 2011 01:59:52 -0400
-Subject: [PATCH] use SHELL from configure
-
-If /bin/sh is not a functional enough shell, configure will select a
-SHELL of /bin/bash or better.  But the current build helpers always
-hardcode /bin/sh, so if libtool itself configures itself for /bin/bash,
-things will fail when it attempts to do:
-	SHELL = /bin/sh
-	LIBTOOL = $(SHELL) .../libtool
-	...
-	eval: 1: base_compile+= -pipe: not found
-	...
-
-So rather than hardcoding SHELL to /bin/sh, set it to @SHELL@ and let
-configure find a good value for us.
-
-Signed-off-by: Mike Frysinger <vapier@gentoo.org>
----
- include/builddefs.in |    1 +
- include/buildmacros  |    1 -
- 2 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/include/builddefs.in b/include/builddefs.in
-index d054a56..434ce95 100644
---- a/include/builddefs.in
-+++ b/include/builddefs.in
-@@ -46,6 +46,7 @@ MAKE		= @make@
- ECHO		= @echo@
- SORT		= @sort@
- LN_S		= @LN_S@
-+SHELL		= @SHELL@
- LIBTOOL		= @LIBTOOL@
- MAKEDEPEND	= @makedepend@
- 
-diff --git a/include/buildmacros b/include/buildmacros
-index ab89182..8efb32e 100644
---- a/include/buildmacros
-+++ b/include/buildmacros
-@@ -42,7 +42,6 @@ OBJECTS = $(ASFILES:.s=.o) \
- 
- INSTALL	= $(TOPDIR)/include/install-sh -o $(PKG_USER) -g $(PKG_GROUP)
- 
--SHELL = /bin/sh
- IMAGES_DIR = $(TOPDIR)/all-images
- DIST_DIR = $(TOPDIR)/dist
- 
--- 
-1.7.5.rc3
-

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
deleted file mode 100644
index d12fcd2..0000000
--- a/sys-apps/attr/files/attr-2.4.46-generic-syscalls.patch
+++ /dev/null
@@ -1,180 +0,0 @@
-http://lists.nongnu.org/archive/html/acl-devel/2012-12/msg00000.html
-https://bugs.gentoo.org/460702
-
---- a/libattr/syscalls.c
-+++ b/libattr/syscalls.c
-@@ -23,172 +23,10 @@
- 
- #include <errno.h>
- #include <unistd.h>
-+#include <sys/syscall.h>
- 
--#if defined (__i386__)
-+#if defined (__NR_setxattr)
- # define HAVE_XATTR_SYSCALLS 1
--# define __NR_setxattr		226
--# define __NR_lsetxattr		227
--# define __NR_fsetxattr		228
--# define __NR_getxattr		229
--# define __NR_lgetxattr		230
--# define __NR_fgetxattr		231
--# define __NR_listxattr		232
--# define __NR_llistxattr	233
--# define __NR_flistxattr	234
--# define __NR_removexattr	235
--# define __NR_lremovexattr	236
--# define __NR_fremovexattr	237
--#elif defined (__sparc__)
--# define HAVE_XATTR_SYSCALLS 1
--# define __NR_setxattr		169
--# define __NR_lsetxattr		170
--# define __NR_fsetxattr		171
--# define __NR_getxattr		172
--# define __NR_lgetxattr		173
--# define __NR_fgetxattr		177
--# define __NR_listxattr		178
--# define __NR_llistxattr	179
--# define __NR_flistxattr	180
--# define __NR_removexattr	181
--# define __NR_lremovexattr	182
--# define __NR_fremovexattr	186
--#elif defined (__ia64__)
--# define HAVE_XATTR_SYSCALLS 1
--# define __NR_setxattr		1217
--# define __NR_lsetxattr		1218
--# define __NR_fsetxattr		1219
--# define __NR_getxattr		1220
--# define __NR_lgetxattr		1221
--# define __NR_fgetxattr		1222
--# define __NR_listxattr		1223
--# define __NR_llistxattr	1224
--# define __NR_flistxattr	1225
--# define __NR_removexattr	1226
--# define __NR_lremovexattr	1227
--# define __NR_fremovexattr	1228
--#elif defined (__powerpc__)
--# define HAVE_XATTR_SYSCALLS 1
--# define __NR_setxattr		209
--# define __NR_lsetxattr		210
--# define __NR_fsetxattr		211
--# define __NR_getxattr		212
--# define __NR_lgetxattr		213
--# define __NR_fgetxattr		214
--# define __NR_listxattr		215
--# define __NR_llistxattr	216
--# define __NR_flistxattr	217
--# define __NR_removexattr	218
--# define __NR_lremovexattr	219
--# define __NR_fremovexattr	220
--#elif defined (__x86_64__)
--# define HAVE_XATTR_SYSCALLS 1
--# define __NR_setxattr		188
--# define __NR_lsetxattr		189
--# define __NR_fsetxattr		190
--# define __NR_getxattr		191
--# define __NR_lgetxattr		192
--# define __NR_fgetxattr		193
--# define __NR_listxattr		194
--# define __NR_llistxattr	195
--# define __NR_flistxattr	196
--# define __NR_removexattr	197
--# define __NR_lremovexattr	198
--# define __NR_fremovexattr	199
--#elif defined (__s390__)
--# define HAVE_XATTR_SYSCALLS 1
--# define __NR_setxattr		224
--# define __NR_lsetxattr		225
--# define __NR_fsetxattr		226
--# define __NR_getxattr		227
--# define __NR_lgetxattr		228
--# define __NR_fgetxattr		229
--# define __NR_listxattr		230
--# define __NR_llistxattr	231
--# define __NR_flistxattr	232
--# define __NR_removexattr	233
--# define __NR_lremovexattr	234
--# define __NR_fremovexattr	235
--#elif defined (__arm__)
--# define HAVE_XATTR_SYSCALLS 1
--# if defined(__ARM_EABI__) || defined(__thumb__)
--#  define __NR_SYSCALL_BASE 0
--# else
--#  define __NR_SYSCALL_BASE 0x900000
--# endif
--# define __NR_setxattr		(__NR_SYSCALL_BASE+226)
--# define __NR_lsetxattr		(__NR_SYSCALL_BASE+227)
--# define __NR_fsetxattr		(__NR_SYSCALL_BASE+228)
--# define __NR_getxattr		(__NR_SYSCALL_BASE+229)
--# define __NR_lgetxattr		(__NR_SYSCALL_BASE+230)
--# define __NR_fgetxattr		(__NR_SYSCALL_BASE+231)
--# define __NR_listxattr		(__NR_SYSCALL_BASE+232)
--# define __NR_llistxattr	(__NR_SYSCALL_BASE+233)
--# define __NR_flistxattr	(__NR_SYSCALL_BASE+234)
--# define __NR_removexattr	(__NR_SYSCALL_BASE+235)
--# define __NR_lremovexattr	(__NR_SYSCALL_BASE+236)
--# define __NR_fremovexattr	(__NR_SYSCALL_BASE+237)
--#elif defined (__mips64)
--# define HAVE_XATTR_SYSCALLS 1
--# ifdef __LP64__ /* mips64 using n64 ABI */
--#  define __NR_Linux 5000
--# else /* mips64 using n32 ABI */
--#  define __NR_Linux 6000
--# endif
--# define __NR_setxattr		(__NR_Linux + 180)
--# define __NR_lsetxattr		(__NR_Linux + 181)
--# define __NR_fsetxattr		(__NR_Linux + 182)
--# define __NR_getxattr		(__NR_Linux + 183)
--# define __NR_lgetxattr		(__NR_Linux + 184)
--# define __NR_fgetxattr		(__NR_Linux + 185)
--# define __NR_listxattr		(__NR_Linux + 186)
--# define __NR_llistxattr	(__NR_Linux + 187)
--# define __NR_flistxattr	(__NR_Linux + 188)
--# define __NR_removexattr	(__NR_Linux + 189)
--# define __NR_lremovexattr	(__NR_Linux + 190)
--# define __NR_fremovexattr	(__NR_Linux + 191)
--#elif defined (__mips__) /* mips32, or mips64 using o32 ABI */
--# define HAVE_XATTR_SYSCALLS 1
--# define __NR_Linux 4000
--# define __NR_setxattr		(__NR_Linux + 224)
--# define __NR_lsetxattr		(__NR_Linux + 225)
--# define __NR_fsetxattr		(__NR_Linux + 226)
--# define __NR_getxattr		(__NR_Linux + 227)
--# define __NR_lgetxattr		(__NR_Linux + 228)
--# define __NR_fgetxattr		(__NR_Linux + 229)
--# define __NR_listxattr		(__NR_Linux + 230)
--# define __NR_llistxattr	(__NR_Linux + 231)
--# define __NR_flistxattr	(__NR_Linux + 232)
--# define __NR_removexattr	(__NR_Linux + 233)
--# define __NR_lremovexattr	(__NR_Linux + 234)
--# define __NR_fremovexattr	(__NR_Linux + 235)
--#elif defined (__alpha__)
--# define HAVE_XATTR_SYSCALLS 1
--# define __NR_setxattr		382
--# define __NR_lsetxattr		383
--# define __NR_fsetxattr		384
--# define __NR_getxattr		385
--# define __NR_lgetxattr		386
--# define __NR_fgetxattr		387
--# define __NR_listxattr		388
--# define __NR_llistxattr	389
--# define __NR_flistxattr	390
--# define __NR_removexattr	391
--# define __NR_lremovexattr	392
--# define __NR_fremovexattr	393
--#elif defined (__mc68000__)
--# define HAVE_XATTR_SYSCALLS 1
--# define __NR_setxattr		223
--# define __NR_lsetxattr		224
--# define __NR_fsetxattr		225
--# define __NR_getxattr		226
--# define __NR_lgetxattr		227
--# define __NR_fgetxattr		228
--# define __NR_listxattr		229
--# define __NR_llistxattr	230
--# define __NR_flistxattr	231
--# define __NR_removexattr	232
--# define __NR_lremovexattr	233
--# define __NR_fremovexattr	234
- #else
- # warning "Extended attribute syscalls undefined for this architecture"
- # define HAVE_XATTR_SYSCALLS 0


^ permalink raw reply related	[flat|nested] 2+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: sys-apps/attr/files/, sys-apps/attr/
@ 2021-06-06 15:42 David Seifert
  0 siblings, 0 replies; 2+ messages in thread
From: David Seifert @ 2021-06-06 15:42 UTC (permalink / raw
  To: gentoo-commits

commit:     e76267f67bb16203ff96c2d2011fd958154e46ce
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Sun Jun  6 15:41:44 2021 +0000
Commit:     David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Sun Jun  6 15:41:44 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e76267f6

sys-apps/attr: drop 2.4.48-r4, 2.4.48-r5, 2.5.0

Signed-off-by: David Seifert <soap <AT> gentoo.org>

 sys-apps/attr/Manifest                             |   2 -
 sys-apps/attr/attr-2.4.48-r4.ebuild                |  92 ---------------
 sys-apps/attr/attr-2.4.48-r5.ebuild                | 103 -----------------
 sys-apps/attr/attr-2.5.0.ebuild                    |  98 ----------------
 sys-apps/attr/files/attr-2.4.48-perl-5.26.patch    |  27 -----
 .../files/attr-2.4.48-switch-back-to-syscall.patch | 123 ---------------------
 6 files changed, 445 deletions(-)

diff --git a/sys-apps/attr/Manifest b/sys-apps/attr/Manifest
index c3a9128a6da..225b7624ecb 100644
--- a/sys-apps/attr/Manifest
+++ b/sys-apps/attr/Manifest
@@ -1,3 +1 @@
-DIST attr-2.4.48.tar.gz 467840 BLAKE2B 8fa6a5013b927850868b6913d026f23f116b75da3925d5da5eea007e14f5d9e309f98290b7ffaa6c62f620ff8f3ec7bfb3a1fcb04f3c0c072fca5feacaf804c0 SHA512 75f870a0e6e19b8975f3fdceee786fbaff3eadaa9ab9af01996ffa8e50fe5b2bba6e4c22c44a6722d11b55feb9e89895d0151d6811c1d2b475ef4ed145f0c923
-DIST attr-2.5.0.tar.gz 465575 BLAKE2B b50c6b741543140099e7f31fcc327d4547cda41f1b14159664096b571c5c14ed7279992e94fdd9bc23d5618715a7d4fe8d45ba8d5cc2941ac6a4d242bc80ee09 SHA512 900e66d13acd022f52986d4159925b23e60f9ef5d11983b16d9dfe4a98fd70eea5f78e18f3694d8adea1c422324772af4da6b5659d755ed37484b428e28bb5fc
 DIST attr-2.5.1.tar.gz 465714 BLAKE2B 05928f8274b0b4beee31b329c8459436c5b9019ebd2f937667b7beb8df7a455c48742a90d9c4faca5c0b38c9c3812043d3d66f9587108d3424c6184fef494b56 SHA512 8b4c043d61f8f3e0cd098e701181069f51117b85fd6ba18bfe9af77d894ea671232377d4793ffc822e9259ceee6ac71d75732eb93b2830c6cb5d0d918ba2d21b

diff --git a/sys-apps/attr/attr-2.4.48-r4.ebuild b/sys-apps/attr/attr-2.4.48-r4.ebuild
deleted file mode 100644
index 02c33f7c1f4..00000000000
--- a/sys-apps/attr/attr-2.4.48-r4.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic libtool toolchain-funcs multilib-minimal usr-ldscript
-
-DESCRIPTION="Extended attributes tools"
-HOMEPAGE="https://savannah.nongnu.org/projects/attr"
-SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="debug nls static-libs"
-
-BDEPEND="nls? ( sys-devel/gettext )"
-
-PATCHES=(
-	"${FILESDIR}/${P}-perl-5.26.patch"
-	"${FILESDIR}/${P}-switch-back-to-syscall.patch"
-)
-
-pkg_setup() {
-	# Remove -flto* from flags as this breaks binaries (bug #644048)
-	filter-flags -flto*
-	append-ldflags "-Wl,--no-gc-sections" #700116
-}
-
-src_prepare() {
-	default
-	elibtoolize #580792
-}
-
-multilib_src_configure() {
-	unset PLATFORM #184564
-	export OPTIMIZER=${CFLAGS}
-	export DEBUG=-DNDEBUG
-
-	tc-ld-disable-gold #644048
-
-	local myeconfargs=(
-		--bindir="${EPREFIX}"/bin
-		--enable-shared
-		$(use_enable static-libs static)
-		$(use_enable nls)
-		--libexecdir="${EPREFIX}"/usr/$(get_libdir)
-		$(use_enable debug)
-	)
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" install
-
-	# Sanity check until we track down why this is happening. #644048
-	local lib="${ED}/usr/$(get_libdir)/libattr.so.1"
-	if [[ -e ${lib} ]] ; then
-		local versions=$($(tc-getREADELF) -V "${lib}")
-		local symbols=$($(tc-getREADELF) -sW "${lib}")
-		if [[ "${versions}" != *"ATTR_1.0"* || \
-		      "${versions}" != *"ATTR_1.1"* || \
-		      "${versions}" != *"ATTR_1.2"* || \
-		      "${versions}" != *"ATTR_1.3"* || \
-		      "${symbols}" != *"getxattr@ATTR_1.0"* ]] ; then
-			echo "# readelf -V ${lib}"
-			echo "${versions}"
-			echo "# readelf -sW ${lib}"
-			echo "${symbols}"
-			die "symbol version sanity check failed; please comment on https://bugs.gentoo.org/644048"
-		else
-			einfo "${lib} passed symbol checks"
-		fi
-	fi
-
-	if multilib_is_native_abi; then
-		# we install attr into /bin, so we need the shared lib with it
-		gen_usr_ldscript -a attr
-	fi
-
-	# Add a wrapper until people upgrade.
-	insinto /usr/include/attr
-	newins "${FILESDIR}"/xattr-shim.h xattr.h
-}
-
-multilib_src_install_all() {
-	if ! use static-libs; then
-		find "${ED}" -name '*.la' -delete || die
-	fi
-
-	einstalldocs
-}

diff --git a/sys-apps/attr/attr-2.4.48-r5.ebuild b/sys-apps/attr/attr-2.4.48-r5.ebuild
deleted file mode 100644
index 2de4d818916..00000000000
--- a/sys-apps/attr/attr-2.4.48-r5.ebuild
+++ /dev/null
@@ -1,103 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit flag-o-matic libtool toolchain-funcs multilib-minimal usr-ldscript
-
-if [[ ${PV} == 9999 ]] ; then
-	EGIT_REPO_URI="https://git.savannah.gnu.org/git/${PN}.git"
-
-	inherit autotools git-r3
-else
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
-	SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz"
-fi
-
-DESCRIPTION="Extended attributes tools"
-HOMEPAGE="https://savannah.nongnu.org/projects/attr"
-LICENSE="LGPL-2.1"
-SLOT="0"
-
-IUSE="debug nls static-libs"
-
-BDEPEND="nls? ( sys-devel/gettext )"
-
-src_prepare() {
-	local PATCHES=(
-		"${FILESDIR}/${P}-perl-5.26.patch"
-		"${FILESDIR}/${P}-switch-back-to-syscall.patch"
-	)
-
-	default
-
-	if [[ ${PV} == 9999 ]] ; then
-		po/update-potfiles || die
-		eautopoint
-		eautoreconf
-	else
-		elibtoolize #580792
-	fi
-}
-
-src_configure() {
-	# Remove -flto* from flags as this breaks binaries (bug #644048)
-	filter-flags -flto*
-	append-ldflags "-Wl,--no-gc-sections" #700116
-	tc-ld-disable-gold #644048
-	append-lfs-flags #760857
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		--bindir="${EPREFIX}"/bin
-		--enable-shared
-		$(use_enable static-libs static)
-		$(use_enable nls)
-		--libexecdir="${EPREFIX}"/usr/$(get_libdir)
-		$(use_enable debug)
-	)
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" install
-
-	# Sanity check until we track down why this is happening. #644048
-	local lib="${ED}/usr/$(get_libdir)/libattr.so.1"
-	if [[ -e ${lib} ]] ; then
-		local versions=$($(tc-getREADELF) -V "${lib}")
-		local symbols=$($(tc-getREADELF) -sW "${lib}")
-		if [[ "${versions}" != *"ATTR_1.0"* || \
-		      "${versions}" != *"ATTR_1.1"* || \
-		      "${versions}" != *"ATTR_1.2"* || \
-		      "${versions}" != *"ATTR_1.3"* || \
-		      "${symbols}" != *"getxattr@ATTR_1.0"* ]] ; then
-			echo "# readelf -V ${lib}"
-			echo "${versions}"
-			echo "# readelf -sW ${lib}"
-			echo "${symbols}"
-			die "symbol version sanity check failed; please comment on https://bugs.gentoo.org/644048"
-		else
-			einfo "${lib} passed symbol checks"
-		fi
-	fi
-
-	if multilib_is_native_abi; then
-		# we install attr into /bin, so we need the shared lib with it
-		gen_usr_ldscript -a attr
-	fi
-
-	# Add a wrapper until people upgrade.
-	insinto /usr/include/attr
-	newins "${FILESDIR}"/xattr-shim.h xattr.h
-}
-
-multilib_src_install_all() {
-	if ! use static-libs; then
-		find "${ED}" -name '*.la' -delete || die
-	fi
-
-	einstalldocs
-}

diff --git a/sys-apps/attr/attr-2.5.0.ebuild b/sys-apps/attr/attr-2.5.0.ebuild
deleted file mode 100644
index 7465baca96b..00000000000
--- a/sys-apps/attr/attr-2.5.0.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit flag-o-matic libtool toolchain-funcs multilib-minimal usr-ldscript
-
-if [[ ${PV} == 9999 ]] ; then
-	EGIT_REPO_URI="https://git.savannah.gnu.org/git/${PN}.git"
-
-	inherit autotools git-r3
-else
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
-	SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz"
-fi
-
-DESCRIPTION="Extended attributes tools"
-HOMEPAGE="https://savannah.nongnu.org/projects/attr"
-LICENSE="LGPL-2.1"
-SLOT="0"
-
-IUSE="debug nls static-libs"
-
-BDEPEND="nls? ( sys-devel/gettext )"
-
-src_prepare() {
-	default
-
-	if [[ ${PV} == 9999 ]] ; then
-		po/update-potfiles || die
-		eautopoint
-		eautoreconf
-	else
-		elibtoolize #580792
-	fi
-}
-
-src_configure() {
-	# Remove -flto* from flags as this breaks binaries (bug #644048)
-	filter-flags -flto*
-	append-ldflags "-Wl,--no-gc-sections" #700116
-	tc-ld-disable-gold #644048
-	append-lfs-flags #760857
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		--bindir="${EPREFIX}"/bin
-		--enable-shared
-		$(use_enable static-libs static)
-		$(use_enable nls)
-		--libexecdir="${EPREFIX}"/usr/$(get_libdir)
-		$(use_enable debug)
-	)
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" install
-
-	# Sanity check until we track down why this is happening. #644048
-	local lib="${ED}/usr/$(get_libdir)/libattr.so.1"
-	if [[ -e ${lib} ]] ; then
-		local versions=$($(tc-getREADELF) -V "${lib}")
-		local symbols=$($(tc-getREADELF) -sW "${lib}")
-		if [[ "${versions}" != *"ATTR_1.0"* || \
-		      "${versions}" != *"ATTR_1.1"* || \
-		      "${versions}" != *"ATTR_1.2"* || \
-		      "${versions}" != *"ATTR_1.3"* || \
-		      "${symbols}" != *"getxattr@ATTR_1.0"* ]] ; then
-			echo "# readelf -V ${lib}"
-			echo "${versions}"
-			echo "# readelf -sW ${lib}"
-			echo "${symbols}"
-			die "symbol version sanity check failed; please comment on https://bugs.gentoo.org/644048"
-		else
-			einfo "${lib} passed symbol checks"
-		fi
-	fi
-
-	if multilib_is_native_abi; then
-		# we install attr into /bin, so we need the shared lib with it
-		gen_usr_ldscript -a attr
-	fi
-
-	# Add a wrapper until people upgrade.
-	insinto /usr/include/attr
-	newins "${FILESDIR}"/xattr-shim.h xattr.h
-}
-
-multilib_src_install_all() {
-	if ! use static-libs; then
-		find "${ED}" -name '*.la' -delete || die
-	fi
-
-	einstalldocs
-}

diff --git a/sys-apps/attr/files/attr-2.4.48-perl-5.26.patch b/sys-apps/attr/files/attr-2.4.48-perl-5.26.patch
deleted file mode 100644
index 49b4c1a5766..00000000000
--- a/sys-apps/attr/files/attr-2.4.48-perl-5.26.patch
+++ /dev/null
@@ -1,27 +0,0 @@
-From 406eab7aa09da9df787a964d3c152c0bda6e23c4 Mon Sep 17 00:00:00 2001
-From: Troy Dawson <tdawson@redhat.com>
-Date: Mon, 24 Jul 2017 14:42:06 +0200
-Subject: [PATCH attr] test: escape left brace in a regex in test/run
-
-... to fix test-suite failure with perl-5.26.0
-
-Bug: https://bugzilla.redhat.com/1473853
----
- test/run | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/test/run b/test/run
-index 4b1f8d0d6134..07e916c41947 100755
---- a/test/run
-+++ b/test/run
-@@ -106,7 +106,7 @@ for (;;) {
-   if (defined $line) {
-     # Substitute %VAR and %{VAR} with environment variables.
-     $line =~ s[%(\w+)][$ENV{$1}]eg;
--    $line =~ s[%{(\w+)}][$ENV{$1}]eg;
-+    $line =~ s[%\{(\w+)}][$ENV{$1}]eg;
-   }
-   if (defined $line) {
-     if ($line =~ s/^\s*< ?//) {
--- 
-2.16.1

diff --git a/sys-apps/attr/files/attr-2.4.48-switch-back-to-syscall.patch b/sys-apps/attr/files/attr-2.4.48-switch-back-to-syscall.patch
deleted file mode 100644
index 5691b15420c..00000000000
--- a/sys-apps/attr/files/attr-2.4.48-switch-back-to-syscall.patch
+++ /dev/null
@@ -1,123 +0,0 @@
-From 14adc898a36948267bfe5c63b399996879e94c98 Mon Sep 17 00:00:00 2001
-From: Andreas Gruenbacher <agruenba@redhat.com>
-Date: Fri, 17 Aug 2018 14:07:31 +0200
-Subject: Switch back to syscall()
-
-Switch back to syscall() for the *xattr system calls.  The current
-mechanism of forwarding those calls to glibc breaks libraries like
-libfakeroot (fakeroot) and libasan (the gcc address sanitizer; gcc
--fsanitize=address).
-
-Those libraries provide wrappers for functions defined in other shared
-libraries, usually glibc, do their own processing, and forward calls to
-the original symbols looke dup via dlsym(RTLD_NEXT, "symbol_name").  In
-our case, dlsym returns the libattr_*xattr wrappers.  However, when our
-wrappers try calling glibc, they end up calling the libfakeroot /
-libasan wrappers instead because those override the original symbols =>
-recursion.
-
-The libattr_*xattr wrappers will only be used when symbols are looked up
-at runtime (dlopen / dlsym).  Programs linking against libattr will
-directly use the glibc provided symbols.  Therefore, the slightly worse
-performance of syscall() won't affect any of the "normal" users of
-libattr.
----
- libattr/syscalls.c | 26 ++++++++++++++------------
- 1 file changed, 14 insertions(+), 12 deletions(-)
-
-diff --git a/libattr/syscalls.c b/libattr/syscalls.c
-index 3013aa0..721ad7f 100644
---- a/libattr/syscalls.c
-+++ b/libattr/syscalls.c
-@@ -22,6 +22,8 @@
- 
- #include "config.h"
- 
-+#include <unistd.h>
-+#include <sys/syscall.h>
- #include <sys/xattr.h>
- 
- #ifdef HAVE_VISIBILITY_ATTRIBUTE
-@@ -31,67 +33,67 @@
- int libattr_setxattr(const char *path, const char *name,
- 		     void *value, size_t size, int flags)
- {
--	return setxattr(path, name, value, size, flags);
-+	return syscall(__NR_setxattr, path, name, value, size, flags);
- }
- 
- int libattr_lsetxattr(const char *path, const char *name,
- 		      void *value, size_t size, int flags)
- {
--	return lsetxattr(path, name, value, size, flags);
-+	return syscall(__NR_lsetxattr, path, name, value, size, flags);
- }
- 
- int libattr_fsetxattr(int filedes, const char *name,
- 		      void *value, size_t size, int flags)
- {
--	return fsetxattr(filedes, name, value, size, flags);
-+	return syscall(__NR_fsetxattr, filedes, name, value, size, flags);
- }
- 
- ssize_t libattr_getxattr(const char *path, const char *name,
- 			 void *value, size_t size)
- {
--	return getxattr(path, name, value, size);
-+	return syscall(__NR_getxattr, path, name, value, size);
- }
- 
- ssize_t libattr_lgetxattr(const char *path, const char *name,
- 			  void *value, size_t size)
- {
--	return lgetxattr(path, name, value, size);
-+	return syscall(__NR_lgetxattr, path, name, value, size);
- }
- 
- ssize_t libattr_fgetxattr(int filedes, const char *name,
- 			  void *value, size_t size)
- {
--	return fgetxattr(filedes, name, value, size);
-+	return syscall(__NR_fgetxattr, filedes, name, value, size);
- }
- 
- ssize_t libattr_listxattr(const char *path, char *list, size_t size)
- {
--	return listxattr(path, list, size);
-+	return syscall(__NR_listxattr, path, list, size);
- }
- 
- ssize_t libattr_llistxattr(const char *path, char *list, size_t size)
- {
--	return llistxattr(path, list, size);
-+	return syscall(__NR_llistxattr, path, list, size);
- }
- 
- ssize_t libattr_flistxattr(int filedes, char *list, size_t size)
- {
--	return flistxattr(filedes, list, size);
-+	return syscall(__NR_flistxattr, filedes, list, size);
- }
- 
- int libattr_removexattr(const char *path, const char *name)
- {
--	return removexattr(path, name);
-+	return syscall(__NR_removexattr, path, name);
- }
- 
- int libattr_lremovexattr(const char *path, const char *name)
- {
--	return lremovexattr(path, name);
-+	return syscall(__NR_lremovexattr, path, name);
- }
- 
- int libattr_fremovexattr(int filedes, const char *name)
- {
--	return fremovexattr(filedes, name);
-+	return syscall(__NR_fremovexattr, filedes, name);
- }
- 
- #ifdef HAVE_VISIBILITY_ATTRIBUTE
--- 
-cgit v1.0-41-gc330
-


^ permalink raw reply related	[flat|nested] 2+ messages in thread
end of thread, other threads:[~2021-06-06 15:43 UTC | newest]

Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2021-06-06 15:42 [gentoo-commits] repo/gentoo:master commit in: sys-apps/attr/files/, sys-apps/attr/ David Seifert
  -- strict thread matches above, loose matches on Subject: below --
2016-03-30 23:48 Mike Frysinger

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox