commit: 122554606fbd45982deea10318d6dae677ec572f
Author: William Hubbs <williamh <AT> gentoo <DOT> org>
AuthorDate: Mon Jul 18 21:16:21 2022 +0000
Commit: William Hubbs <williamh <AT> gentoo <DOT> org>
CommitDate: Mon Jul 18 21:17:25 2022 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=12255460
app-containers/cosign-1.8.0: drop unneeded patch
Signed-off-by: William Hubbs <williamh <AT> gentoo.org>
app-containers/cosign/cosign-1.8.0.ebuild | 6 +-----
app-containers/cosign/files/cosign-1.5.0-fix-makefile.patch | 13 -------------
2 files changed, 1 insertion(+), 18 deletions(-)
diff --git a/app-containers/cosign/cosign-1.8.0.ebuild
b/app-containers/cosign/cosign-1.8.0.ebuild
index 3728305931f0..d70505278ce2 100644
--- a/app-containers/cosign/cosign-1.8.0.ebuild
+++ b/app-containers/cosign/cosign-1.8.0.ebuild
@@ -14,15 +14,11 @@ LICENSE="Apache-2.0"
SLOT="0"
KEYWORDS="~amd64"
-PATCHES=(
- "${FILESDIR}"/${PN}-1.5.0-fix-makefile.patch
-)
-
RESTRICT="test"
src_compile() {
emake \
- GIT_HASH=${GIT_HASH}
+ GIT_HASH=${GIT_HASH} \
GIT_VERSION=v${PV} \
GIT_TREESTATE=clean
}
diff --git a/app-containers/cosign/files/cosign-1.5.0-fix-makefile.patch
b/app-containers/cosign/files/cosign-1.5.0-fix-makefile.patch
deleted file mode 100644
index 15cdc7511136..000000000000
--- a/app-containers/cosign/files/cosign-1.5.0-fix-makefile.patch
+++ /dev/null
@@ -1,13 +0,0 @@
---- a/Makefile 2022-01-22 16:06:02.000000000 -0500
-+++ b/Makefile 2022-01-27 15:06:43.986094208 -0500
-@@ -71,8 +71,8 @@
- checkfmt: SHELL := /usr/bin/env bash
- checkfmt: ## Check formatting of all go files
- @ $(MAKE) --no-print-directory log-$@
-- $(shell test -z "$(shell gofmt -l $(GOFILES) | tee /dev/stderr)")
-- $(shell test -z "$(shell goimports -l $(GOFILES) | tee /dev/stderr)")
-+ $(shell test -z "$(shell gofmt -l $(GOFILES) | tee /dev/stderr)")
-+ $(shell test -z "$(shell goimports -l $(GOFILES) | tee /dev/stderr)")
-
- .PHONY: fmt
- fmt: ## Format all go files
