dev-lang/perl: fix patch disabling for Solaris, bug #684024
authorFabian Groffen <grobian@gentoo.org>
Wed, 22 May 2019 08:49:05 +0000 (10:49 +0200)
committerFabian Groffen <grobian@gentoo.org>
Wed, 22 May 2019 08:49:26 +0000 (10:49 +0200)
Closes: https://bugs.gentoo.org/684024
Signed-off-by: Fabian Groffen <grobian@gentoo.org>
Package-Manager: Portage-2.3.62, Repoman-2.3.11

dev-lang/perl/perl-5.28.2-r1.ebuild
dev-lang/perl/perl-5.28.9999.ebuild
dev-lang/perl/perl-5.30.0_rc2.ebuild

index 981dadb521bbbf948996b5ee7f1ce818239406ff..0aa8109f0d68de1bfee5e1def77d9178300b292f 100644 (file)
@@ -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} ..."
index 7617ca59c9c2dc4a45d9453bd542757bd38dea90..88f49401029e4d3d9bdafa1b7c67433c63d0217a 100644 (file)
@@ -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} ..."
index e2165b86d03bb31cdb99305ec09ca50d544d3ff5..2b23e2fb01b7f736a89f19e91c0b541b296fc8eb 100644 (file)
@@ -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} ..."