From b8ba085fab5473f384c355d76399c6d6a8bafdc1 Mon Sep 17 00:00:00 2001 From: Fabian Groffen Date: Wed, 22 May 2019 10:49:05 +0200 Subject: [PATCH] dev-lang/perl: fix patch disabling for Solaris, bug #684024 Closes: https://bugs.gentoo.org/684024 Signed-off-by: Fabian Groffen Package-Manager: Portage-2.3.62, Repoman-2.3.11 --- dev-lang/perl/perl-5.28.2-r1.ebuild | 2 +- dev-lang/perl/perl-5.28.9999.ebuild | 2 +- dev-lang/perl/perl-5.30.0_rc2.ebuild | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/dev-lang/perl/perl-5.28.2-r1.ebuild b/dev-lang/perl/perl-5.28.2-r1.ebuild index 981dadb521bb..0aa8109f0d68 100644 --- a/dev-lang/perl/perl-5.28.2-r1.ebuild +++ b/dev-lang/perl/perl-5.28.2-r1.ebuild @@ -308,7 +308,7 @@ src_prepare() { if [[ ${CHOST} == *-solaris* ]] ; then # do NOT mess with nsl, on Solaris this is always necessary, # when -lsocket is used e.g. to get h_errno - sed -i '/gentoo\/no-nsl\.patch/d' "${WORKDIR}/patches/series" || die + sed -i '/gentoo\/no-nsl-cl\.patch/d' "${WORKDIR}/patches/series" || die fi einfo "Applying patches from ${PATCH_BASE} ..." diff --git a/dev-lang/perl/perl-5.28.9999.ebuild b/dev-lang/perl/perl-5.28.9999.ebuild index 7617ca59c9c2..88f49401029e 100644 --- a/dev-lang/perl/perl-5.28.9999.ebuild +++ b/dev-lang/perl/perl-5.28.9999.ebuild @@ -306,7 +306,7 @@ src_prepare() { if [[ ${CHOST} == *-solaris* ]] ; then # do NOT mess with nsl, on Solaris this is always necessary, # when -lsocket is used e.g. to get h_errno - sed -i '/gentoo\/no-nsl\.patch/d' "${WORKDIR}/patches/series" || die + sed -i '/gentoo\/no-nsl-cl\.patch/d' "${WORKDIR}/patches/series" || die fi einfo "Applying patches from ${PATCH_BASE} ..." diff --git a/dev-lang/perl/perl-5.30.0_rc2.ebuild b/dev-lang/perl/perl-5.30.0_rc2.ebuild index e2165b86d03b..2b23e2fb01b7 100644 --- a/dev-lang/perl/perl-5.30.0_rc2.ebuild +++ b/dev-lang/perl/perl-5.30.0_rc2.ebuild @@ -308,7 +308,7 @@ src_prepare() { if [[ ${CHOST} == *-solaris* ]] ; then # do NOT mess with nsl, on Solaris this is always necessary, # when -lsocket is used e.g. to get h_errno - sed -i '/gentoo\/no-nsl\.patch/d' "${WORKDIR}/patches/series" || die + sed -i '/gentoo\/no-nsl-cl\.patch/d' "${WORKDIR}/patches/series" || die fi einfo "Applying patches from ${PATCH_BASE} ..." -- 2.26.2