Rid pkgver() & provide/conflicts

2 files changed, 8 insertions, 13 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 61ec72f2aea3..b8a91de11f5c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Mon Jun  5 05:05:29 UTC 2017
+# Tue Jun  6 21:05:41 UTC 2017
 pkgbase = gprbuild-bootstrap
 	pkgdesc = static gprbuild to bootstrap xmlada and gprbuild proper
-	pkgver = r3147.g18e2bc01
+	pkgver = 2017
 	pkgrel = 1
 	url = http://www.adacore.com/gnatpro/toolsuite/gprbuild/
 	arch = i686
@@ -11,9 +11,6 @@ pkgbase = gprbuild-bootstrap
 	makedepends = git
 	makedepends = gcc-ada
 	depends = glibc
-	provides = gprbuild-bootstrap
-	conflicts = gprbuild
-	conflicts = gprbuild-bootstrap
 	options = debug
 	options = !strip
 	source = git+https://github.com/AdaCore/gprbuild
diff --git a/PKGBUILD b/PKGBUILD
index d97a7c987884..57f90583ab7b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,5 +1,6 @@
 pkgname=gprbuild-bootstrap
-pkgver=r3147.g18e2bc01
+#pkgver=r3147.g18e2bc01
+pkgver=2017
 pkgrel=1
 
 pkgdesc='static gprbuild to bootstrap xmlada and gprbuild proper'
@@ -12,18 +13,15 @@ options=('debug' '!strip')
 depends=('glibc')
 makedepends=('git' 'gcc-ada')
 
-provides=('gprbuild-bootstrap')
-conflicts=('gprbuild' 'gprbuild-bootstrap')
-
 source=('git+https://github.com/AdaCore/gprbuild'
         'git+https://github.com/AdaCore/xmlada')
 
 sha1sums=('SKIP' 'SKIP')
 
-pkgver() {
-    cd gprbuild
-    printf 'r%s.g%s' "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
-}
+#pkgver() {
+#    cd gprbuild
+#    printf 'r%s.g%s' "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
+#}
 
 prepare() {
     cd gprbuild