remove conflicts in gvim subpackage
---
 main/vim/APKBUILD | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/main/vim/APKBUILD b/main/vim/APKBUILD
index 88a3a4c1c4..661b9fe462 100644
--- a/main/vim/APKBUILD
+++ b/main/vim/APKBUILD
@@ -4,7 +4,7 @@
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=vim
 pkgver=8.1.1075
-pkgrel=0
+pkgrel=1
 pkgdesc="Improved vi-style text editor"
 url="https://www.vim.org/"
 arch="all"
@@ -80,7 +80,6 @@ package() {
 
 gvim() {
 	pkgdesc="advanced text editor, with GUI"
-	conflicts="vim"
 	provides="vim"
 	cd "$builddir"-gvim
 	make -j1 DESTDIR="$subpkgdir/" install
@@ -93,7 +92,8 @@ gvim() {
 
 vimdiff() {
 	pkgdesc="view file diffs in vim"
-	depends="diffutils"
+	depends="diffutils vim"
+	options="!tracedeps"
 
 	install -d "$subpkgdir"/usr/bin
 	mv "$pkgdir"/usr/bin/vimdiff "$subpkgdir"/usr/bin
-- 
2.20.1



---
Unsubscribe:  alpine-aports+unsubscribe@lists.alpinelinux.org
Help:         alpine-aports+help@lists.alpinelinux.org
---