verbump + depends update

2 files changed, 9 insertions, 12 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 04d4bda8d94b..e2685f2d8f6a 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = python-foolbox-git
 	pkgdesc = Toolbox to create adversarial examples that fool neural networks in PyTorch, TensorFlow, Keras,
-	pkgver = v2.0.0b0.r8.g4ffc9fc
+	pkgver = 3.1.1.r0.gef30f7f
 	pkgrel = 1
 	url = https://github.com/bethgelab/foolbox
 	arch = any
@@ -11,9 +11,7 @@ pkgbase = python-foolbox-git
 	depends = python-scipy
 	depends = python-gitpython
 	depends = python-requests
-	optdepends = python-pytorch: PyTorch functionality
-	optdepends = python-tensorflow: TensorFlow functionality
-	optdepends = python-keras: Keras functionality
+	depends = python-eagerpy
 	provides = python-foolbox
 	conflicts = python-foolbox
 	options = !emptydirs
diff --git a/PKGBUILD b/PKGBUILD
index f346d33288e9..7aedf549442a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -4,31 +4,30 @@
 # his PKGBUILD that served as a base for this one
 
 pkgname=python-foolbox-git
+_name=foolbox
 pkgdesc="Toolbox to create adversarial examples that fool neural networks in PyTorch, TensorFlow, Keras,"
-pkgver=v2.0.0b0.r8.g4ffc9fc
+pkgver=3.1.1.r0.gef30f7f
 pkgrel=1
 arch=(any)
 url='https://github.com/bethgelab/foolbox'
 license=(MIT)
 provides=('python-foolbox')
 conflicts=('python-foolbox')
-optdepends=('python-pytorch: PyTorch functionality' 'python-tensorflow: TensorFlow functionality' 'python-keras: Keras functionality')
-depends=('python-numpy' 'python-scipy' 'python-gitpython' 'python-requests')
+depends=('python-numpy' 'python-scipy' 'python-gitpython' 'python-requests' 'python-eagerpy')
 makedepends=(
   'python-setuptools' 'git'
 )
 options=(!emptydirs)
-source=("git+https://github.com/bethgelab/foolbox.git")
+source=("git+$url.git")
 sha256sums=('SKIP')
 
 pkgver() {
-  cd foolbox
-  git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
+  cd $_name
+  git describe --long --tags | sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g'
 }
 
-
 package() {
-  cd "${srcdir}/foolbox"
+  cd "${srcdir}/$_name"
   python setup.py install --root="${pkgdir}/" --optimize=1
   install -Dm 644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
 }