From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id C11DC1382C5 for ; Thu, 13 May 2021 13:55:46 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A355BE08F0; Thu, 13 May 2021 13:55:43 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 700B3E08D3 for ; Thu, 13 May 2021 13:55:43 +0000 (UTC) Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 3889B340DE6 for ; Thu, 13 May 2021 13:55:42 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id CDEEA796 for ; Thu, 13 May 2021 13:55:37 +0000 (UTC) From: "David Seifert" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "David Seifert" Message-ID: <1620914092.ed777fea32b3a9b73daa34055ea86a4a4b3ad72b.soap@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: sys-apps/acl/ X-VCS-Repository: repo/gentoo X-VCS-Files: sys-apps/acl/acl-2.2.53-r1.ebuild sys-apps/acl/acl-2.3.0.ebuild sys-apps/acl/acl-2.3.1.ebuild X-VCS-Directories: sys-apps/acl/ X-VCS-Committer: soap X-VCS-Committer-Name: David Seifert X-VCS-Revision: ed777fea32b3a9b73daa34055ea86a4a4b3ad72b X-VCS-Branch: master Date: Thu, 13 May 2021 13:55:37 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 64dcae80-2be0-4e01-8e53-c3860eddd8f2 X-Archives-Hash: ac88d0dfe0d90d71f4736c2ce0dbe964 commit: ed777fea32b3a9b73daa34055ea86a4a4b3ad72b Author: Sam James gentoo org> AuthorDate: Thu May 13 13:54:52 2021 +0000 Commit: David Seifert gentoo org> CommitDate: Thu May 13 13:54:52 2021 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ed777fea sys-apps/acl: drop unused toolchain-funcs, move filter-flags * Drop unused toolchain-funcs inherit * Move filter-flags call from pkg_setup to src_configure (multilib) which is more conventional given it only takes effect during source builds (not binpkgs). * Minor style changes to aid readability. Signed-off-by: Sam James gentoo.org> Signed-off-by: David Seifert gentoo.org> sys-apps/acl/acl-2.2.53-r1.ebuild | 23 ++++++++++++----------- sys-apps/acl/acl-2.3.0.ebuild | 23 ++++++++++++----------- sys-apps/acl/acl-2.3.1.ebuild | 23 ++++++++++++----------- 3 files changed, 36 insertions(+), 33 deletions(-) diff --git a/sys-apps/acl/acl-2.2.53-r1.ebuild b/sys-apps/acl/acl-2.2.53-r1.ebuild index 1c5fd400559..5ab955ac836 100644 --- a/sys-apps/acl/acl-2.2.53-r1.ebuild +++ b/sys-apps/acl/acl-2.2.53-r1.ebuild @@ -3,9 +3,9 @@ EAPI=7 -inherit flag-o-matic libtool toolchain-funcs multilib-minimal usr-ldscript +inherit flag-o-matic libtool multilib-minimal usr-ldscript -DESCRIPTION="access control list utilities, libraries and headers" +DESCRIPTION="Access control list utilities, libraries, and headers" HOMEPAGE="https://savannah.nongnu.org/projects/acl" SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz" @@ -20,37 +20,38 @@ RDEPEND=" DEPEND="${RDEPEND}" BDEPEND="nls? ( sys-devel/gettext )" -pkg_setup() { - # filter out -flto flags as they break getfacl/setfacl binaries - # (bug #667372) - filter-flags -flto* -} - src_prepare() { default - elibtoolize #580792 + + # bug #580792 + elibtoolize } multilib_src_configure() { + # Filter out -flto flags as they break getfacl/setfacl binaries + # bug #667372 + filter-flags -flto* + local myeconfargs=( --bindir="${EPREFIX}"/bin $(use_enable static-libs static) --libexecdir="${EPREFIX}"/usr/$(get_libdir) $(use_enable nls) ) + ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" } multilib_src_test() { # Tests call native binaries with an LD_PRELOAD wrapper - # https://bugs.gentoo.org/772356 + # bug #772356 multilib_is_native_abi && default } multilib_src_install() { default - # move shared libs to / + # Move shared libs to / gen_usr_ldscript -a acl } diff --git a/sys-apps/acl/acl-2.3.0.ebuild b/sys-apps/acl/acl-2.3.0.ebuild index b802802db8a..7ffef6cfc23 100644 --- a/sys-apps/acl/acl-2.3.0.ebuild +++ b/sys-apps/acl/acl-2.3.0.ebuild @@ -3,9 +3,9 @@ EAPI=7 -inherit flag-o-matic libtool toolchain-funcs multilib-minimal usr-ldscript +inherit flag-o-matic libtool multilib-minimal usr-ldscript -DESCRIPTION="access control list utilities, libraries and headers" +DESCRIPTION="Access control list utilities, libraries, and headers" HOMEPAGE="https://savannah.nongnu.org/projects/acl" SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz" @@ -20,37 +20,38 @@ RDEPEND=" DEPEND="${RDEPEND}" BDEPEND="nls? ( sys-devel/gettext )" -pkg_setup() { - # filter out -flto flags as they break getfacl/setfacl binaries - # (bug #667372) - filter-flags -flto* -} - src_prepare() { default - elibtoolize #580792 + + # bug #580792 + elibtoolize } multilib_src_configure() { + # Filter out -flto flags as they break getfacl/setfacl binaries + # bug #667372 + filter-flags -flto* + local myeconfargs=( --bindir="${EPREFIX}"/bin $(use_enable static-libs static) --libexecdir="${EPREFIX}"/usr/$(get_libdir) $(use_enable nls) ) + ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" } multilib_src_test() { # Tests call native binaries with an LD_PRELOAD wrapper - # https://bugs.gentoo.org/772356 + # bug #772356 multilib_is_native_abi && default } multilib_src_install() { default - # move shared libs to / + # Move shared libs to / gen_usr_ldscript -a acl } diff --git a/sys-apps/acl/acl-2.3.1.ebuild b/sys-apps/acl/acl-2.3.1.ebuild index b802802db8a..7ffef6cfc23 100644 --- a/sys-apps/acl/acl-2.3.1.ebuild +++ b/sys-apps/acl/acl-2.3.1.ebuild @@ -3,9 +3,9 @@ EAPI=7 -inherit flag-o-matic libtool toolchain-funcs multilib-minimal usr-ldscript +inherit flag-o-matic libtool multilib-minimal usr-ldscript -DESCRIPTION="access control list utilities, libraries and headers" +DESCRIPTION="Access control list utilities, libraries, and headers" HOMEPAGE="https://savannah.nongnu.org/projects/acl" SRC_URI="mirror://nongnu/${PN}/${P}.tar.gz" @@ -20,37 +20,38 @@ RDEPEND=" DEPEND="${RDEPEND}" BDEPEND="nls? ( sys-devel/gettext )" -pkg_setup() { - # filter out -flto flags as they break getfacl/setfacl binaries - # (bug #667372) - filter-flags -flto* -} - src_prepare() { default - elibtoolize #580792 + + # bug #580792 + elibtoolize } multilib_src_configure() { + # Filter out -flto flags as they break getfacl/setfacl binaries + # bug #667372 + filter-flags -flto* + local myeconfargs=( --bindir="${EPREFIX}"/bin $(use_enable static-libs static) --libexecdir="${EPREFIX}"/usr/$(get_libdir) $(use_enable nls) ) + ECONF_SOURCE="${S}" econf "${myeconfargs[@]}" } multilib_src_test() { # Tests call native binaries with an LD_PRELOAD wrapper - # https://bugs.gentoo.org/772356 + # bug #772356 multilib_is_native_abi && default } multilib_src_install() { default - # move shared libs to / + # Move shared libs to / gen_usr_ldscript -a acl }