| 1 |
commit: fae392bd323c12e8d89b4b72cb9835a464f0cdd1 |
| 2 |
Author: David Michael <fedora.dm0 <AT> gmail <DOT> com> |
| 3 |
AuthorDate: Thu Sep 3 12:38:33 2020 +0000 |
| 4 |
Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Sep 7 20:43:59 2020 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fae392bd |
| 7 |
|
| 8 |
sys-apps/attr: EAPI 7 |
| 9 |
|
| 10 |
Closes: https://bugs.gentoo.org/739304 |
| 11 |
Package-Manager: Portage-3.0.4, Repoman-2.3.23 |
| 12 |
Signed-off-by: David Michael <fedora.dm0 <AT> gmail.com> |
| 13 |
Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org> |
| 14 |
|
| 15 |
.../{attr-9999.ebuild => attr-2.4.48-r4.ebuild} | 34 +++++++++------------- |
| 16 |
sys-apps/attr/attr-9999.ebuild | 4 +-- |
| 17 |
2 files changed, 15 insertions(+), 23 deletions(-) |
| 18 |
|
| 19 |
diff --git a/sys-apps/attr/attr-9999.ebuild b/sys-apps/attr/attr-2.4.48-r4.ebuild |
| 20 |
similarity index 79% |
| 21 |
copy from sys-apps/attr/attr-9999.ebuild |
| 22 |
copy to sys-apps/attr/attr-2.4.48-r4.ebuild |
| 23 |
index 8d4a48d28f0..61b24dcb0c8 100644 |
| 24 |
--- a/sys-apps/attr/attr-9999.ebuild |
| 25 |
+++ b/sys-apps/attr/attr-2.4.48-r4.ebuild |
| 26 |
@@ -1,43 +1,35 @@ |
| 27 |
# Copyright 1999-2020 Gentoo Authors |
| 28 |
# Distributed under the terms of the GNU General Public License v2 |
| 29 |
|
| 30 |
-EAPI="7" |
| 31 |
+EAPI=7 |
| 32 |
|
| 33 |
inherit flag-o-matic libtool toolchain-funcs multilib-minimal usr-ldscript |
| 34 |
|
| 35 |
-if [[ ${PV} == 9999 ]] ; then |
| 36 |
- EGIT_REPO_URI="https://git.savannah.gnu.org/git/${PN}.git" |
| 37 |
- |
| 38 |
- inherit autotools git-r3 |
| 39 |
-else |
| 40 |
- KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" |
| 41 |
- SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz" |
| 42 |
-fi |
| 43 |
- |
| 44 |
DESCRIPTION="Extended attributes tools" |
| 45 |
HOMEPAGE="https://savannah.nongnu.org/projects/attr" |
| 46 |
+SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz" |
| 47 |
+ |
| 48 |
LICENSE="LGPL-2.1" |
| 49 |
SLOT="0" |
| 50 |
- |
| 51 |
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux" |
| 52 |
IUSE="debug nls static-libs" |
| 53 |
|
| 54 |
-DEPEND="nls? ( sys-devel/gettext )" |
| 55 |
+BDEPEND="nls? ( sys-devel/gettext )" |
| 56 |
+ |
| 57 |
+PATCHES=( |
| 58 |
+ "${FILESDIR}/${P}-perl-5.26.patch" |
| 59 |
+ "${FILESDIR}/${P}-switch-back-to-syscall.patch" |
| 60 |
+) |
| 61 |
|
| 62 |
pkg_setup() { |
| 63 |
# Remove -flto* from flags as this breaks binaries (bug #644048) |
| 64 |
filter-flags -flto* |
| 65 |
+ append-ldflags "-Wl,--no-gc-sections" #700116 |
| 66 |
} |
| 67 |
|
| 68 |
src_prepare() { |
| 69 |
default |
| 70 |
- |
| 71 |
- if [[ ${PV} == 9999 ]] ; then |
| 72 |
- po/update-potfiles || die |
| 73 |
- eautopoint |
| 74 |
- eautoreconf |
| 75 |
- else |
| 76 |
- elibtoolize #580792 |
| 77 |
- fi |
| 78 |
+ elibtoolize #580792 |
| 79 |
} |
| 80 |
|
| 81 |
multilib_src_configure() { |
| 82 |
@@ -65,7 +57,7 @@ multilib_src_install() { |
| 83 |
local lib="${ED}/usr/$(get_libdir)/libattr.so.1" |
| 84 |
if [[ -e ${lib} ]] ; then |
| 85 |
local versions=$($(tc-getREADELF) -V "${lib}") |
| 86 |
- local symbols=$((tc-getREADELF) -sW "${lib}") |
| 87 |
+ local symbols=$($(tc-getREADELF) -sW "${lib}") |
| 88 |
if [[ "${versions}" != *"ATTR_1.0"* || \ |
| 89 |
"${versions}" != *"ATTR_1.1"* || \ |
| 90 |
"${versions}" != *"ATTR_1.2"* || \ |
| 91 |
|
| 92 |
diff --git a/sys-apps/attr/attr-9999.ebuild b/sys-apps/attr/attr-9999.ebuild |
| 93 |
index 8d4a48d28f0..7a00a2b560e 100644 |
| 94 |
--- a/sys-apps/attr/attr-9999.ebuild |
| 95 |
+++ b/sys-apps/attr/attr-9999.ebuild |
| 96 |
@@ -21,7 +21,7 @@ SLOT="0" |
| 97 |
|
| 98 |
IUSE="debug nls static-libs" |
| 99 |
|
| 100 |
-DEPEND="nls? ( sys-devel/gettext )" |
| 101 |
+BDEPEND="nls? ( sys-devel/gettext )" |
| 102 |
|
| 103 |
pkg_setup() { |
| 104 |
# Remove -flto* from flags as this breaks binaries (bug #644048) |
| 105 |
@@ -65,7 +65,7 @@ multilib_src_install() { |
| 106 |
local lib="${ED}/usr/$(get_libdir)/libattr.so.1" |
| 107 |
if [[ -e ${lib} ]] ; then |
| 108 |
local versions=$($(tc-getREADELF) -V "${lib}") |
| 109 |
- local symbols=$((tc-getREADELF) -sW "${lib}") |
| 110 |
+ local symbols=$($(tc-getREADELF) -sW "${lib}") |
| 111 |
if [[ "${versions}" != *"ATTR_1.0"* || \ |
| 112 |
"${versions}" != *"ATTR_1.1"* || \ |
| 113 |
"${versions}" != *"ATTR_1.2"* || \ |
Archives