From d592fb679984198705363e7c1a24ec4acca7cb0b Mon Sep 17 00:00:00 2001
From: yan12125 <yan12125@9fca08f4-af9d-4005-b8df-a31f2cc04f65>
Date: Sun, 7 Apr 2019 15:21:49 +0000
Subject: [PATCH] archrelease: copy trunk to community-any

git-svn-id: file:///srv/repos/svn-community/svn@450308 9fca08f4-af9d-4005-b8df-a31f2cc04f65
---
 repos/community-any/PKGBUILD                 | 24 ++++++++------------
 repos/community-any/install-test-files.patch | 13 -----------
 2 files changed, 10 insertions(+), 27 deletions(-)
 delete mode 100644 repos/community-any/install-test-files.patch

diff --git a/repos/community-any/PKGBUILD b/repos/community-any/PKGBUILD
index e5c76daae1bc..f109309829e1 100644
--- a/repos/community-any/PKGBUILD
+++ b/repos/community-any/PKGBUILD
@@ -5,39 +5,35 @@
 
 pkgname=buildbot
 pkgdesc='The Continuous Integration Framework'
-pkgver=2.1.0
+pkgver=2.2.0
 pkgrel=1
 arch=(any)
 url='https://buildbot.net'
 license=(GPL2)
-depends=(python-twisted python-jinja python-zope-interface python-future
+depends=(python-twisted python-jinja python-zope-interface
          python-sqlalchemy-migrate python-dateutil python-txaio
          python-autobahn python-pyjwt python-yaml)
 checkdepends=(python-boto3 python-lz4 python-treq python-txrequests
               python-mock python-moto python-parameterized
               python-buildbot-pkg=$pkgver buildbot-worker=$pkgver python-buildbot-www=$pkgver
-              python-pip openssh)
+              openssh)
+makedepends=(python-setuptools)
 optdepends=(
   'python-boto3: for AWS EC2 latent worker'
   'python-lz4: to compress logs using lz4'
   'python-treq: for using HTTP requests as steps'
   'python-txrequests: for using HTTP requests as steps'
   'python-pyopenssl: to use SSL/TLS in mail or IRC notifiers'
+  'pass: to use SecretInPass provider'
+  'vault: to use SecretInVault provider'
 )
-source=("https://github.com/buildbot/buildbot/releases/download/v$pkgver/buildbot-v$pkgver.gitarchive.tar.gz"{,.sig}
-        install-test-files.patch)
-sha256sums=('a15491995d9168e8e50c2f958ce4bfef2984ca25dee21bd694c8ea0a12e47509'
-            'SKIP'
-            'b6c583a85555c8dc20a84a0402539dbadd854408a15d6424841e59a6daa47fe2')
+source=("https://github.com/buildbot/buildbot/releases/download/v$pkgver/buildbot-v$pkgver.gitarchive.tar.gz"{,.sig})
+sha256sums=('126adffe288f9b6df2d3a4eca49be757f65c01bc0c551d562681b4cf5ca460fb'
+            'SKIP')
 validpgpkeys=(
   '390EB159056ED56F66AB1092AECD456B4D2531FC'  # Pierre Tardy <tardyp@gmail.com>
 )
 
-prepare() {
-  cd buildbot-$pkgver
-  patch -Np1 -i ../install-test-files.patch
-}
-
 build() {
   cd buildbot-$pkgver/master
   python setup.py build
@@ -50,7 +46,7 @@ check() {
   export AWS_SECRET_ACCESS_KEY=foobar_secret
   export AWS_ACCESS_KEY_ID=foobar_key
 
-  pip install --root="$srcdir"/tmp_install .
+  python setup.py install --root="$srcdir"/tmp_install
 
   export PYTHONPATH="$srcdir"/tmp_install/usr/lib/python3.7/site-packages
   export PATH="$PATH:$srcdir/tmp_install/usr/bin"
diff --git a/repos/community-any/install-test-files.patch b/repos/community-any/install-test-files.patch
deleted file mode 100644
index 2a182681968b..000000000000
--- a/repos/community-any/install-test-files.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/master/setup.py b/master/setup.py
-index c4172be5a..4a89ac895 100755
---- a/master/setup.py
-+++ b/master/setup.py
-@@ -217,6 +217,8 @@ setup_args = {
-         include("buildbot/spec/types", "*.raml"),
-         include("buildbot/test/unit/test_templates_dir", "*.html"),
-         include("buildbot/test/unit/test_templates_dir/plugin", "*.*"),
-+        include("buildbot/test/integration/pki", "*.*"),
-+        include("buildbot/test/integration/pki/ca", "*.*"),
-     ] + include_statics("buildbot/www/static"),
-     'cmdclass': {'install_data': install_data_twisted,
-                  'sdist': our_sdist},