git » python-html5lib.git » commit 79881dd

diff --git a/PKGBUILD b/PKGBUILD
index 0622e10..99ea71e 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,21 +1,24 @@
-# Maintainer: Eli Schwartz <eschwartz@archlinux.org>
 # Maintainer: Jelle van der Waa <jelle@archlinux.org>
+# Contributor: Eli Schwartz <eschwartz@archlinux.org>
 # Contributor: Daniel J Griffiths <ghost1227@archlinux.us>
 # Contributor: Erol V. Aktay <e.aktay@gmail.com>
 
-pkgbase=python-html5lib
-pkgname=('python2-html5lib' 'python-html5lib')
+pkgname=python-html5lib
 pkgver=1.1
-pkgrel=8
+pkgrel=9
 arch=('any')
 url="https://github.com/html5lib"
 license=('MIT')
+pkgdesc="A Python HTML parser/tokenizer based on the WHATWG HTML5 spec"
 _deps=('six' 'webencodings')
-makedepends=('python-setuptools' 'python2-setuptools' "${_deps[@]/#/python-}" "${_deps[@]/#/python2-}")
+depends=("${_deps[@]/#/python-}")
+makedepends=('python-setuptools' "${_deps[@]/#/python-}")
 _checkdeps=('pytest' 'pytest-expect' 'mock')
 checkdepends=("${_checkdeps[@]/#/python-}" 'python-lxml')
+optdepends=('python-lxml: lxml treebuilder'
+            'python-genshi: genshi treewalker')
 _test_commit=71eebd59772d1d39aced0c0582ae9c09acf3ce6e
-source=("$pkgbase-$pkgver.tar.gz::https://github.com/html5lib/html5lib-python/archive/${pkgver}.tar.gz"
+source=("$pkgname-$pkgver.tar.gz::https://github.com/html5lib/html5lib-python/archive/${pkgver}.tar.gz"
         "https://github.com/html5lib/html5lib-python/commit/2c19b9899ab3a3e8bd0ca35e5d78544334204169.patch"
         "https://github.com/html5lib/html5lib-tests/archive/${_test_commit}.tar.gz")
 sha256sums=('66e9e24a53c10c27abb6be8a3cf2cf55824c6ea1cef8570a633cb223ec46e894'
@@ -36,7 +39,6 @@ build() {
     cd "${srcdir}"/html5lib-python-${pkgver}
 
     python setup.py build
-    python2 setup.py build
 }
 
 check() {
@@ -45,22 +47,9 @@ check() {
     py.test
 }
 
-package_python-html5lib() {
-    pkgdesc="A Python HTML parser/tokenizer based on the WHATWG HTML5 spec"
-    depends=("${_deps[@]/#/python-}")
-    optdepends=('python-lxml: lxml treebuilder'
-                'python-genshi: genshi treewalker')
+package() {
     cd "${srcdir}"/html5lib-python-${pkgver}
 
     python setup.py install --root="${pkgdir}" --optimize=1 --skip-build
     install -Dm644 LICENSE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
 }
-
-package_python2-html5lib() {
-    pkgdesc="A Python2 HTML parser/tokenizer based on the WHATWG HTML5 spec"
-    depends=("${_deps[@]/#/python2-}")
-    cd "${srcdir}"/html5lib-python-${pkgver}
-
-    python2 setup.py install --root="${pkgdir}" --optimize=1 --skip-build
-    install -Dm644 LICENSE "${pkgdir}"/usr/share/licenses/${pkgname}/LICENSE
-}