From e7abfdf58640bb740bf5eaca423a2ce70ebf0097 Mon Sep 17 00:00:00 2001
From: Trent Palmer <trenttdually@gmail.com>
Date: Tue, 2 Jan 2018 01:09:32 -0800
Subject: [PATCH] adjust all the PROVIDEs and CONFLICTs

---
 deoplete-git/.SRCINFO          | 4 +---
 deoplete-git/PKGBUILD          | 6 +++---
 deoplete-jedi-git/.SRCINFO     | 4 +---
 deoplete-jedi-git/PKGBUILD     | 6 +++---
 vim-lightline-git/.SRCINFO     | 3 +--
 vim-lightline-git/PKGBUILD     | 4 ++--
 vim-youcompleteme-git/.SRCINFO | 1 +
 vim-youcompleteme-git/PKGBUILD | 2 ++
 vimscripts-autoclose/.SRCINFO  | 1 -
 vimscripts-autoclose/PKGBUILD  | 2 +-
 10 files changed, 15 insertions(+), 18 deletions(-)

diff --git a/deoplete-git/.SRCINFO b/deoplete-git/.SRCINFO
index 6eef1cd..3357729 100644
--- a/deoplete-git/.SRCINFO
+++ b/deoplete-git/.SRCINFO
@@ -9,10 +9,8 @@ pkgbase = deoplete-git
 	makedepends = git
 	depends = python-neovim
 	depends = python2-neovim
-	provides = deoplete-git
+	provides = deoplete
 	conflicts = deoplete
-	conflicts = deoplete-git
-	replaces = deoplete
 	source = deoplete::git://github.com/Shougo/deoplete.nvim
 	md5sums = SKIP
 
diff --git a/deoplete-git/PKGBUILD b/deoplete-git/PKGBUILD
index 2c1eef9..1192cde 100644
--- a/deoplete-git/PKGBUILD
+++ b/deoplete-git/PKGBUILD
@@ -10,9 +10,9 @@ license=('MIT')
 groups=()
 depends=('python-neovim' 'python2-neovim')
 makedepends=('git') 
-provides=('deoplete-git')
-conflicts=('deoplete' 'deoplete-git')
-replaces=('deoplete')
+provides=('deoplete')
+conflicts=('deoplete')
+replaces=('')
 backup=()
 options=()
 install="${_name}.install"
diff --git a/deoplete-jedi-git/.SRCINFO b/deoplete-jedi-git/.SRCINFO
index b27f8df..28d2545 100644
--- a/deoplete-jedi-git/.SRCINFO
+++ b/deoplete-jedi-git/.SRCINFO
@@ -9,10 +9,8 @@ pkgbase = deoplete-jedi-git
 	depends = deoplete-git
 	depends = python-jedi
 	depends = python2-jedi
-	provides = deoplete-jedi-git
+	provides = deoplete-jedi
 	conflicts = deoplete-jedi
-	conflicts = deoplete-jedi-git
-	replaces = deoplete-jedi
 	source = deoplete-jedi::git://github.com/zchee/deoplete-jedi
 	md5sums = SKIP
 
diff --git a/deoplete-jedi-git/PKGBUILD b/deoplete-jedi-git/PKGBUILD
index 2af58b0..c7e06f3 100644
--- a/deoplete-jedi-git/PKGBUILD
+++ b/deoplete-jedi-git/PKGBUILD
@@ -13,9 +13,9 @@ groups=()
 # the git submodules?
 depends=('deoplete-git' 'python-jedi' 'python2-jedi')
 makedepends=('git') 
-provides=('deoplete-jedi-git')
-conflicts=('deoplete-jedi' 'deoplete-jedi-git')
-replaces=('deoplete-jedi')
+provides=('deoplete-jedi')
+conflicts=('deoplete-jedi')
+replaces=()
 backup=()
 options=()
 source=("${_name}::${url//https/git}")
diff --git a/vim-lightline-git/.SRCINFO b/vim-lightline-git/.SRCINFO
index 892e4f1..01983d7 100644
--- a/vim-lightline-git/.SRCINFO
+++ b/vim-lightline-git/.SRCINFO
@@ -9,10 +9,9 @@ pkgbase = vim-lightline-git
 	makedepends = git
 	depends = vim-runtime
 	depends = neovim
-	provides = vim-lightline-git
+	provides = vim-lightline
 	conflicts = vim-lightline
 	conflicts = vim-lightline-git
-	replaces = vim-lightline
 	source = vim-lightline::git://github.com/itchyny/lightline.vim
 	md5sums = SKIP
 
diff --git a/vim-lightline-git/PKGBUILD b/vim-lightline-git/PKGBUILD
index b4abe48..d9e977d 100644
--- a/vim-lightline-git/PKGBUILD
+++ b/vim-lightline-git/PKGBUILD
@@ -14,9 +14,9 @@ url='https://github.com/itchyny/lightline.vim'
 license=('MIT')
 depends=('vim-runtime' 'neovim')
 makedepends=('git')
-provides=('vim-lightline-git')
+provides=('vim-lightline')
 conflicts=('vim-lightline' 'vim-lightline-git')
-replaces=('vim-lightline')
+replaces=('')
 install='lightline.install'
 source=("${_name}::${url//https/git}")
 md5sums=('SKIP')
diff --git a/vim-youcompleteme-git/.SRCINFO b/vim-youcompleteme-git/.SRCINFO
index 61a181f..91b5c15 100644
--- a/vim-youcompleteme-git/.SRCINFO
+++ b/vim-youcompleteme-git/.SRCINFO
@@ -26,6 +26,7 @@ pkgbase = vim-youcompleteme-git
 	depends = mono
 	depends = rust
 	depends = nodejs
+	provides = vim-youcompleteme
 	source = git+https://github.com/Valloric/YouCompleteMe.git
 	source = git+https://github.com/ross/requests-futures.git
 	source = git+https://github.com/Valloric/ycmd.git
diff --git a/vim-youcompleteme-git/PKGBUILD b/vim-youcompleteme-git/PKGBUILD
index 8c1902c..d8c7aca 100644
--- a/vim-youcompleteme-git/PKGBUILD
+++ b/vim-youcompleteme-git/PKGBUILD
@@ -45,6 +45,8 @@ arch=('i686' 'x86_64' 'armv7h')
 url='http://valloric.github.com/YouCompleteMe/'
 license=('GPL3')
 groups=('vim-plugins')
+provides=('vim-youcompleteme')
+conflicts=('')
 
 depends=('boost' 'boost-libs' 'ncurses5-compat-libs' 'python' 'python2' 'vim' 'clang')
 [[ "$_omnisharp" = "y" ]] && depends+=('mono')
diff --git a/vimscripts-autoclose/.SRCINFO b/vimscripts-autoclose/.SRCINFO
index bed6b37..cf9cdd2 100644
--- a/vimscripts-autoclose/.SRCINFO
+++ b/vimscripts-autoclose/.SRCINFO
@@ -9,7 +9,6 @@ pkgbase = vimscripts-autoclose
 	depends = neovim
 	provides = vimscripts-autoclose
 	conflicts = vim-auto-pairs
-	replaces = vimscripts-autoclose
 	source = vimscripts-autoclose-1.2.tar.gz::https://github.com/vim-scripts/AutoClose/archive/1.2.tar.gz
 	md5sums = 8eb8630367d6978f3e2696df27eff4eb
 
diff --git a/vimscripts-autoclose/PKGBUILD b/vimscripts-autoclose/PKGBUILD
index 17204cc..53d07b8 100644
--- a/vimscripts-autoclose/PKGBUILD
+++ b/vimscripts-autoclose/PKGBUILD
@@ -16,7 +16,7 @@ checkdepends=()
 optdepends=()
 provides=('vimscripts-autoclose')
 conflicts=('vim-auto-pairs')
-replaces=('vimscripts-autoclose')
+replaces=('')
 backup=()
 options=()
 install=