From 748e77fd14dc52ba46c6f4970f84652ab5eb576f Mon Sep 17 00:00:00 2001
From: Michał Polański <michal@polanski.me>
Date: Sun, 9 Aug 2020 02:19:38 +0200
Subject: community/fzf: use Go modules for dependency management

---
 community/fzf/APKBUILD   | 32 +++-----------------------------
 community/fzf/glide.lock | 46 ----------------------------------------------
 community/fzf/glide.yaml | 17 -----------------
 3 files changed, 3 insertions(+), 92 deletions(-)
 delete mode 100644 community/fzf/glide.lock
 delete mode 100644 community/fzf/glide.yaml

diff --git a/community/fzf/APKBUILD b/community/fzf/APKBUILD
index 7599c3f2274..17279c4c07d 100644
--- a/community/fzf/APKBUILD
+++ b/community/fzf/APKBUILD
@@ -3,12 +3,12 @@
 # Maintainer: Kevin Daudt <kdaudt@alpinelinux.org>
 pkgname=fzf
 pkgver=0.22.0
-pkgrel=0
+pkgrel=1
 pkgdesc="A command-line fuzzy finder"
 url="https://github.com/junegunn/fzf"
 arch="all !mips !mips64"
 license="MIT"
-makedepends="go glide bash tmux"
+makedepends="go bash tmux"
 options="net"
 subpackages="
 	$pkgname-tmux::noarch
@@ -19,23 +19,10 @@ subpackages="
 	$pkgname-doc
 	"
 source="$pkgname-$pkgver.tar.gz::https://github.com/junegunn/fzf/archive/$pkgver.tar.gz
-	glide.yaml
-	glide.lock
 	find-buzybox-compat.patch
 	"
-builddir="$srcdir/src/github.com/junegunn/$pkgname"
 
-prepare() {
-	export GOPATH="$srcdir"
-
-	mkdir -p "$(dirname "$builddir")"
-	mv "$srcdir"/$pkgname-$pkgver "$builddir"/
-
-	cp "$srcdir"/glide.yaml "$srcdir"/glide.lock "$builddir"
-	glide install --skip-test
-
-	default_prepare
-}
+export GOPATH="$srcdir"
 
 build() {
 	go build
@@ -93,17 +80,6 @@ zshcomp() {
 	install -m0644 shell/key-bindings.zsh "$subpkgdir"/usr/share/fzf/
 }
 
-glide_init() {
-	abuild clean deps unpack prepare
-	cd "$builddir"
-	export GOPATH="$startdir"
-	rm -f glide.yaml glide.lock
-	glide init --non-interactive
-	glide update
-	cp glide.yaml glide.lock "$startdir"
-	cd "$startdir" && abuild checksum clean
-}
-
 vim() {
 	pkgdesc="fzf vim plugin"
 	install="$pkgname-vim.post-install"
@@ -128,6 +104,4 @@ cleanup_srcdir() {
 }
 
 sha512sums="003b187c93f0ab2e8a1adbd4eb9586e05e12fb9a86e445ac8ff48ba391ae16f104d60d18934bb46765537d5007035f549c15d6970c901f72813d55001d3bc6e5  fzf-0.22.0.tar.gz
-dc14dea17ea585344e16eeffdc244693d97f4519676d20ec43434f6eff460d61be833399469ccb44c25c9fed296d52d424208c4a4cae5a3beecba14593cecd49  glide.yaml
-5d1c0801d79a0425e1ec02c818bf440f2201841f356f32350fac06bf3ed7a7d03c0718cbeadc07143701895152f7ee19919e6e527be9e17c0df430f93d0282c9  glide.lock
 c59e7eb712f5072a2c66b79800f7674d1f9208b1ead4f654e57f8dcb673a45a751725a005c89759847f78c7ae7f246980b2c94e5fff5a3e8c2f6a364965e567e  find-buzybox-compat.patch"
diff --git a/community/fzf/glide.lock b/community/fzf/glide.lock
deleted file mode 100644
index b2289c20aef..00000000000
--- a/community/fzf/glide.lock
+++ /dev/null
@@ -1,46 +0,0 @@
-hash: 400a67fd84c8b43e350ad0bf50e222e23596ca4d7dc6051b22fc969d264410a2
-updated: 2019-04-02T17:53:53.217462503Z
-imports:
-- name: github.com/gdamore/encoding
-  version: b23993cbb6353f0e6aa98d0ee318a34728f628b9
-- name: github.com/gdamore/tcell
-  version: 0a0db94084dfe181108c18508ebd312f12d331fb
-  subpackages:
-  - encoding
-- name: github.com/junegunn/fzf
-  version: ff951341c993ed84ad65344e496e122ee3dddf67
-  subpackages:
-  - src
-  - src/algo
-  - src/tui
-  - src/util
-- name: github.com/lucasb-eyer/go-colorful
-  version: c900de9dbbc73129068f5af6a823068fc5f2308c
-- name: github.com/mattn/go-isatty
-  version: 66b8e73f3f5cda9f96b69efd03dd3d7fc4a5cdb8
-- name: github.com/mattn/go-runewidth
-  version: 14207d285c6c197daabb5c9793d63e7af9ab2d50
-- name: github.com/mattn/go-shellwords
-  version: 02e3cf038dcea8290e44424da473dd12be796a8a
-- name: golang.org/x/crypto
-  version: a5d413f7728c81fb97d96a2b722368945f651e78
-  subpackages:
-  - ssh/terminal
-- name: golang.org/x/sys
-  version: f49334f85ddcf0f08d7fb6dd7363e9e6d6b777eb
-  subpackages:
-  - unix
-  - windows
-- name: golang.org/x/text
-  version: 4ee4af566555f5fbe026368b75596286a312663a
-  subpackages:
-  - encoding
-  - encoding/charmap
-  - encoding/internal
-  - encoding/internal/identifier
-  - encoding/japanese
-  - encoding/korean
-  - encoding/simplifiedchinese
-  - encoding/traditionalchinese
-  - transform
-testImports: []
diff --git a/community/fzf/glide.yaml b/community/fzf/glide.yaml
deleted file mode 100644
index f2c33deafb3..00000000000
--- a/community/fzf/glide.yaml
+++ /dev/null
@@ -1,17 +0,0 @@
-package: src/github.com/junegunn/fzf
-import:
-- package: github.com/gdamore/tcell
-  subpackages:
-  - encoding
-- package: github.com/junegunn/fzf
-  subpackages:
-  - src
-  - src/algo
-  - src/tui
-  - src/util
-- package: github.com/mattn/go-isatty
-- package: github.com/mattn/go-runewidth
-- package: github.com/mattn/go-shellwords
-- package: golang.org/x/crypto
-  subpackages:
-  - ssh/terminal
-- 
cgit v1.2.3