Updated to 1.1.0dev

5 files changed, 155 insertions, 33 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 53ff768cf299..d63862a8ee44 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = subliminal-git
 	pkgdesc = Python library and CLI tool for searching and downloading subtitles.
-	pkgver = 1.0.2.r733.769b16d
+	pkgver = 1.1.0.r761.d62a09b
 	pkgrel = 1
 	epoch = 2
 	url = https://github.com/Diaoul/subliminal
@@ -8,9 +8,20 @@ pkgbase = subliminal-git
 	license = MIT
 	makedepends = git
 	makedepends = python-setuptools
+	makedepends = python2-setuptools
+	makedepends = python-sphinx
 	makedepends = gettext
+	source = subliminal::git+https://github.com/Diaoul/subliminal.git#branch=develop
+	source = sphinx-manpages.patch
+	md5sums = SKIP
+	md5sums = d63a79b506a7d4adea15112fe46f321b
+
+pkgname = python-subliminal-git
+	pkgdesc = Python library and CLI tool for searching and downloading subtitles. (python3 version)
+	install = python-subliminal-git.install
 	depends = python-beautifulsoup4>=4.2.0
 	depends = python-guessit>=0.9.1
+	depends = python-guessit<2.0
 	depends = python-requests>=2.0
 	depends = python-enzyme>=0.4.1
 	depends = python-dogpile.cache>=0.5.4
@@ -20,17 +31,37 @@ pkgbase = subliminal-git
 	depends = python-babelfish>=0.5.2
 	depends = python-chardet>=2.3.0
 	depends = python-stevedore>=1.0.0
+	optdepends = python-subliminal-git-docs: package manpages
+	provides = subliminal-git
 	provides = subliminal
-	provides = python-subliminal-git
 	conflicts = subliminal
-	conflicts = python-subliminal-git
-	source = subliminal::git+https://github.com/Diaoul/subliminal.git#branch=develop
-	md5sums = SKIP
+	replaces = subliminal-git
 
-pkgname = subliminal-git
+pkgname = python2-subliminal-git
+	pkgdesc = Python library and CLI tool for searching and downloading subtitles. (python2 version)
+	install = python2-subliminal-git.install
+	depends = python2-beautifulsoup4>=4.2.0
+	depends = python2-guessit>=0.9.1
+	depends = python2-guessit<2.0
+	depends = python2-requests>=2.0
+	depends = python2-enzyme>=0.4.1
+	depends = python2-dogpile.cache>=0.5.4
+	depends = python2-click>=4.0
+	depends = python2-pysrt>=1.0.1
+	depends = python2-six>=1.9.0
+	depends = python2-babelfish>=0.5.2
+	depends = python2-chardet>=2.3.0
+	depends = python2-stevedore>=1.0.0
+	optdepends = python-subliminal-git-docs: package manpages
+	provides = subliminal-git
+	provides = subliminal
+	conflicts = subliminal
 
 pkgname = nautilus-subliminal-git
 	pkgdesc = An extension for Nautilus to download subtitles.
 	depends = subliminal-git
-	depends = python-nautilus
+	depends = python2-nautilus
+
+pkgname = python-subliminal-git-docs
+	pkgdesc = Manpages for Subliminal.
 
diff --git a/PKGBUILD b/PKGBUILD
index 2f57335281a0..804a9bcbb048 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,57 +1,118 @@
 # Maintainer: Nikola Milinković <nikmil@gmail.com>
 # Contributor: Quentin Stievenart <quentin.stievenart@gmail.com>
 
-# Python version
-# Use 'python' for python3 or 'python2' for python2.
-_python=python
-
 _gitroot="https://github.com/Diaoul/subliminal"
 _gitname="subliminal"
-pkgname=('subliminal-git' 'nautilus-subliminal-git')
-pkgver=1.0.2.r733.769b16d
+pkgbase=subliminal-git
+pkgname=('python-subliminal-git' 'python2-subliminal-git'
+         'nautilus-subliminal-git'
+         'python-subliminal-git-docs')
+pkgver=1.1.0.r761.d62a09b
 pkgrel=1
 epoch=2
 pkgdesc="Python library and CLI tool for searching and downloading subtitles."
 arch=(any)
 url="https://github.com/Diaoul/subliminal"
 license=('MIT')
-makedepends=('git' "${_python}-setuptools" 'gettext')
-depends=(
-  "${_python}-beautifulsoup4>=4.2.0" "${_python}-guessit>=0.9.1"
-  "${_python}-requests>=2.0" "${_python}-enzyme>=0.4.1"
-  "${_python}-dogpile.cache>=0.5.4" "${_python}-click>=4.0"
-  "${_python}-pysrt>=1.0.1" "${_python}-six>=1.9.0"
-  "${_python}-babelfish>=0.5.2"
-  "${_python}-chardet>=2.3.0" "${_python}-stevedore>=1.0.0"
-)
-conflicts=('subliminal' 'python-subliminal-git')
-provides=('subliminal' 'python-subliminal-git')
-source=("${_gitname}::git+${_gitroot}.git#branch=develop")
-md5sums=('SKIP')
+makedepends=('git' 'python-setuptools' 'python2-setuptools'
+	     'python-sphinx' 'gettext')
+#checkdepends=('python2-sympy' 'python-sympy' 'python2-pytest' 'python-pytest'
+#	      'python2-mock')
+source=("${_gitname}::git+${_gitroot}.git#branch=develop"
+        'sphinx-manpages.patch')
+md5sums=('SKIP'
+         'd63a79b506a7d4adea15112fe46f321b')
 
 pkgver() {
   cd ${_gitname}
-  printf "1.0.2.r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
+  printf "1.1.0.r%s.%s" "$(git rev-list --count HEAD)" "$(git rev-parse --short HEAD)"
 }
 
-package_subliminal-git() {
+prepare() {
   cd ${srcdir}/${_gitname}
-  ${_python} setup.py install --root="${pkgdir}/" --optimize=1
+  patch -p1 -i ${srcdir}/sphinx-manpages.patch
+}
+
+#check() {
+#  cd ${srcdir}/${_gitname}
+#  python setup.py test
+#  python2 setup.py test
+#}
+
+package_python-subliminal-git() {
+  depends=(
+    'python-beautifulsoup4>=4.2.0' 'python-guessit>=0.9.1' 'python-guessit<2.0'
+    'python-requests>=2.0' 'python-enzyme>=0.4.1'
+    'python-dogpile.cache>=0.5.4' 'python-click>=4.0'
+    'python-pysrt>=1.0.1' 'python-six>=1.9.0'
+    'python-babelfish>=0.5.2'
+    'python-chardet>=2.3.0' 'python-stevedore>=1.0.0'
+  )
+  provides=('subliminal-git' 'subliminal')
+  conflicts=('subliminal')
+  replaces=('subliminal-git')
+  install=python-subliminal-git.install
+  pkgdesc="Python library and CLI tool for searching and downloading subtitles. (python3 version)"
+  optdepends=('python-subliminal-git-docs: package manpages')
 
-  install -v -m755 -d "${pkgdir}/usr/share/licenses/subliminal-git"
-  install -v -m644 ./LICENSE "${pkgdir}/usr/share/licenses/subliminal-git/"
+  cd ${srcdir}/${_gitname}
+  python3 setup.py install --root="${pkgdir}/" --optimize=1
+  mv "${pkgdir}"/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/"
+}
+
+package_python2-subliminal-git() {
+  depends=(
+    'python2-beautifulsoup4>=4.2.0' 'python2-guessit>=0.9.1' 'python2-guessit<2.0'
+    'python2-requests>=2.0' 'python2-enzyme>=0.4.1'
+    'python2-dogpile.cache>=0.5.4' 'python2-click>=4.0'
+    'python2-pysrt>=1.0.1' 'python2-six>=1.9.0'
+    'python2-babelfish>=0.5.2'
+    'python2-chardet>=2.3.0' 'python2-stevedore>=1.0.0'
+  )
+  provides=('subliminal-git' 'subliminal')
+  conflicts=('subliminal')
+  install=python2-subliminal-git.install
+  pkgdesc="Python library and CLI tool for searching and downloading subtitles. (python2 version)"
+  optdepends=('python-subliminal-git-docs: package manpages')
+  
+  cd ${srcdir}/${_gitname}
+  python2 setup.py install --root="${pkgdir}/" --optimize=1
+  mv "${pkgdir}"/usr/bin/subliminal "${pkgdir}"/usr/bin/subliminal2
+  install -v -m755 -d "${pkgdir}/usr/share/licenses/python2-subliminal-git"
+  install -v -m644 ./LICENSE "${pkgdir}/usr/share/licenses/python2-subliminal-git/"
 }
 
 package_nautilus-subliminal-git() {
   pkgdesc="An extension for Nautilus to download subtitles."
-  depends=('subliminal-git' "${_python}-nautilus")
+  depends=('subliminal-git' 'python2-nautilus')
 
   cd ${srcdir}/${_gitname}/examples
   install -v -m755 -d "${pkgdir}/usr/share/nautilus-python/extensions/subliminal/ui"
   install -v -m644 ./nautilus.py "${pkgdir}/usr/share/nautilus-python/extensions/subliminal-nautilus.py"
   install -v -m644 ./ui/{choose,config}.glade "${pkgdir}/usr/share/nautilus-python/extensions/subliminal/ui/"
-  install -v -m755 -d "${pkgdir}/usr/share/locale/fr/LC_MESSAGES"
+
+  mkdir -pv ${pkgdir}/usr/share/locale/{de,es,fr,it,pt_BR,pt,ru,tr}/LC_MESSAGES
+  msgfmt ./i18n/de.po -o "${pkgdir}/usr/share/locale/de/LC_MESSAGES/subliminal.mo"
+  msgfmt ./i18n/es.po -o "${pkgdir}/usr/share/locale/es/LC_MESSAGES/subliminal.mo"
   msgfmt ./i18n/fr.po -o "${pkgdir}/usr/share/locale/fr/LC_MESSAGES/subliminal.mo"
+  msgfmt ./i18n/it.po -o "${pkgdir}/usr/share/locale/it/LC_MESSAGES/subliminal.mo"
+  msgfmt ./i18n/pt_BR.po -o "${pkgdir}/usr/share/locale/pt_BR/LC_MESSAGES/subliminal.mo"
+  msgfmt ./i18n/pt.po -o "${pkgdir}/usr/share/locale/pt/LC_MESSAGES/subliminal.mo"
+  msgfmt ./i18n/ru.po -o "${pkgdir}/usr/share/locale/ru/LC_MESSAGES/subliminal.mo"
+  msgfmt ./i18n/tr.po -o "${pkgdir}/usr/share/locale/tr/LC_MESSAGES/subliminal.mo"
+  
   install -v -m755 -d "${pkgdir}/usr/share/licenses/nautilus-subliminal-git"
   install -v -m644 ../LICENSE "${pkgdir}/usr/share/licenses/nautilus-subliminal-git/"
 }
+
+package_python-subliminal-git-docs() {
+  pkgdesc="Manpages for Subliminal."
+
+  cd ${srcdir}/${_gitname}/docs
+  make man
+  install -v -m755 -d "${pkgdir}/usr/share/man/man1"
+  install -v -m644 ./_build/man/subliminal.1 "${pkgdir}/usr/share/man/man1/"
+}
diff --git a/python-subliminal-git.install b/python-subliminal-git.install
new file mode 100644
index 000000000000..c968c1c3c979
--- /dev/null
+++ b/python-subliminal-git.install
@@ -0,0 +1,9 @@
+post_install() {
+  ln -s subliminal3 /usr/bin/subliminal
+  echo "subliminal3 is now symlinked to /usr/bin/subliminal"
+}
+
+post_remove() {
+  echo "Removing symlinks..."
+  rm /usr/bin/subliminal
+}
\ No newline at end of file
diff --git a/python2-subliminal-git.install b/python2-subliminal-git.install
new file mode 100644
index 000000000000..572609f6181c
--- /dev/null
+++ b/python2-subliminal-git.install
@@ -0,0 +1,9 @@
+post_install() {
+  ln -s subliminal2 /usr/bin/subliminal
+  echo "subliminal2 is now symlinked to /usr/bin/subliminal"
+}
+
+post_remove() {
+  echo "Removing symlinks..."
+  rm /usr/bin/subliminal
+}
\ No newline at end of file
diff --git a/sphinx-manpages.patch b/sphinx-manpages.patch
new file mode 100644
index 000000000000..6e1052cc1afb
--- /dev/null
+++ b/sphinx-manpages.patch
@@ -0,0 +1,12 @@
+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