app-shells/fzf: bump to 0.24.4; add self as maintainer

Closes: https://bugs.gentoo.org/758455
Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: Theo Anderson <telans@posteo.de>
Signed-off-by: Joonas Niilola <juippis@gentoo.org>

4 files changed, 154 insertions, 44 deletions

diff --git a/app-shells/fzf/Manifest b/app-shells/fzf/Manifest
index 88a2394e2d5a..665f86fd2022 100644
--- a/app-shells/fzf/Manifest
+++ b/app-shells/fzf/Manifest
@@ -2,6 +2,7 @@ DIST fzf-0.21.0.tar.gz 161819 BLAKE2B 2da6b62425e88c10fa8d3ce3b7d2d25c67a9bd99bf
 DIST fzf-0.21.1.tar.gz 163978 BLAKE2B 2f05379049229ca01570b3a58bbcaeab48f85330a556efccca2a19b6fbc80da160dd6cada27d35c3fbac3983e71141f408069e70916663aa3b5f40ed5ad22165 SHA512 db816446a2d562148f7bfe4fc99696e0786d4acfe021ba9bf31344c81219b8a61cae03ec7d4b279ab3dba9ca93fc883e655fc71a750fb6f1905612db071ac831
 DIST fzf-0.22.0.tar.gz 168483 BLAKE2B 0be859b9b5b0f4990273e1254b2530f0d651ea612af12a690c570b0fcfbdc23e3b1df8356aaa6bc3d9d042c3cf6c87fc35efe6becdc992bdbcb1b94695961b42 SHA512 003b187c93f0ab2e8a1adbd4eb9586e05e12fb9a86e445ac8ff48ba391ae16f104d60d18934bb46765537d5007035f549c15d6970c901f72813d55001d3bc6e5
 DIST fzf-0.24.0.tar.gz 173438 BLAKE2B bb990ea3f819ae83c13e71ff2b2e8f312b532f634375a137178afca943defe20177a3ec6751acd92debfa434fd02d1ebc24901cc40edf63f016f4cee97f2b856 SHA512 0746aee0542574488ee17dbc86618a74a01aa2d7e9042219db37112584f74be7e1686494bd7e3307f161b480053496a58cac18c67a6eec7e2a992f5dea2569a0
+DIST fzf-0.24.4.tar.gz 175421 BLAKE2B 8c06f6abb2e8a8a407f36e613efc084d63cc9797bb8c076c7d9a497b52b86865243b3cf3e80147cd2db0f6a98e850a28dc58dc949109a152ca6adf330dd41ff1 SHA512 348cc000b4e28054bff56a37171ef4dd7ac22c7c292c19c3c0b95f3d30856b443887447604e1e38cfd71b421a22c1135a13cb40c78e5b34d477acaa3dcadb821
 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
 DIST github.com%2Fgdamore%2Fencoding%2F@v%2Fv1.0.0.zip 19867 BLAKE2B a772206ce6dc48b32d7125a25b26694325d367ebcbad85466b2e6cfdb9fc9f0e08b98b7ecede5397344e5f7e623c4c76edcf69dcee99917adccf5b31aad80bf8 SHA512 127767c725e376b43fe4e2003ddc12fe89693d6d7e52b01e6d47d73fd04496decc0fd60b64c7a65303428e00a52ece1848610ea35231789a814187ef8503bee3
diff --git a/app-shells/fzf/fzf-0.24.0.ebuild b/app-shells/fzf/fzf-0.24.0.ebuild
index e0d2cf7f604b..b2573fddd82a 100644
--- a/app-shells/fzf/fzf-0.24.0.ebuild
+++ b/app-shells/fzf/fzf-0.24.0.ebuild
@@ -12,54 +12,56 @@ HOMEPAGE="https://github.com/junegunn/fzf"
 MY_GIT_REV=0d5f862
 
 EGO_SUM=(
-        "github.com/gdamore/encoding v1.0.0"
-        "github.com/gdamore/encoding v1.0.0/go.mod"
-        "github.com/gdamore/tcell v1.4.0"
-        "github.com/gdamore/tcell v1.4.0/go.mod"
-        "github.com/lucasb-eyer/go-colorful v1.0.3"
-        "github.com/lucasb-eyer/go-colorful v1.0.3/go.mod"
-        "github.com/mattn/go-isatty v0.0.12"
-        "github.com/mattn/go-isatty v0.0.12/go.mod"
-        "github.com/mattn/go-runewidth v0.0.7/go.mod"
-        "github.com/mattn/go-runewidth v0.0.9"
-        "github.com/mattn/go-runewidth v0.0.9/go.mod"
-        "github.com/mattn/go-shellwords v1.0.10"
-        "github.com/mattn/go-shellwords v1.0.10/go.mod"
-        "github.com/saracen/walker v0.1.1"
-        "github.com/saracen/walker v0.1.1/go.mod"
-        "golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2"
-        "golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod"
-        "golang.org/x/crypto v0.0.0-20201016220609-9e8e0b390897"
-        "golang.org/x/crypto v0.0.0-20201016220609-9e8e0b390897/go.mod"
-        "golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod"
-        "golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod"
-        "golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9"
-        "golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod"
-        "golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod"
-        "golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod"
-        "golang.org/x/sys v0.0.0-20190626150813-e07cf5db2756"
-        "golang.org/x/sys v0.0.0-20190626150813-e07cf5db2756/go.mod"
-        "golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod"
-        "golang.org/x/sys v0.0.0-20201026173827-119d4633e4d1"
-        "golang.org/x/sys v0.0.0-20201026173827-119d4633e4d1/go.mod"
-        "golang.org/x/text v0.3.0"
-        "golang.org/x/text v0.3.0/go.mod"
-        "golang.org/x/text v0.3.3"
-        "golang.org/x/text v0.3.3/go.mod"
-        "golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod"
+	"github.com/gdamore/encoding v1.0.0"
+	"github.com/gdamore/encoding v1.0.0/go.mod"
+	"github.com/gdamore/tcell v1.4.0"
+	"github.com/gdamore/tcell v1.4.0/go.mod"
+	"github.com/lucasb-eyer/go-colorful v1.0.3"
+	"github.com/lucasb-eyer/go-colorful v1.0.3/go.mod"
+	"github.com/mattn/go-isatty v0.0.12"
+	"github.com/mattn/go-isatty v0.0.12/go.mod"
+	"github.com/mattn/go-runewidth v0.0.7/go.mod"
+	"github.com/mattn/go-runewidth v0.0.9"
+	"github.com/mattn/go-runewidth v0.0.9/go.mod"
+	"github.com/mattn/go-shellwords v1.0.10"
+	"github.com/mattn/go-shellwords v1.0.10/go.mod"
+	"github.com/saracen/walker v0.1.1"
+	"github.com/saracen/walker v0.1.1/go.mod"
+	"golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2"
+	"golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod"
+	"golang.org/x/crypto v0.0.0-20201016220609-9e8e0b390897"
+	"golang.org/x/crypto v0.0.0-20201016220609-9e8e0b390897/go.mod"
+	"golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod"
+	"golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod"
+	"golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9"
+	"golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod"
+	"golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod"
+	"golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod"
+	"golang.org/x/sys v0.0.0-20190626150813-e07cf5db2756"
+	"golang.org/x/sys v0.0.0-20190626150813-e07cf5db2756/go.mod"
+	"golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod"
+	"golang.org/x/sys v0.0.0-20201026173827-119d4633e4d1"
+	"golang.org/x/sys v0.0.0-20201026173827-119d4633e4d1/go.mod"
+	"golang.org/x/text v0.3.0"
+	"golang.org/x/text v0.3.0/go.mod"
+	"golang.org/x/text v0.3.3"
+	"golang.org/x/text v0.3.3/go.mod"
+	"golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod"
 )
+
 go-module_set_globals
 
-EGO_PN="github.com/junegunn/${PN}"
-SRC_URI="https://${EGO_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
-	${EGO_SUM_SRC_URI}"
+SRC_URI="
+	https://github.com/junegunn/fzf/archive/${PV}.tar.gz -> ${P}.tar.gz
+	${EGO_SUM_SRC_URI}
+"
 
 LICENSE="MIT BSD-with-disclosure"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
 
 src_compile() {
-	emake PREFIX=${EPREFIX}/usr VERSION=${PV} REVISION=${MY_GIT_REV} bin/${PN}
+	emake PREFIX="${EPREFIX}"/usr VERSION=${PV} REVISION=${MY_GIT_REV} bin/${PN}
 }
 
 src_install() {
@@ -87,18 +89,15 @@ src_install() {
 }
 
 pkg_postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
 		elog "To add fzf support to your shell, make sure to use the right file"
 		elog "from /usr/share/fzf."
 		elog
 		elog "For bash, add the following line to ~/.bashrc:"
 		elog
+		elog "	# source /usr/share/bash-completion/completions/fzf"
 		elog "	# source /usr/share/fzf/key-bindings.bash"
 		elog
-		elog "Or create a symlink:"
-		elog
-		elog "	# ln -s /usr/share/fzf/key-bindings.bash /etc/bash/bashrc.d/fzf.bash"
-		elog
 		elog "Plugins for Vim and Neovim are installed to respective directories"
 		elog "and will work out of the box."
 		elog
diff --git a/app-shells/fzf/fzf-0.24.4.ebuild b/app-shells/fzf/fzf-0.24.4.ebuild
new file mode 100644
index 000000000000..9ed9b93f02fb
--- /dev/null
+++ b/app-shells/fzf/fzf-0.24.4.ebuild
@@ -0,0 +1,106 @@
+# Copyright 2019-2020 Gentoo Authors
+# 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, written in GoLang"
+HOMEPAGE="https://github.com/junegunn/fzf"
+
+# For fancy versioning only. Bump on the next release!
+MY_GIT_REV=00a3610
+
+EGO_SUM=(
+	"github.com/gdamore/encoding v1.0.0"
+	"github.com/gdamore/encoding v1.0.0/go.mod"
+	"github.com/gdamore/tcell v1.4.0"
+	"github.com/gdamore/tcell v1.4.0/go.mod"
+	"github.com/lucasb-eyer/go-colorful v1.0.3"
+	"github.com/lucasb-eyer/go-colorful v1.0.3/go.mod"
+	"github.com/mattn/go-isatty v0.0.12"
+	"github.com/mattn/go-isatty v0.0.12/go.mod"
+	"github.com/mattn/go-runewidth v0.0.7/go.mod"
+	"github.com/mattn/go-runewidth v0.0.9"
+	"github.com/mattn/go-runewidth v0.0.9/go.mod"
+	"github.com/mattn/go-shellwords v1.0.10"
+	"github.com/mattn/go-shellwords v1.0.10/go.mod"
+	"github.com/saracen/walker v0.1.1"
+	"github.com/saracen/walker v0.1.1/go.mod"
+	"golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2"
+	"golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod"
+	"golang.org/x/crypto v0.0.0-20201016220609-9e8e0b390897"
+	"golang.org/x/crypto v0.0.0-20201016220609-9e8e0b390897/go.mod"
+	"golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod"
+	"golang.org/x/sync v0.0.0-20200317015054-43a5402ce75a/go.mod"
+	"golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9"
+	"golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9/go.mod"
+	"golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod"
+	"golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod"
+	"golang.org/x/sys v0.0.0-20190626150813-e07cf5db2756"
+	"golang.org/x/sys v0.0.0-20190626150813-e07cf5db2756/go.mod"
+	"golang.org/x/sys v0.0.0-20200116001909-b77594299b42/go.mod"
+	"golang.org/x/sys v0.0.0-20201026173827-119d4633e4d1"
+	"golang.org/x/sys v0.0.0-20201026173827-119d4633e4d1/go.mod"
+	"golang.org/x/text v0.3.0"
+	"golang.org/x/text v0.3.0/go.mod"
+	"golang.org/x/text v0.3.3"
+	"golang.org/x/text v0.3.3/go.mod"
+	"golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod"
+)
+
+go-module_set_globals
+
+SRC_URI="
+	https://github.com/junegunn/fzf/archive/${PV}.tar.gz -> ${P}.tar.gz
+	${EGO_SUM_SRC_URI}
+"
+
+LICENSE="MIT BSD-with-disclosure"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+src_compile() {
+	emake PREFIX="${EPREFIX}"/usr VERSION=${PV} REVISION=${MY_GIT_REV} bin/${PN}
+}
+
+src_install() {
+	dobin bin/${PN}
+	doman man/man1/${PN}.1
+
+	dobin bin/${PN}-tmux
+	doman man/man1/${PN}-tmux.1
+
+	insinto /usr/share/vim/vimfiles/plugin
+	doins plugin/${PN}.vim
+
+	insinto /usr/share/nvim/runtime/plugin
+	doins plugin/${PN}.vim
+
+	newbashcomp shell/completion.bash ${PN}
+
+	insinto /usr/share/zsh/site-functions
+	newins shell/completion.zsh _${PN}
+
+	insinto /usr/share/fzf
+	doins shell/key-bindings.bash
+	doins shell/key-bindings.fish
+	doins shell/key-bindings.zsh
+}
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+		elog "To add fzf support to your shell, make sure to use the right file"
+		elog "from /usr/share/fzf."
+		elog
+		elog "For bash, add the following line to ~/.bashrc:"
+		elog
+		elog "	# source /usr/share/bash-completion/completions/fzf"
+		elog "	# source /usr/share/fzf/key-bindings.bash"
+		elog
+		elog "Plugins for Vim and Neovim are installed to respective directories"
+		elog "and will work out of the box."
+		elog
+		elog "For fzf support in tmux see fzf-tmux(1)."
+	fi
+}
diff --git a/app-shells/fzf/metadata.xml b/app-shells/fzf/metadata.xml
index 901adef50a78..1ca0de6d4247 100644
--- a/app-shells/fzf/metadata.xml
+++ b/app-shells/fzf/metadata.xml
@@ -5,6 +5,10 @@
 		<email>rafspiny@gmail.com</email>
 		<name>Raffaele Spinelli</name>
 	</maintainer>
+	<maintainer type="person">
+		<email>telans@posteo.de</email>
+		<name>Theo Anderson</name>
+	</maintainer>
 	<maintainer type="project">
 		<email>proxy-maint@gentoo.org</email>
 		<name>Proxy Maintainers</name>