[gentoo-commits] repo/gentoo:master commit in: app-emulation/docker/, app-emulation/docker/files/

[Georgy Yakovlev]

commit:     c6ec5086fd71473ce5f71a0aac0d2761811a499a
Author:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
AuthorDate: Thu Apr 22 16:39:52 2021 +0000
Commit:     Georgy Yakovlev <gyakovlev <AT> gentoo <DOT> org>
CommitDate: Thu Apr 22 16:41:13 2021 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c6ec5086

app-emulation/docker: rebase patch, get rid of custom src_prepare

Package-Manager: Portage-3.0.18, Repoman-3.0.3
Signed-off-by: Georgy Yakovlev <gyakovlev <AT> gentoo.org>

 app-emulation/docker/docker-20.10.6-r1.ebuild         | 11 +++--------
 app-emulation/docker/files/etcd-F_OFD_GETLK-fix.patch |  4 ++--
 2 files changed, 5 insertions(+), 10 deletions(-)

diff --git a/app-emulation/docker/docker-20.10.6-r1.ebuild b/app-emulation/docker/docker-20.10.6-r1.ebuild
index 798980694c7..2b99383d6b7 100644
--- a/app-emulation/docker/docker-20.10.6-r1.ebuild
+++ b/app-emulation/docker/docker-20.10.6-r1.ebuild
@@ -54,6 +54,9 @@ RESTRICT="installsources strip"
 
 S="${WORKDIR}/${P}/src/${EGO_PN}"
 
+# https://bugs.gentoo.org/748984 https://github.com/etcd-io/etcd/pull/12552
+PATCHES=( "${FILESDIR}/etcd-F_OFD_GETLK-fix.patch" )
+
 # see "contrib/check-config.sh" from upstream's sources
 CONFIG_CHECK="
 	~NAMESPACES ~NET_NS ~PID_NS ~IPC_NS ~UTS_NS
@@ -158,14 +161,6 @@ pkg_setup() {
 	linux-info_pkg_setup
 }
 
-src_prepare() {
-	default
-	# https://bugs.gentoo.org/748984 https://github.com/etcd-io/etcd/pull/12552
-	pushd "${S}/vendor/github.com/coreos/etcd" >/dev/null || die
-	eapply "${FILESDIR}/etcd-F_OFD_GETLK-fix.patch"
-	popd >/dev/null || die
-}
-
 src_compile() {
 	export DOCKER_GITCOMMIT="${GIT_COMMIT}"
 	export GOPATH="${WORKDIR}/${P}"

diff --git a/app-emulation/docker/files/etcd-F_OFD_GETLK-fix.patch b/app-emulation/docker/files/etcd-F_OFD_GETLK-fix.patch
index d912e59e985..bd574e26f04 100644
--- a/app-emulation/docker/files/etcd-F_OFD_GETLK-fix.patch
+++ b/app-emulation/docker/files/etcd-F_OFD_GETLK-fix.patch
@@ -15,8 +15,8 @@ Fixes #31182
 
 diff --git a/pkg/fileutil/lock_linux.go b/pkg/fileutil/lock_linux.go
 index 939fea62381..004d35fa23b 100644
---- a/pkg/fileutil/lock_linux.go
-+++ b/pkg/fileutil/lock_linux.go
+--- a/vendor/github.com/coreos/etcd/pkg/fileutil/lock_linux.go
++++ b/vendor/github.com/coreos/etcd/pkg/fileutil/lock_linux.go
 @@ -29,7 +29,7 @@ import (
  //
  // constants from /usr/include/bits/fcntl-linux.h