Split into Python2 and Python3 packages. Fixed version numbering.

2 files changed, 60 insertions, 25 deletions

diff --git a/.SRCINFO b/.SRCINFO
index a6136f9d7b2d..13fae7e36a9f 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,28 +1,42 @@
 pkgbase = subliminal-git
-	pkgdesc = Search and download subtitles.
-	pkgver = 1.0.1
+	pkgdesc = Python library and CLI tool for searching and downloading subtitles.
+	pkgver = 1.0.1.692.e0788be
 	pkgrel = 1
 	epoch = 1
 	url = https://github.com/Diaoul/subliminal
 	arch = any
 	license = MIT
 	makedepends = python2-setuptools
+	makedepends = python-setuptools
+	conflicts = subliminal
+	source = subliminal::git+https://github.com/Diaoul/subliminal.git
+	md5sums = SKIP
+
+pkgname = python-subliminal-git
+	depends = python-beautifulsoup4>=4.2.0
+	depends = python-guessit>=0.9.1
+	depends = python-requests>=2.0
+	depends = python-enzyme>=0.4.1
+	depends = python-dogpile.cache>=0.5.4
+	depends = python-click>=4.0
+	depends = python-pysrt>=1.0.1
+	depends = python-six>=1.9.0
+	depends = python-babelfish>=0.5.2
+	depends = python-chardet>=2.3.0
+	depends = python-stevedore>=1.0.0
+	provides = subliminal-git
+	replaces = subliminal-git
+
+pkgname = python2-subliminal-git
 	depends = python2-beautifulsoup4>=4.2.0
 	depends = python2-guessit>=0.9.1
 	depends = python2-requests>=2.0
 	depends = python2-enzyme>=0.4.1
-	depends = python2-dogpile-cache>=0.5.4
+	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-dogpile-core
 	depends = python2-chardet>=2.3.0
 	depends = python2-stevedore>=1.0.0
-	depends = python2-dateutil>=2.1
-	conflicts = subliminal
-	source = subliminal::git+https://github.com/Diaoul/subliminal.git
-	md5sums = SKIP
-
-pkgname = subliminal-git
 
diff --git a/PKGBUILD b/PKGBUILD
index eecfbef45ea8..792567f5dd3a 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,34 +1,55 @@
 # Maintainer: Nikola Milinković <nikmil@gmail.com>
-# Submitter: Quentin Stievenart <quentin.stievenart@gmail.com>
+# Contributor: Quentin Stievenart <quentin.stievenart@gmail.com>
 
 _gitroot="https://github.com/Diaoul/subliminal"
 _gitname="subliminal"
-pkgname=${_gitname}-git
-pkgver=1.0.1
+pkgbase=subliminal-git
+pkgname=('python-subliminal-git' 'python2-subliminal-git')
+pkgver=1.0.1.692.e0788be
 pkgrel=1
 epoch=1
-pkgdesc="Search and download subtitles."
+pkgdesc="Python library and CLI tool for searching and downloading subtitles."
 arch=(any)
 url="https://github.com/Diaoul/subliminal"
 license=(MIT)
-depends=('python2-beautifulsoup4>=4.2.0' 'python2-guessit>=0.9.1'
-	 '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-dogpile-core'
-	 'python2-chardet>=2.3.0' 'python2-stevedore>=1.0.0'
-	 'python2-dateutil>=2.1')
-makedepends=('python2-setuptools')
-conflicts=(${_gitname})
+makedepends=('python2-setuptools' 'python-setuptools')
+conflicts=(subliminal)
 source=("${_gitname}::git+${_gitroot}.git")
 md5sums=('SKIP')
 
 pkgver() {
   cd ${_gitname}
-  git describe --tags | sed -r 's/^v//;s/([^-]*-g)/r\1/;s/-/./g'
+  echo 1.0.1.$(git rev-list --count HEAD).$(git rev-parse --short HEAD)
+  #git describe --tags | sed -r 's/^v//;s/([^-]*-g)/r\1/;s/-/./g'
 }
 
-package() {
+package_python-subliminal-git() {
+  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'
+  )
+  provides=(subliminal-git)
+  replaces=(subliminal-git)
+  cd ${srcdir}/${_gitname}
+  python3 setup.py install --root="${pkgdir}/" --optimize=1
+  mv "${pkgdir}"/usr/bin/subliminal "${pkgdir}"/usr/bin/subliminal3
+  ln -s "${pkgdir}"/usr/bin/subliminal3 "${pkgdir}"/usr/bin/subliminal
+}
+
+package_python2-subliminal-git() {
+  depends=(
+    'python2-beautifulsoup4>=4.2.0' 'python2-guessit>=0.9.1'
+    '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'
+  )
   cd ${srcdir}/${_gitname}
   python2 setup.py install --root="${pkgdir}/" --optimize=1
+  mv "${pkgdir}"/usr/bin/subliminal "${pkgdir}"/usr/bin/subliminal2
 }