update to 2.14.16

3 files changed, 104 insertions, 88 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 3d23e3ac948e..3a4bbfd0b09b 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,56 +1,54 @@
 # Generated by mksrcinfo v8
-# dim. mai 21 09:30:55 UTC 2017
+# Sat Aug 18 22:01:52 UTC 2018
 pkgbase = flexget
 	pkgdesc = Automate downloading or processing content (torrents, podcasts, etc.) from different sources like RSS-feeds, html-pages, various sites and more.
-	pkgver = 2.10.48
+	pkgver = 2.14.16
 	pkgrel = 1
 	url = http://flexget.com/
 	changelog = ChangeLog
 	arch = any
 	license = MIT
-	makedepends = python2-paver
-	makedepends = python2-setuptools
-	depends = python2
-	depends = python2-feedparser
-	depends = python2-sqlalchemy
-	depends = python2-yaml
-	depends = python2-beautifulsoup4
-	depends = python2-html5lib
-	depends = python2-pyrss2gen
-	depends = python2-pynzb
-	depends = python2-rpyc
-	depends = python2-jinja
-	depends = python2-requests
-	depends = python2-dateutil
-	depends = python2-jsonschema
-	depends = python2-path
-	depends = python2-guessit>=2.1.2
-	depends = python2-apscheduler>=3.2.0
-	depends = python2-terminaltables
-	depends = python2-colorclass
-	depends = python2-pytvmaze>=1.4.8
-	depends = python2-ordereddict
-	depends = python2-cherrypy>=3.7.0
-	depends = python2-flask
-	depends = python2-flask-restful
-	depends = python2-flask-restplus086
-	depends = python2-flask-compress
-	depends = python2-flask-login>=0.3.2
-	depends = python2-flask-cors>=2.1.2
-	depends = python2-pyparsing>=2.0.3
-	depends = python2-future
-	depends = python2-zxcvbn
-	optdepends = python2-guppy: for memusage plugin
-	optdepends = python2-transmissionrpc: Transmission support
-	optdepends = python2-rarfile: decompress plugin
-	source = https://github.com/Flexget/Flexget/archive/2.10.48.tar.gz
+	makedepends = python-paver
+	makedepends = python-setuptools
+	depends = python
+	depends = python-feedparser>=5.2.1
+	depends = python-sqlalchemy>=1.0.9
+	depends = python-yaml
+	depends = python-beautifulsoup4>=4.5
+	depends = python-html5lib>=0.11
+	depends = python-pyrss2gen
+	depends = python-pynzb
+	depends = python-rpyc
+	depends = python-jinja
+	depends = python-requests>=2.16.3
+	depends = python-dateutil>=2.5.3
+	depends = python-jsonschema>=2.0
+	depends = python-path>=8.1.1
+	depends = python-pathlib>=1.0
+	depends = python-rebulk
+	depends = python-apscheduler>=3.2.0
+	depends = python-terminaltables>=3.1.0
+	depends = python-colorclass>=2.2.0
+	depends = python-cherrypy>=3.7.0
+	depends = python-flask>=0.7
+	depends = python-flask-restful>=0.3.3
+	depends = python-flask-restplus
+	depends = python-flask-compress>=1.2.1
+	depends = python-flask-login>=0.4.0
+	depends = python-flask-cors>=2.1.2
+	depends = python-pyparsing>=2.0.3
+	depends = python-zxcvbn
+	depends = python-future>=0.15.2
+	optdepends = python-guppy: for memusage plugin
+	optdepends = python-transmissionrpc: Transmission support
+	optdepends = python-rarfile: decompress plugin
+	optdepends = python-boto3: SNS output plugin
+	source = https://github.com/Flexget/Flexget/archive/2.14.16.tar.gz
 	source = flexget.service
 	source = http://download.flexget.com/ChangeLog
-	source = fix_guessit_2.1.2.patch
-	sha256sums = fe7024b516030f869189ff87afcaee09b31c34516c44346514715bf41e988f6f
+	sha256sums = 0827f68a9baf0207cb8f036dc8e51e786a4e36b87d947924f1f4a433ae03722c
 	sha256sums = e2c3a958ed0c286337cd37fba1d6cbdf4306c57fcddf2b9cc43615ce80ae83aa
 	sha256sums = dcc1bc676b8c2b798fa9a7e0ed2b6853323e9e9d8ff696696dddeaf29cbc13d6
-	sha256sums = 8246a4cbdb902d41379c8c4e6045da349c98428adefaf682aff0413b8b8969f7
 
 pkgname = flexget
 
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000000..0a2223f3641d
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,4 @@
+*.tar.gz
+*.tar.xz
+src/
+pkg/
diff --git a/PKGBUILD b/PKGBUILD
index 6c31358eaece..0d5bd240b023 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,11 +1,12 @@
 # Maintainer: S. Leduc <sebastien@sleduc.fr>
+# Contributor: redfish <redfish@galactica.pw>
 # Contributor: Amr Hassan <amr.hassan@gmail.com>
 # Contributor: Nathan Owe <ndowens.aur at gmail dot com>
 # Contributor: G. Richard Bellamy <rbellamy@pteradigm.com>
 
 pkgname=flexget
 _pkgname=Flexget
-pkgver=2.10.48
+pkgver=2.14.16
 pkgrel=1
 
 pkgdesc="Automate downloading or processing content (torrents, podcasts, etc.) from different sources like RSS-feeds, html-pages, various sites and more."
@@ -14,74 +15,83 @@ arch=('any')
 url="http://flexget.com/"
 license=('MIT')
 
-depends=('python2'
-         # documented in FlexGet.egg-info/requires.txt
-         'python2-feedparser'
-         'python2-sqlalchemy'
-         'python2-yaml'
-         'python2-beautifulsoup4'
-         'python2-html5lib'
-         'python2-pyrss2gen' #AUR#
-         'python2-pynzb' #AUR#
-         'python2-rpyc' #AUR#
-         'python2-jinja'
-         'python2-requests'
-         'python2-dateutil'
-         'python2-jsonschema'
-         'python2-path' #AUR#
-         'python2-guessit>=2.1.2'
-         'python2-apscheduler>=3.2.0' #AUR#
-         'python2-terminaltables'
-         'python2-colorclass'
-         'python2-pytvmaze>=1.4.8' #AUR#
-         'python2-ordereddict'
-         'python2-cherrypy>=3.7.0'
-         'python2-flask'
-         'python2-flask-restful' #AUR#
-         'python2-flask-restplus086' #AUR#
-         'python2-flask-compress'
-         'python2-flask-login>=0.3.2'
-         'python2-flask-cors>=2.1.2'
-         'python2-pyparsing>=2.0.3'
-         'python2-future'
-         'python2-zxcvbn'
+depends=('python'
+         # documented in requirements.in
+         'python-feedparser>=5.2.1'
+         'python-sqlalchemy>=1.0.9'
+         'python-yaml'
+         'python-beautifulsoup4>=4.5'
+         'python-html5lib>=0.11'
+         'python-pyrss2gen'
+         'python-pynzb'
+         'python-rpyc'
+         'python-jinja'
+         'python-requests>=2.16.3'
+         'python-dateutil>=2.5.3'
+         'python-jsonschema>=2.0'
+         'python-path>=8.1.1'
+         'python-pathlib>=1.0'
+         #'python-guessit' # feature disabled until upstream updates to latest API
+         'python-rebulk'
+         'python-apscheduler>=3.2.0'
+         'python-terminaltables>=3.1.0'
+         'python-colorclass>=2.2.0'
+         'python-cherrypy>=3.7.0'
+         'python-flask>=0.7'
+         'python-flask-restful>=0.3.3'
+         'python-flask-restplus'
+         'python-flask-compress>=1.2.1'
+         'python-flask-login>=0.4.0'
+         'python-flask-cors>=2.1.2'
+         'python-pyparsing>=2.0.3'
+         'python-zxcvbn'
+         'python-future>=0.15.2'
          )
-optdepends=('python2-guppy: for memusage plugin' #AUR#
-            'python2-transmissionrpc: Transmission support' #AUR#
-            'python2-rarfile: decompress plugin' #AUR#
+optdepends=('python-guppy: for memusage plugin' #AUR#
+            'python-transmissionrpc: Transmission support' #AUR#
+            'python-rarfile: decompress plugin' #AUR#
+            'python-boto3: SNS output plugin' #AUR#
             )
-makedepends=('python2-paver'
-             'python2-setuptools'
+makedepends=('python-paver'
+             'python-setuptools'
              )
 
 source=("https://github.com/Flexget/Flexget/archive/${pkgver}.tar.gz"
         'flexget.service'
         "http://download.flexget.com/ChangeLog"
-        "fix_guessit_2.1.2.patch"
         )
 
 changelog=ChangeLog
 
-sha256sums=('fe7024b516030f869189ff87afcaee09b31c34516c44346514715bf41e988f6f'
-            'e2c3a958ed0c286337cd37fba1d6cbdf4306c57fcddf2b9cc43615ce80ae83aa'
-            'dcc1bc676b8c2b798fa9a7e0ed2b6853323e9e9d8ff696696dddeaf29cbc13d6'
-            '8246a4cbdb902d41379c8c4e6045da349c98428adefaf682aff0413b8b8969f7')
-
 prepare() {
   cd "${_pkgname}"-"${pkgver}"
 
-  msg "Patching shebangs to point to python2"
-  sed -i 's/\(python\)/\12/' flexget{,/ui}/__init__.py
+  #msg "Patching shebangs to point to python2"
+  sed -i '1s/python2/python/' flexget{,/ui}/__init__.py
+
+  # Don't use the requirements.txt with pinned deps
+  cp requirements.{in,txt}
 
-  patch -p0 < ${srcdir}/fix_guessit_2.1.2.patch
+  # Remove specific versions, because they are not going to match
+  # versions of Arch packages. Yes, this might break something.
+  sed -i 's/==.*//g' requirements.txt
+  sed -i 's/<=.*//g' requirements.txt
+  sed -i 's/~=.*//g' requirements.txt
+  sed -i 's/; python_version.*//g' requirements.txt
 
+  # zxcvbn-python has been renamed zxcvbn
+  sed -i 's/zxcvbn-python/zxcvbn/' requirements.txt
+
+  # disable this parser because python-guessit API changed and upstream
+  # needs to be patched to support it.
+  rm flexget/plugins/parsers/parser_guessit.py
 }
 
 package() {
   cd "${_pkgname}"-"${pkgver}"
 
   # Python setup
-  python2 setup.py install --root="${pkgdir}"/ --prefix=/usr --optimize=1
+  python setup.py install --root="${pkgdir}"/ --prefix=/usr --optimize=1
 
   # License
   install -Dm644 LICENSE "${pkgdir}"/usr/share/licenses/"${pkgname}"/LICENSE
@@ -90,4 +100,8 @@ package() {
   install -Dm644 ../flexget.service "${pkgdir}"/usr/lib/systemd/user/flexget.service
 }
 
+sha256sums=('0827f68a9baf0207cb8f036dc8e51e786a4e36b87d947924f1f4a433ae03722c'
+            'e2c3a958ed0c286337cd37fba1d6cbdf4306c57fcddf2b9cc43615ce80ae83aa'
+            'dcc1bc676b8c2b798fa9a7e0ed2b6853323e9e9d8ff696696dddeaf29cbc13d6')
+
 # vim:set ts=2 sw=2 et: