commit: fae392bd323c12e8d89b4b72cb9835a464f0cdd1 Author: David Michael <fedora.dm0 <AT> gmail <DOT> com> AuthorDate: Thu Sep 3 12:38:33 2020 +0000 Commit: Mike Gilbert <floppym <AT> gentoo <DOT> org> CommitDate: Mon Sep 7 20:43:59 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=fae392bd
sys-apps/attr: EAPI 7 Closes: https://bugs.gentoo.org/739304 Package-Manager: Portage-3.0.4, Repoman-2.3.23 Signed-off-by: David Michael <fedora.dm0 <AT> gmail.com> Signed-off-by: Mike Gilbert <floppym <AT> gentoo.org> .../{attr-9999.ebuild => attr-2.4.48-r4.ebuild} | 34 +++++++++------------- sys-apps/attr/attr-9999.ebuild | 4 +-- 2 files changed, 15 insertions(+), 23 deletions(-) diff --git a/sys-apps/attr/attr-9999.ebuild b/sys-apps/attr/attr-2.4.48-r4.ebuild similarity index 79% copy from sys-apps/attr/attr-9999.ebuild copy to sys-apps/attr/attr-2.4.48-r4.ebuild index 8d4a48d28f0..61b24dcb0c8 100644 --- a/sys-apps/attr/attr-9999.ebuild +++ b/sys-apps/attr/attr-2.4.48-r4.ebuild @@ -1,43 +1,35 @@ # Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 -EAPI="7" +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"; +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" -DEPEND="nls? ( sys-devel/gettext )" +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 - - if [[ ${PV} == 9999 ]] ; then - po/update-potfiles || die - eautopoint - eautoreconf - else - elibtoolize #580792 - fi + elibtoolize #580792 } multilib_src_configure() { @@ -65,7 +57,7 @@ multilib_src_install() { 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}") + local symbols=$($(tc-getREADELF) -sW "${lib}") if [[ "${versions}" != *"ATTR_1.0"* || \ "${versions}" != *"ATTR_1.1"* || \ "${versions}" != *"ATTR_1.2"* || \ diff --git a/sys-apps/attr/attr-9999.ebuild b/sys-apps/attr/attr-9999.ebuild index 8d4a48d28f0..7a00a2b560e 100644 --- a/sys-apps/attr/attr-9999.ebuild +++ b/sys-apps/attr/attr-9999.ebuild @@ -21,7 +21,7 @@ SLOT="0" IUSE="debug nls static-libs" -DEPEND="nls? ( sys-devel/gettext )" +BDEPEND="nls? ( sys-devel/gettext )" pkg_setup() { # Remove -flto* from flags as this breaks binaries (bug #644048) @@ -65,7 +65,7 @@ multilib_src_install() { 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}") + local symbols=$($(tc-getREADELF) -sW "${lib}") if [[ "${versions}" != *"ATTR_1.0"* || \ "${versions}" != *"ATTR_1.1"* || \ "${versions}" != *"ATTR_1.2"* || \
