net-misc/curl: Fix a bug when uprev to 7.64.1
In https://chromium-review.googlesource.com/1583924, the uprev to 7.64.1
causes chromium SDK builder to fail. This CL makes changes on original CL
to not use EAPI 6 (and replace "eapply" with "epatch" everywhere).
BUG=chromium:956389,b:131265443,chromium:958022
TEST=chromium-sdk builder tryjob
Change-Id: I0b18a93b0a21969533a54ddf3e9a8efae4dcbd3a
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/overlays/portage-stable/+/1590180
Reviewed-by: Manoj Gupta <manojgupta@chromium.org>
Commit-Queue: Tiancong Wang <tcwang@google.com>
Tested-by: Tiancong Wang <tcwang@google.com>
(cherry picked from commit 1be7ff5c017f7e8a5880c8a213433b0db3c79838)
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/overlays/portage-stable/+/1618425
Commit-Queue: Xuewei Zhang <xueweiz@google.com>
Tested-by: Xuewei Zhang <xueweiz@google.com>
diff --git a/net-misc/curl/curl-7.64.1-r1.ebuild b/net-misc/curl/curl-7.64.1-r1.ebuild
new file mode 120000
index 0000000..856c3b3
--- /dev/null
+++ b/net-misc/curl/curl-7.64.1-r1.ebuild
@@ -0,0 +1 @@
+curl-7.64.1.ebuild
\ No newline at end of file
diff --git a/net-misc/curl/curl-7.64.1.ebuild b/net-misc/curl/curl-7.64.1.ebuild
index ea1ccbe..e9813b4 100644
--- a/net-misc/curl/curl-7.64.1.ebuild
+++ b/net-misc/curl/curl-7.64.1.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
-EAPI="6"
+EAPI="5"
inherit autotools eutils prefix multilib-minimal
@@ -96,14 +96,14 @@
)
src_prepare() {
- eapply "${FILESDIR}"/${PN}-7.30.0-prefix.patch
- eapply "${FILESDIR}"/${PN}-respect-cflags-3.patch
- eapply "${FILESDIR}"/${PN}-fix-gnutls-nettle.patch
+ epatch "${FILESDIR}"/${PN}-7.30.0-prefix.patch
+ epatch "${FILESDIR}"/${PN}-respect-cflags-3.patch
+ epatch "${FILESDIR}"/${PN}-fix-gnutls-nettle.patch
sed -i '/LD_LIBRARY_PATH=/d' configure.ac || die #382241
sed -i '/CURL_MAC_CFLAGS/d' configure.ac || die #637252
- eapply_user
+ epatch_user
eprefixify curl-config.in
eautoreconf
}
