app-shells/fzf: Bump to 0.21.1-r1

Upstream has fixed their Makefile in [1], so we can pull that patch in
temporarily and switch over to using make instead of a custom call to go
build.

This commit also cleans up the ebuild a bit.

[1] https://github.com/junegunn/fzf/commit/08c2bcb952a0abbead263dcb002

Package-Manager: Portage-2.3.89, Repoman-2.3.20

3 files changed, 60 insertions, 25 deletions

diff --git a/app-shells/fzf/Manifest b/app-shells/fzf/Manifest
index b4d55be..d432740 100644
--- a/app-shells/fzf/Manifest
+++ b/app-shells/fzf/Manifest
@@ -1,3 +1,4 @@
+AUX fzf-0.21.1-0001-Quote-LDFLAGS-1995.patch 989 BLAKE2B ce5b06e0609e9d70711558f64b610df108a527f10f4c20a4f88c10ab41c0d41b557f77d0206eb10e4d8d5284f1ef12f5850ac7bc8c99c4408061035be1fa6ded SHA512 b79ebec59ad42025087806f69652899818156b9b66156e429c64aa60c19e6f8318ea237db86dfe003dc0b6940bda6c42c36fe1144e4a7f2e903dffe1ae3192af
 DIST fzf-0.21.1.tar.gz 163978 BLAKE2B 2f05379049229ca01570b3a58bbcaeab48f85330a556efccca2a19b6fbc80da160dd6cada27d35c3fbac3983e71141f408069e70916663aa3b5f40ed5ad22165 SHA512 db816446a2d562148f7bfe4fc99696e0786d4acfe021ba9bf31344c81219b8a61cae03ec7d4b279ab3dba9ca93fc883e655fc71a750fb6f1905612db071ac831
 DIST github.com%2F!d!a!t!a-!d!o!g%2Fgo-sqlmock%2F@v%2Fv1.3.3.mod 38 BLAKE2B eb94b6f6f4bf332f916cb642fae50486c6ad9f6a7aa1bb57aade3ed640bc98236ae167d30c140c106cee0ada737eca6bdf54d36bcab0751a940f283f55f08c5c SHA512 43bc64732c4ca2ff23bb09cd67f002b05a1b68963116fb42cf9bd60ac8dade8b2efa1cab798217a73b221ea86fb4e219e36912ffe338c7bd505f2a877be05c09
 DIST github.com%2Fgdamore%2Fencoding%2F@v%2Fv1.0.0.mod 77 BLAKE2B 1b81c4c20a890027242b50f1566f4dfdaf120ee26d3dc56d0c2b6465df2ba79b208289eb40c3d7b666a4e7e874210f59aea545d5125c9a55c5597a3ca7f37feb SHA512 fb153c4e481c073133f0c933c67eba8a1f160ab146921f2c77125b6ff5c348cea57e3a5701a557c8db2212d32e3cba1c09b9509210660c17b66c2a45ba97cb75
@@ -43,5 +44,5 @@ DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180917221912-90fa682c2a6e.mod 26 BLA
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191011211836-4c025a95b26e.mod 212 BLAKE2B ab1d99a25eed3af5426d8a58d249b827e4d30a046302df72c7e0b59955e65b636f4645c5c436bb21ec54ec3745b9996bce92d29826ad93cbc9120a06dc19b49a SHA512 6a0316ac3b01aba3f186b5db540a368ab780a821252f7f0975f9e44afea9170c4b3e7027dc5f79a54ebc6af290cbb59b876d3b53bbf26fd05fc3a80a06fae109
 DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20191011211836-4c025a95b26e.zip 2877934 BLAKE2B 193ec7c3e8b82001b06f630dbda8afb9383ac66d7a23fdfe27414f91a2f2e17490b98605023a8a990f5f9fc5f10144fd01b1854fdb1a39d608cd305b0243dceb SHA512 553de87d4a0fdf45e1ce5128ee704ef92c23d0dce1182671c80e324c0f0ef680732bd82b02d8d202d2c1ae7d4d1bb61a944b60d92d0f99f716a5dcc09ea4701d
 DIST golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20190717185122-a985d3407aa7.mod 37 BLAKE2B 7449be81e1998a6439070de1a0ddf5bfd1e4971c90c2e358590a9c1c41128bfc1daa42a9bbc3709506df2442ec8420e6354343a095c837be46335c180083f28a SHA512 659d18a7a3a1be45ff6dc9e7475276b82ee7f11c47d39b0c237d7f872836a1dbdfff0902f21d6cd8093663997865da92e3e5a4acf1ad6129f972dc5e667b4f05
-EBUILD fzf-0.21.1.ebuild 3319 BLAKE2B 7e01b5f69060bb0f25cbf8ec8629d2293b0a62d8df74f2c884d0685f2e6d495a460f156bbc671940b555a02a14c3fef717ae2e4026eeb7565f625096383c8043 SHA512 993f43437f6c23de729ba5ffc8b1f5dbad713f6a0ec748db2f0444af3b7119cdf953299122cbfe39c260f1a87a51953fc4b7a1165403eabc0c55e0a1e65a3c8e
+EBUILD fzf-0.21.1-r1.ebuild 3453 BLAKE2B fa0404d5469723e0a49c980ddbbed4d99b7e9a095573a6996ec4d268ccb31ec516a3e7edacbe7e3ea6581d5af389132c819fcc7fa151815cd073d87df48d69a7 SHA512 742d62e2e91e9455220eb4bc58446e5886a49cc3923c792bc43c8401b8f0e69dfcd0273806b7a7a7b69a6935cbcc85c1cb9236f26089e67be15c36fbf84fe2d9
 MISC metadata.xml 479 BLAKE2B 35362b48670823e112d4f9995939f085f2e8e58ce7d5299f794d935fb91f345de50c5675c189b3448aa3ef8f7bdf58a5eb780b487a21acc35723f4d9922f0b8f SHA512 7d4db6eb0394aa226fc3d225cb4ddc7cab01660ff33dc0e4501f289818bc2fceaf53a63038e34e3320d5475e567dca4b86dba18779d0b45e6debbe716787f6b9
diff --git a/app-shells/fzf/files/fzf-0.21.1-0001-Quote-LDFLAGS-1995.patch b/app-shells/fzf/files/fzf-0.21.1-0001-Quote-LDFLAGS-1995.patch
new file mode 100644
index 0000000..290b856
--- /dev/null
+++ b/app-shells/fzf/files/fzf-0.21.1-0001-Quote-LDFLAGS-1995.patch
@@ -0,0 +1,28 @@
+From 08c2bcb952a0abbead263dcb0026eab58e736e1d Mon Sep 17 00:00:00 2001
+From: Raffaele <1770381+rafspiny@users.noreply.github.com>
+Date: Tue, 21 Apr 2020 03:07:39 +0200
+Subject: [PATCH] Quote LDFLAGS (#1995)
+
+Make sure that `extldflags` is quoted so that LDFLAGS containing spaces won't break the build command.
+
+Close #1994
+---
+ Makefile | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/Makefile b/Makefile
+index 037b19b..60283d0 100644
+--- a/Makefile
++++ b/Makefile
+@@ -6,7 +6,7 @@ ROOT_DIR       := $(shell dirname $(MAKEFILE))
+ SOURCES        := $(wildcard *.go src/*.go src/*/*.go) $(MAKEFILE)
+ 
+ REVISION       := $(shell git log -n 1 --pretty=format:%h -- $(SOURCES))
+-BUILD_FLAGS    := -a -ldflags "-X main.revision=$(REVISION) -w -extldflags=$(LDFLAGS)" -tags "$(TAGS)"
++BUILD_FLAGS    := -a -ldflags "-X main.revision=$(REVISION) -w '-extldflags=$(LDFLAGS)'" -tags "$(TAGS)"
+ 
+ BINARY32       := fzf-$(GOOS)_386
+ BINARY64       := fzf-$(GOOS)_amd64
+-- 
+2.26.2
+
diff --git a/app-shells/fzf/fzf-0.21.1.ebuild b/app-shells/fzf/fzf-0.21.1-r1.ebuild
index 3e7a58d..e618be8 100644
--- a/app-shells/fzf/fzf-0.21.1.ebuild
+++ b/app-shells/fzf/fzf-0.21.1-r1.ebuild
@@ -2,8 +2,12 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
+
 inherit bash-completion-r1 go-module
 
+DESCRIPTION="A general-purpose command-line fuzzy finder"
+HOMEPAGE="https://github.com/junegunn/fzf"
+
 EGO_SUM=(
 	"github.com/DATA-DOG/go-sqlmock v1.3.3/go.mod"
 	"github.com/gdamore/encoding v1.0.0"
@@ -53,47 +57,49 @@ EGO_SUM=(
 
 go-module_set_globals
 
-KEYWORDS="amd64"
-SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz ${EGO_SUM_SRC_URI}"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
+	${EGO_SUM_SRC_URI}"
 
-DESCRIPTION="A general-purpose command-line fuzzy finder"
-HOMEPAGE="https://github.com/junegunn/fzf"
-
-LICENSE="MIT"
+LICENSE="MIT BSD-with-disclosure"
 SLOT="0"
-IUSE="tmux"
-RESTRICT="mirror"
+KEYWORDS="amd64 x86"
 
 RDEPEND="tmux? ( app-misc/tmux )"
 
-DOCS=( CHANGELOG.md README.md )
+IUSE="tmux"
+RESTRICT="mirror"
 
-src_compile() {
-	go build || die
-}
+DOCS=( CHANGELOG.md README{,-VIM}.md )
+
+PATCHES=(
+	"${FILESDIR}/${P}-0001-Quote-LDFLAGS-1995.patch"
+)
 
 src_install() {
-	dobin fzf
-	einstalldocs
+	default
 
-	doman man/man1/fzf.1
+	dobin bin/${PN}
 
-	newbashcomp shell/completion.bash fzf
+	doman man/man1/${PN}.1
 
 	insinto /usr/share/nvim/runtime/plugin
-	doins plugin/fzf.vim
+	doins plugin/${PN}.vim
 
 	insinto /usr/share/vim/vimfiles/plugin
-	doins plugin/fzf.vim
-	dodoc README-VIM.md
+	doins plugin/${PN}.vim
 
 	insinto /usr/share/zsh/site-functions
-	newins shell/completion.zsh _fzf
-	insinto /usr/share/zsh/site-contrib/
-	newins shell/key-bindings.zsh fzf.zsh
+	newins shell/completion.zsh _${PN}
+
+	newbashcomp shell/completion.bash ${PN}
+
+	insinto /usr/share/${PN}/
+	newins shell/key-bindings.bash ${PN}.bash
+	newins shell/key-bindings.fish ${PN}.fish
+	newins shell/key-bindings.zsh ${PN}.zsh
 
 	if use tmux; then
-		dobin bin/fzf-tmux
-		doman man/man1/fzf-tmux.1
+		dobin bin/${PN}-tmux
+		doman man/man1/${PN}-tmux.1
 	fi
 }