update PKGBUILD for latest conan develop branch

3 files changed, 44 insertions, 52 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 17fe06da9f97..e2713ca0762c 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,37 +1,34 @@
 pkgbase = conan-git
 	pkgdesc = A distributed, open source, C/C++ package manager.
-	pkgver = 1.29.0.dev.r4497.dd258e0ae
+	pkgver = r5594.0851d53c5
 	pkgrel = 1
 	url = https://conan.io
 	arch = any
 	license = MIT
 	makedepends = python-setuptools
 	makedepends = patch
-	makedepends = fakeroot
+	makedepends = git
 	depends = python-pyjwt>=1.4.0
-	depends = python-requests>=2.8.1
-	depends = python-urllib3>=1.25.6
+	depends = python-requests>=2.25
+	depends = python-urllib3>=1.26.6
 	depends = python-colorama>=0.3.3
 	depends = python-yaml>=3.11
-	depends = python-patch-ng>=1.17.2
+	depends = python-patch-ng>=1.17.4
 	depends = python-fasteners>=0.14.1
 	depends = python-six>=1.10.0
 	depends = python-node-semver>=0.6.1
-	depends = python-bottle>=0.12.8
 	depends = python-distro>=1.0.2
-	depends = python-pluginbase>=0.5
-	depends = python-future>=0.16.0
 	depends = python-pygments>=2.0
-	depends = python-deprecation>=2.0
 	depends = python-tqdm>=4.28.1
-	depends = python-jinja>=2.3
+	depends = python-jinja>=3.0
 	depends = python-dateutil>=2.7.0
+	depends = python-bottle>=0.12.8
+	depends = python-pluginbase>=0.5
 	provides = conan
 	conflicts = conan
 	source = conan-git::git+https://github.com/conan-io/conan.git
 	source = arch-reqs.patch
 	md5sums = SKIP
-	md5sums = 4db1a3af80ad8961bf5edaef056216bd
+	md5sums = f220688daf73d0a5f536ba7bf448c763
 
 pkgname = conan-git
-
diff --git a/PKGBUILD b/PKGBUILD
index 2dd8554d101b..7ce42c6a3b70 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,47 +1,44 @@
 # Maintainer: Tomislav Ivek <tomislav.ivek@gmail.com>
 
-pkgname=conan-git
-pkgver=1.29.0.dev.r4497.dd258e0ae
+pkgname=('conan-git')
+pkgver=r5594.0851d53c5
 pkgrel=1
 pkgdesc="A distributed, open source, C/C++ package manager."
 arch=('any')
 url="https://conan.io"
 license=('MIT')
-makedepends=('python-setuptools' 'patch' 'fakeroot')
+makedepends=('python-setuptools' 'patch' 'git')
 depends=('python-pyjwt>=1.4.0'
-         'python-requests>=2.8.1'
-         'python-urllib3>=1.25.6'
+         'python-requests>=2.25'
+         'python-urllib3>=1.26.6'
          'python-colorama>=0.3.3'
          'python-yaml>=3.11'
-         'python-patch-ng>=1.17.2'
+         'python-patch-ng>=1.17.4'
          'python-fasteners>=0.14.1'
          'python-six>=1.10.0'
          'python-node-semver>=0.6.1'
-         'python-bottle>=0.12.8'
          'python-distro>=1.0.2'
-         'python-pluginbase>=0.5'
-         'python-future>=0.16.0'
          'python-pygments>=2.0'
-         'python-deprecation>=2.0'
          'python-tqdm>=4.28.1'
-         'python-jinja>=2.3'
-         'python-dateutil>=2.7.0')
+         'python-jinja>=3.0'
+         'python-dateutil>=2.7.0'
+         'python-bottle>=0.12.8'
+         'python-pluginbase>=0.5')
 provides=('conan')
 conflicts=('conan')
 source=("conan-git::git+https://github.com/conan-io/conan.git" "arch-reqs.patch")
-md5sums=('SKIP'
-         '4db1a3af80ad8961bf5edaef056216bd')
-
 
 pkgver() {
   cd "$pkgname"
-  printf "%s.r%s.%s" "$(grep -oP "__version__ = '\K([0-9a-z.-]+)(?=')" conans/__init__.py | sed 's/\([^-]*-g\)/r\1/;s/-/./g')" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
-}
+  ( set -o pipefail
+    printf "r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
+  )
+} 
 
 prepare() {
   cd "$pkgname"
   patch -Np1 -i "${srcdir}/arch-reqs.patch"
-}
+ }
 
 build() {
   cd "$srcdir/$pkgname"
@@ -56,3 +53,5 @@ package() {
   install -m755 -d "${pkgdir}/usr/share/doc/conan"
   install -m644 contributors.txt "${pkgdir}/usr/share/doc/conan/"
 }
+md5sums=('SKIP'
+         'f220688daf73d0a5f536ba7bf448c763')
diff --git a/arch-reqs.patch b/arch-reqs.patch
index bfbc12eca4ea..170d76f2829a 100644
--- a/arch-reqs.patch
+++ b/arch-reqs.patch
@@ -1,46 +1,42 @@
-diff -aur conan-1.28.0-pristine/conans/requirements_server.txt conan-1.28.0-new/conans/requirements_server.txt
---- conan-1.28.0-pristine/conans/requirements_server.txt	2020-07-30 11:30:59.000000000 +0200
-+++ conan-1.28.0-new/conans/requirements_server.txt	2020-08-03 20:20:41.573333330 +0200
+diff -aur conan-1.46.0-pristine/conans/requirements_server.txt conan-1.46.0-new/conans/requirements_server.txt
+--- conan-1.46.0-pristine/conans/requirements_server.txt	2022-03-09 11:43:22.296626782 +0100
++++ conan-1.46.0-new/conans/requirements_server.txt	2022-03-09 11:46:34.929963816 +0100
 @@ -1,3 +1,3 @@
  # Server
 -bottle>=0.12.8, < 0.13
 +bottle>=0.12.8
  pluginbase>=0.5
-diff -aur conan-1.28.0-pristine/conans/requirements.txt conan-1.28.0-new/conans/requirements.txt
---- conan-1.28.0-pristine/conans/requirements.txt	2020-07-30 11:30:59.000000000 +0200
-+++ conan-1.28.0-new/conans/requirements.txt	2020-08-03 20:20:09.506666663 +0200
-@@ -1,19 +1,19 @@
+diff -aur conan-1.46.0-pristine/conans/requirements.txt conan-1.46.0-new/conans/requirements.txt
+--- conan-1.46.0-pristine/conans/requirements.txt	2022-03-09 11:43:22.296626782 +0100
++++ conan-1.46.0-new/conans/requirements.txt	2022-03-09 11:46:12.626630054 +0100
+@@ -1,17 +1,14 @@
 -PyJWT>=1.4.0, <2.0.0
--requests>=2.8.1, <3.0.0
--urllib3!=1.25.4,!=1.25.5
+-requests>=2.25, <3.0.0
+-urllib3>=1.26.6, <1.27
 -colorama>=0.3.3, <0.5.0
 -PyYAML>=3.11, <6.0
 -patch-ng>=1.17.4, <1.18
 +PyJWT>=1.4.0
-+requests>=2.8.1
-+urllib3>=1.25.6
++requests>=2.25
++urllib3>=1.26.6
 +colorama>=0.3.3
 +PyYAML>=3.11
 +patch-ng>=1.17.4
  fasteners>=0.14.1
--six>=1.10.0,<=1.14.0
+-six>=1.10.0,<=1.16.0
 -node-semver==0.6.1
--distro>=1.0.2, <1.2.0
--future>=0.16.0, <0.19.0
+-distro>=1.0.2, <=1.6.0; sys_platform == 'linux' or sys_platform == 'linux2'
 -pygments>=2.0, <3.0
--deprecation>=2.0, <2.1
 -tqdm>=4.28.1, <5
--Jinja2>=2.3, <3
+-Jinja2>=2.9, <3.0.0;python_version<='2.7'
+-MarkupSafe<=2.0.1;python_version<='2.7'
+-Jinja2>=3.0, <4.0.0;python_version>='3'
 -python-dateutil>=2.7.0, <3
+-configparser>=3.5;python_version<='2.7'
 +six>=1.10.0
 +node-semver>=0.6.1
 +distro>=1.0.2
-+future>=0.16.0
 +pygments>=2.0
-+deprecation>=2.0
 +tqdm>=4.28.1
-+Jinja2>=2.3
++Jinja2>=3.0
 +python-dateutil>=2.7.0
- idna==2.6 ; sys_platform == "darwin" # Solving conflict, somehow is installing 2.7 when requests require 2.6
- cryptography>=1.3.4, <2.4.0 ; sys_platform == "darwin"
- pyOpenSSL>=16.0.0, <19.0.0 ; sys_platform == "darwin"