Update package with changes to upstream

* No longer supports Python 2
* CHANGES.rst has been renamed to CHANGELOG.rst

2 files changed, 6 insertions, 24 deletions

diff --git a/.SRCINFO b/.SRCINFO
index f29381fa20c1..9ca37373bb08 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = python-uritools-git
 	pkgdesc = RFC 3986 compliant, Unicode-aware, scheme-agnostic replacement for urlparse
-	pkgver = 0.11.0.r0.g7816d9b
+	pkgver = 4.0.0.r0.g0f20688
 	pkgrel = 1
 	url = https://github.com/tkem/uritools
 	arch = any
@@ -13,9 +13,3 @@ pkgbase = python-uritools-git
 	md5sums = SKIP
 
 pkgname = python-uritools-git
-
-pkgname = python2-uritools-git
-	depends = python2
-	depends = python2-ipaddress
-	provides = python2-uritools
-
diff --git a/PKGBUILD b/PKGBUILD
index 6a0be78f0e00..438741bd3707 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,8 +1,8 @@
 # Maintainer: Frederik "Freso" S. Olesen <freso.dk@gmail.com>
 
 _pkgname=uritools
-pkgname=("python-${_pkgname}-git" "python2-${_pkgname}-git")
-pkgver=0.11.0.r0.g7816d9b
+pkgname="python-${_pkgname}-git"
+pkgver=4.0.0.r0.g0f20688
 pkgrel=1
 pkgdesc='RFC 3986 compliant, Unicode-aware, scheme-agnostic replacement for urlparse'
 arch=('any')
@@ -11,7 +11,7 @@ license=('MIT')
 depends=('python')
 makedepends=('git')
 provides=("python-${_pkgname}")
-conflicts=$provides
+conflicts=("python-${_pkgname}")
 source=("git+${url}.git")
 md5sums=('SKIP')
 
@@ -25,24 +25,12 @@ check() {
   python setup.py test
 }
 
-package_python-uritools-git() {
+package() {
   cd "$srcdir/$_pkgname"
   python setup.py install --root="$pkgdir/" --optimize=1
   install -d "$pkgdir/usr/share/doc/python-${_pkgname}/"
-  install -pm644 CHANGES.rst README.rst "$pkgdir/usr/share/doc/python-${_pkgname}/"
+  install -pm644 CHANGELOG.rst README.rst "$pkgdir/usr/share/doc/python-${_pkgname}/"
   install -Dpm644 LICENSE "$pkgdir/usr/share/licenses/python-${_pkgname}/LICENSE"
 }
 
-package_python2-uritools-git() {
-  depends=('python2' 'python2-ipaddress')
-  provides=("python2-${_pkgname}")
-  conflicts=$provides
-
-  cd "$srcdir/$_pkgname"
-  python2 setup.py install --root="$pkgdir/" --optimize=1
-  install -d "$pkgdir/usr/share/doc/python2-${_pkgname}/"
-  install -pm644 CHANGES.rst README.rst "$pkgdir/usr/share/doc/python2-${_pkgname}/"
-  install -Dpm644 LICENSE "$pkgdir/usr/share/licenses/python2-${_pkgname}/LICENSE"
-}
-
 # vim:set ts=2 sw=2 et: