Revert "Making the split package"

This reverts commit 8bfd16da546c9f5bf371aa626c76281f0062693f.

2 files changed, 9 insertions, 42 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 252240ccc286..52f1429df93e 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,26 +1,18 @@
 # Generated by mksrcinfo v8
-# Sat Aug 13 12:23:46 UTC 2016
+# Sat Aug 13 10:19:26 UTC 2016
 pkgbase = python-djvulibre
 	pkgdesc = A set of Python bindings for the DjVuLibre library
 	pkgver = 0.8
-	pkgrel = 3
+	pkgrel = 2
 	url = http://jwilk.net/software/python-djvulibre
 	arch = i686
 	arch = x86_64
 	license = GPL2
-	makedepends = python-setuptools
-	makedepends = python2-setuptools
+	makedepends = cython
 	depends = djvulibre
+	depends = python
 	source = https://pypi.io/packages/source/p/python-djvulibre/python-djvulibre-0.8.tar.gz
 	sha256sums = 9d6bf3143fa540e8ce330949c9edff7847ad7cd715f7c02e2991212873a5f31b
 
 pkgname = python-djvulibre
-	pkgdesc = A set of Python bindings for the DjVuLibre library 3
-	depends = python
-	depends = cython
-
-pkgname = python2-djvulibre
-	pkgdesc = A set of Python bindings for the DjVuLibre library 2
-	depends = python2
-	depends = cython2
 
diff --git a/PKGBUILD b/PKGBUILD
index 31fa06be1dbe..8ca4dc4c59bb 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,50 +2,25 @@
 # Contributor: Francois Garillot <francois[@]garillot.net>
 # Contributor: Anton Bazhenov <anton.bazhenov at gmail>
 # Contributor: Malkov Fyodor aka krox <iksut@yandex.ru>
-# Contributor: carstene1ns <arch carsten-teibes de>
 
-pkgbase=python-djvulibre
-pkgname=(python-djvulibre python2-djvulibre)
+pkgname=python-djvulibre
 pkgver=0.8
-pkgrel=3
+pkgrel=2
 pkgdesc="A set of Python bindings for the DjVuLibre library"
 arch=('i686' 'x86_64')
 url="http://jwilk.net/software/python-djvulibre"
 license=('GPL2')
-depends=('djvulibre')
-makedepends=('python-setuptools' 'python2-setuptools')
+depends=('djvulibre' 'python')
+makedepends=('cython')
 source=("https://pypi.io/packages/source/p/${pkgname}/${pkgname}-${pkgver}.tar.gz")
 sha256sums=('9d6bf3143fa540e8ce330949c9edff7847ad7cd715f7c02e2991212873a5f31b')
 
-prepare(){
-	cp -rup ${pkgbase}-${pkgver} python2-djvulibre-${pkgver}
-
-	cd "${srcdir}/python2-djvulibre-${pkgver}"
-	sed -i "s/'python'/'python2'/" setup.py
-}
-
 build() {
-  # build for python 3
   cd "${srcdir}/${pkgname}-${pkgver}"
   python setup.py build
-
-  # build for python 2
-  cd "../python2-djvulibre-${pkgver}"
-  python2 setup.py build
 }
 
-# package for python 3
-package_python-djvulibre() {
-  depends=('python' 'cython')
-  pkgdesc+=" 3"
+package() {
   cd "${srcdir}/${pkgname}-${pkgver}"
   python setup.py install --root="${pkgdir}"
 }
-
-# package for python 2
-package_python2-djvulibre() {
-  depends=('python2' 'cython2')
-  pkgdesc+=" 2"
-  cd "${srcdir}/python2-djvulibre-${pkgver}"
-  python setup.py install --root="${pkgdir}"
-}