Updated using @yochananmarqos PKGBUILD

4 files changed, 46 insertions, 82 deletions

diff --git a/.SRCINFO b/.SRCINFO
index c87083c7e3f9..2d33e795a3df 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,39 +1,30 @@
-# Generated by mksrcinfo v8
-# Fri Sep 23 23:13:48 UTC 2016
 pkgbase = subliminal-git
-	pkgdesc = Python library and CLI tool for searching and downloading subtitles. (python3 version)
-	pkgver = 2.0.5.r1.gdd74383
+	pkgdesc = Python library and CLI tool for searching and downloading subtitles.
+	pkgver = 2.0.5.r3.ga952dfb
 	pkgrel = 1
 	url = https://github.com/Diaoul/subliminal
 	arch = any
 	license = MIT
 	makedepends = git
 	makedepends = python-setuptools
-	makedepends = python-sphinx
 	makedepends = python-sphinxcontrib-programoutput
-	depends = python-guessit>2.0.1
-	depends = python-babelfish>=0.5.2
-	depends = python-enzyme>=0.4.1
-	depends = python-beautifulsoup4>=4.2.0
-	depends = python-requests>=2.0
-	depends = python-click>=4.0
-	depends = python-dogpile.cache>=0.6.0
-	depends = python-stevedore>=1.0.0
-	depends = python-chardet>=2.3.0
-	depends = python-pysrt>=1.0.1
-	depends = python-six>=1.9.0
-	depends = python-appdirs>=1.3
-	depends = python-rarfile>=2.7
-	depends = python-pytz>=2012c
-	provides = subliminal-git
+	makedepends = python-sphinx_rtd_theme
+	depends = python-guessit
+	depends = python-enzyme
+	depends = python-beautifulsoup4
+	depends = python-requests
+	depends = python-click
+	depends = python-dogpile.cache
+	depends = python-stevedore
+	depends = python-pysrt
+	depends = python-six
+	depends = python-appdirs
+	depends = python-rarfile
+	depends = python-pytz
 	provides = subliminal
-	provides = subliminal-git-doc
 	conflicts = subliminal
-	replaces = subliminal-git
-	source = subliminal::git+https://github.com/Diaoul/subliminal.git#branch=master
-	source = sphinx-manpages.patch
-	md5sums = SKIP
-	md5sums = d63a79b506a7d4adea15112fe46f321b
+	source = git+https://github.com/Diaoul/subliminal.git
+	sha256sums = SKIP
 
 pkgname = subliminal-git
 
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 000000000000..b2018dc1470a
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,4 @@
+pkg
+src
+subliminal
+*.tar.xz
diff --git a/PKGBUILD b/PKGBUILD
index f0bb56002383..b164d4027bc6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,67 +1,48 @@
 # Maintainer: Hyacinthe Cartiaux <hyacinthe.cartiaux@free.fr>
+# Contributor: Mark Wagie <yochanan.marqos@gmail.com>
 # Contributor: Nikola Milinković <nikmil@gmail.com>
 # Contributor: Quentin Stievenart <quentin.stievenart@gmail.com>
 
-_gitroot="https://github.com/Diaoul/subliminal"
-_gitname="subliminal"
 pkgname=subliminal-git
-pkgver=2.0.5.r1.gdd74383
+pkgver=2.0.5.r3.ga952dfb
 pkgrel=1
 pkgdesc="Python library and CLI tool for searching and downloading subtitles."
-arch=(any)
+arch=('any')
 url="https://github.com/Diaoul/subliminal"
 license=('MIT')
-depends=( 'python-guessit>2.0.1'
-          'python-babelfish>=0.5.2'
-          'python-enzyme>=0.4.1'
-          'python-beautifulsoup4>=4.2.0'
-          'python-requests>=2.0'
-          'python-click>=4.0'
-          'python-dogpile.cache>=0.6.0'
-          'python-stevedore>=1.0.0'
-          'python-chardet>=2.3.0'
-          'python-pysrt>=1.0.1'
-          'python-six>=1.9.0'
-          'python-appdirs>=1.3'
-          'python-rarfile>=2.7'
-          'python-pytz>=2012c'
-)
-makedepends=('git' 'python-setuptools'
-             'python-sphinx' 'python-sphinxcontrib-programoutput')
-
-provides=('subliminal-git' 'subliminal' 'subliminal-git-doc')
-conflicts=('subliminal')
-replaces=('subliminal-git')
-pkgdesc="Python library and CLI tool for searching and downloading subtitles. (python3 version)"
-source=("${_gitname}::git+${_gitroot}.git#branch=master"
-        'sphinx-manpages.patch')
-md5sums=('SKIP'
-         'd63a79b506a7d4adea15112fe46f321b')
+depends=('python-guessit' 'python-enzyme' 'python-beautifulsoup4' 'python-requests'
+         'python-click' 'python-dogpile.cache' 'python-stevedore'  'python-pysrt' 'python-six'
+         'python-appdirs' 'python-rarfile' 'python-pytz')
+makedepends=('git' 'python-setuptools' 'python-sphinxcontrib-programoutput'
+             'python-sphinx_rtd_theme')
+provides=("${pkgname%-git}")
+conflicts=("${pkgname%-git}")
+source=('git+https://github.com/Diaoul/subliminal.git')
+sha256sums=('SKIP')
 
 pkgver() {
-  cd ${_gitname}
-  git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
+    cd "$srcdir/${pkgname%-git}"
+    git describe --long --tags | sed 's/\([^-]*-g\)/r\1/;s/-/./g'
 }
 
 prepare() {
-  cd ${srcdir}/${_gitname}
-  patch -p1 -i ${srcdir}/sphinx-manpages.patch
+    cd "$srcdir/${pkgname%-git}"
+    sed -i 's/SPHINXOPTS    = -n -W/SPHINXOPTS    = -n/g' docs/Makefile
 }
 
 build() {
-  cd ${srcdir}/${_gitname}/docs
-  make man
+    cd "$srcdir/${pkgname%-git}"
+    python setup.py build
+
+    cd "$srcdir/${pkgname%-git}/docs"
+    make man
 }
 
 package() {
-  cd ${srcdir}/${_gitname}
-  python setup.py install --root="${pkgdir}/" --optimize=1
-  ln -s /usr/bin/subliminal "${pkgdir}"/usr/bin/subliminal3
-
-  install -v -m755 -d "${pkgdir}/usr/share/licenses/python-subliminal-git"
-  install -v -m644 ./LICENSE "${pkgdir}/usr/share/licenses/python-subliminal-git/"
+    cd "$srcdir/${pkgname%-git}"
+    python setup.py install --root="$pkgdir/" --optimize=1 --skip-build
 
-  install -v -m755 -d "${pkgdir}/usr/share/man/man1"
-  install -v -m644 docs/_build/man/subliminal.1 "${pkgdir}/usr/share/man/man1/"
+    install -Dm644 LICENSE -t "$pkgdir/usr/share/licenses/${pkgname%-git}"
+    install -Dm644 docs/_build/man/subliminal.1 -t "$pkgdir/usr/share/man/man1"
 }
 
diff --git a/sphinx-manpages.patch b/sphinx-manpages.patch
deleted file mode 100644
index 6e1052cc1afb..000000000000
--- a/sphinx-manpages.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -aur subliminal/docs/Makefile subliminal.new/docs/Makefile
---- subliminal/docs/Makefile	2015-12-06 09:41:35.804836605 +0100
-+++ subliminal.new/docs/Makefile	2015-12-06 09:41:58.257760875 +0100
-@@ -2,7 +2,7 @@
- #
- 
- # You can set these variables from the command line.
--SPHINXOPTS    = -n -W
-+SPHINXOPTS    = -n
- SPHINXBUILD   = sphinx-build
- PAPER         =
- BUILDDIR      = _build