Add v1.1.0-7

The release number keeps the community repository sequence, and the
package used to install the script as "unit2" while it was there, so
this approach was kept

Former maintainers both from AUR and the community repository were
included in the PKGBUILD as contributors

4 files changed, 41 insertions, 58 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 35757235b6c3..321f4d173468 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,23 +1,16 @@
 pkgbase = python2-unittest2
-	pkgdesc = The new features in unittest for Python 2.7 backported to Python 2.3+.
-	pkgver = 0.5.1
-	pkgrel = 3
+	pkgdesc = Backports of the unittest module
+	pkgver = 1.1.0
+	pkgrel = 7
 	url = http://www.voidspace.org.uk/python/articles/unittest2.shtml
-	install = python2-unittest2.install
-	changelog = Changelog
 	arch = any
 	license = BSD
-	makedepends = python2-distribute
-	depends = python2
-	source = http://pypi.python.org/packages/source/u/unittest2/unittest2-0.5.1.tar.gz
+	makedepends = python2-setuptools
+	depends = python2-six
+	depends = python2-traceback2
+	source = https://pypi.python.org/packages/source/u/unittest2/unittest2-1.1.0.tar.gz
 	source = LICENSE
-	source = python2-unittest2.install
-	md5sums = a0af5cac92bbbfa0c3b0e99571390e0f
-	md5sums = 0c162ecb7937c6a146e5b0457f0ccf1e
-	md5sums = 322c77e5e303e5d4a35a6f7e7297538f
-	sha256sums = aa5de8cdf654d843379c97bd1ee240e86356d3355a97b147a6f3f4d149247a71
+	sha256sums = 22882a0e418c284e1f718a822b3b022944d53d2d908e1690b319a9d3eb2c0579
 	sha256sums = e0bfff5f29a59d078142b8b24b60b0105043057b9e238974d26ae778804ba9bc
-	sha256sums = 653310fa1e9d8224ee819944584f5b8a90e0ba92e84f8dbd37537bb6814729ae
 
 pkgname = python2-unittest2
-
diff --git a/Changelog b/Changelog
deleted file mode 100644
index 954a8f021615..000000000000
--- a/Changelog
+++ /dev/null
@@ -1,11 +0,0 @@
-2013-04-22 Aaron DeVore <aaron.devore@gmail.com> (0.5.1-3)
-- Fix break with new version of makepkg/pacman
-- Remove sha256sums
-2011-03-18 Aaron DeVore <aaron.devore@gmail.com>
-- Add sha256sums
-- Add python2-distribute to makedepends
-- Add post install warning: Runner executable is unit2-2, not unit2.
-- To avoid conflict with python-unittest2:
-    - move /usr/bin/unit2 -> /usr/bin/unit2-2
-    - move /usr/bin/unit2.py -> /usr/bin/unit2-2.py
-    (Remove when upstream adds a unit2-2 symlink)
diff --git a/PKGBUILD b/PKGBUILD
index 12aa39d54124..7bdd22a4813b 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,37 +1,43 @@
-# Maintainer: Aaron DeVore <aaron.devore@gmail.com>
-
+# Maintainer: Danilo J. S. Bellini <danilo dot bellini at gmail dot com>
+# Contributor: Levente Polyak <anthraxx[at]archlinux[dot]org>
+# Contributor: Carl George < arch at cgtx dot us >
+# Contributor: Aaron DeVore <aaron.devore@gmail.com>
 pkgname=python2-unittest2
-pkgver=0.5.1
-pkgrel=3
-pkgdesc="The new features in unittest for Python 2.7 backported to Python 2.3+."
+_name="${pkgname#python2-}"
+pkgver=1.1.0
+pkgrel=7
+pkgdesc='Backports of the unittest module'
 arch=('any')
 url="http://www.voidspace.org.uk/python/articles/unittest2.shtml"
-license=("BSD")
-depends=("python2")
-makedepends=("python2-distribute")
-changelog=Changelog
-install="python2-unittest2.install"
-source=(http://pypi.python.org/packages/source/u/unittest2/unittest2-$pkgver.tar.gz
-        LICENSE
-        python2-unittest2.install)
-md5sums=('a0af5cac92bbbfa0c3b0e99571390e0f'
-         '0c162ecb7937c6a146e5b0457f0ccf1e'
-         '322c77e5e303e5d4a35a6f7e7297538f')
-sha256sums=('aa5de8cdf654d843379c97bd1ee240e86356d3355a97b147a6f3f4d149247a71'
-            'e0bfff5f29a59d078142b8b24b60b0105043057b9e238974d26ae778804ba9bc'
-            '653310fa1e9d8224ee819944584f5b8a90e0ba92e84f8dbd37537bb6814729ae')
+license=('BSD')
+depends=('python2-six' 'python2-traceback2')
+makedepends=('python2-setuptools')
+_pypi='https://pypi.python.org'
+source=("$_pypi/packages/source/${_name::1}/$_name/$_name-$pkgver.tar.gz"
+        'LICENSE')
+sha256sums=('22882a0e418c284e1f718a822b3b022944d53d2d908e1690b319a9d3eb2c0579'
+            'e0bfff5f29a59d078142b8b24b60b0105043057b9e238974d26ae778804ba9bc')
+
+prepare() {
+  cd "$srcdir/$_name-$pkgver"
+
+  # Remove "argparse" dependency (it's actually a standard library)
+  sed -ri 's-.argparse.(,|\s)*--' setup.py
+}
 
 build() {
-  cd "$srcdir/unittest2-$pkgver"
+  cd "$srcdir/$_name-$pkgver"
   python2 setup.py build
 }
 
+check() {
+  cd "$srcdir/$_name-$pkgver"
+  python2 -m unittest2
+}
+
 package() {
-  cd "$srcdir/unittest2-$pkgver"
-  python2 setup.py install "--root=$pkgdir" --optimize=1
-  # Leave /usr/bin/unit2 for unittest2 for Python 3
-  # Switch to full removal when upstream adds /usr/bin/unit2-2[.py]
-  mv "$pkgdir/usr/bin/unit2" "$pkgdir/usr/bin/unit2-2"
-  mv "$pkgdir/usr/bin/unit2.py" "$pkgdir/usr/bin/unit2-2.py"
-  install -Dm644 "$srcdir/LICENSE" "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+  cd "$srcdir/$_name-$pkgver"
+  python2 setup.py install --root="$pkgdir" --optimize=1 --skip-build
+  install -Dm644 ../LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE.txt"
+  install -Dm644 README.txt "$pkgdir/usr/share/doc/$pkgname/README.txt"
 }
diff --git a/python2-unittest2.install b/python2-unittest2.install
deleted file mode 100644
index a1d0f95a7b1e..000000000000
--- a/python2-unittest2.install
+++ /dev/null
@@ -1,5 +0,0 @@
-post_install() {
-   echo "note: the unittest2 Python 2 executable is named unit2-2, not unit2"
-}
-
-# vim:set ts=2 sw=2 et: