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@gmail.com>
Signed-off-by: Mike Gilbert <floppym@gentoo.org>

2 files changed, 94 insertions, 2 deletions

diff --git a/sys-apps/attr/attr-2.4.48-r4.ebuild b/sys-apps/attr/attr-2.4.48-r4.ebuild
new file mode 100644
index 000000000000..61b24dcb0c84
--- /dev/null
+++ b/sys-apps/attr/attr-2.4.48-r4.ebuild
@@ -0,0 +1,92 @@
+# 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
+
+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-9999.ebuild b/sys-apps/attr/attr-9999.ebuild
index 8d4a48d28f08..7a00a2b560ee 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"* || \