commit:     95fbfebf9a0e5061413382e9701f9d21b1da88e0
Author:     Jakov Smolic <jakov.smolic <AT> sartura <DOT> hr>
AuthorDate: Sun May 23 13:43:10 2021 +0000
Commit:     Jory Pratt <anarchy <AT> gentoo <DOT> org>
CommitDate: Mon May 24 14:41:22 2021 +0000
URL:        https://gitweb.gentoo.org/proj/musl.git/commit/?id=95fbfebf

sys-apps/tcp-wrappers: Sync with ::gentoo

Closes: https://github.com/gentoo/musl/pull/434
Signed-off-by: Jakov Smolic <jakov.smolic <AT> sartura.hr>
Signed-off-by: Jory Pratt <anarchy <AT> gentoo.org>

 ...p-wrappers-7.6.28.ebuild => tcp-wrappers-7.6.28-r1.ebuild} | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

diff --git a/sys-apps/tcp-wrappers/tcp-wrappers-7.6.28.ebuild 
b/sys-apps/tcp-wrappers/tcp-wrappers-7.6.28-r1.ebuild
similarity index 91%
rename from sys-apps/tcp-wrappers/tcp-wrappers-7.6.28.ebuild
rename to sys-apps/tcp-wrappers/tcp-wrappers-7.6.28-r1.ebuild
index c756489..901bca6 100644
--- a/sys-apps/tcp-wrappers/tcp-wrappers-7.6.28.ebuild
+++ b/sys-apps/tcp-wrappers/tcp-wrappers-7.6.28-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
-inherit toolchain-funcs flag-o-matic multilib-minimal usr-ldscript
+inherit toolchain-funcs multilib-minimal usr-ldscript
 
 MY_PV=$(ver_cut 1-2)
 DEB_PV=$(ver_cut 3)
@@ -18,7 +18,8 @@ SLOT="0"
 KEYWORDS="amd64 arm arm64 ~mips ppc ppc64 x86"
 IUSE="ipv6 netgroups static-libs"
 
-RDEPEND=""
+RDEPEND="netgroups? ( net-libs/libnsl:= )"
+DEPEND="${RDEPEND}"
 
 S=${WORKDIR}/${MY_P}
 
@@ -52,7 +53,7 @@ temake() {
                RANLIB="$(tc-getRANLIB)" \
                COPTS="${CFLAGS} ${CPPFLAGS} ${mycppflags}" \
                LDFLAGS="${LDFLAGS}" \
-               "$@" || die
+               "$@"
 }
 
 multilib_src_configure() {
@@ -61,6 +62,8 @@ multilib_src_configure() {
 }
 
 multilib_src_compile() {
+       # https://bugs.gentoo.org/728348
+       unset STRINGS
        temake all
 }
 

Reply via email to