Gentoo Archives: gentoo-commits

From: Fabian Groffen <grobian@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: dev-lang/perl/
Date: Wed, 22 May 2019 08:49:54
Message-Id: 1558514966.b8ba085fab5473f384c355d76399c6d6a8bafdc1.grobian@gentoo
1 commit: b8ba085fab5473f384c355d76399c6d6a8bafdc1
2 Author: Fabian Groffen <grobian <AT> gentoo <DOT> org>
3 AuthorDate: Wed May 22 08:49:05 2019 +0000
4 Commit: Fabian Groffen <grobian <AT> gentoo <DOT> org>
5 CommitDate: Wed May 22 08:49:26 2019 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b8ba085f
7
8 dev-lang/perl: fix patch disabling for Solaris, bug #684024
9
10 Closes: https://bugs.gentoo.org/684024
11 Signed-off-by: Fabian Groffen <grobian <AT> gentoo.org>
12 Package-Manager: Portage-2.3.62, Repoman-2.3.11
13
14 dev-lang/perl/perl-5.28.2-r1.ebuild | 2 +-
15 dev-lang/perl/perl-5.28.9999.ebuild | 2 +-
16 dev-lang/perl/perl-5.30.0_rc2.ebuild | 2 +-
17 3 files changed, 3 insertions(+), 3 deletions(-)
18
19 diff --git a/dev-lang/perl/perl-5.28.2-r1.ebuild b/dev-lang/perl/perl-5.28.2-r1.ebuild
20 index 981dadb521b..0aa8109f0d6 100644
21 --- a/dev-lang/perl/perl-5.28.2-r1.ebuild
22 +++ b/dev-lang/perl/perl-5.28.2-r1.ebuild
23 @@ -308,7 +308,7 @@ src_prepare() {
24 if [[ ${CHOST} == *-solaris* ]] ; then
25 # do NOT mess with nsl, on Solaris this is always necessary,
26 # when -lsocket is used e.g. to get h_errno
27 - sed -i '/gentoo\/no-nsl\.patch/d' "${WORKDIR}/patches/series" || die
28 + sed -i '/gentoo\/no-nsl-cl\.patch/d' "${WORKDIR}/patches/series" || die
29 fi
30
31 einfo "Applying patches from ${PATCH_BASE} ..."
32
33 diff --git a/dev-lang/perl/perl-5.28.9999.ebuild b/dev-lang/perl/perl-5.28.9999.ebuild
34 index 7617ca59c9c..88f49401029 100644
35 --- a/dev-lang/perl/perl-5.28.9999.ebuild
36 +++ b/dev-lang/perl/perl-5.28.9999.ebuild
37 @@ -306,7 +306,7 @@ src_prepare() {
38 if [[ ${CHOST} == *-solaris* ]] ; then
39 # do NOT mess with nsl, on Solaris this is always necessary,
40 # when -lsocket is used e.g. to get h_errno
41 - sed -i '/gentoo\/no-nsl\.patch/d' "${WORKDIR}/patches/series" || die
42 + sed -i '/gentoo\/no-nsl-cl\.patch/d' "${WORKDIR}/patches/series" || die
43 fi
44
45 einfo "Applying patches from ${PATCH_BASE} ..."
46
47 diff --git a/dev-lang/perl/perl-5.30.0_rc2.ebuild b/dev-lang/perl/perl-5.30.0_rc2.ebuild
48 index e2165b86d03..2b23e2fb01b 100644
49 --- a/dev-lang/perl/perl-5.30.0_rc2.ebuild
50 +++ b/dev-lang/perl/perl-5.30.0_rc2.ebuild
51 @@ -308,7 +308,7 @@ src_prepare() {
52 if [[ ${CHOST} == *-solaris* ]] ; then
53 # do NOT mess with nsl, on Solaris this is always necessary,
54 # when -lsocket is used e.g. to get h_errno
55 - sed -i '/gentoo\/no-nsl\.patch/d' "${WORKDIR}/patches/series" || die
56 + sed -i '/gentoo\/no-nsl-cl\.patch/d' "${WORKDIR}/patches/series" || die
57 fi
58
59 einfo "Applying patches from ${PATCH_BASE} ..."