package cleanup

3 files changed, 50 insertions, 50 deletions

diff --git a/.SRCINFO b/.SRCINFO
index ab0ff0275525..6d577c198304 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,15 +1,16 @@
 pkgbase = python-iptools
 	pkgdesc = Collection of utilities for dealing with IP addresses
 	pkgver = 0.7.0
-	pkgrel = 1
-	url = http://python-iptools.readthedocs.org/
+	pkgrel = 2
+	url = https://python-iptools.readthedocs.org/
 	arch = any
 	license = BSD
+	checkdepends = python-nose
+	checkdepends = python2-nose
 	makedepends = python-setuptools
+	makedepends = python-sphinx
 	makedepends = python2-setuptools
-	source = LICENSE
-	source = https://github.com/bd808/python-iptools/archive/v0.7.0.tar.gz
-	sha256sums = c85e8d34884219ec4ac360f28983b015953ec34b1c6d91e6afbb8b421626ea9e
+	source = python-iptools-0.7.0.tar.gz::https://github.com/bd808/python-iptools/archive/v0.7.0.tar.gz
 	sha256sums = 5ea59c0867e72d8243305ff1297fc5b2d8feaca650369a29985453ce4f39ca97
 
 pkgname = python-iptools
@@ -17,4 +18,3 @@ pkgname = python-iptools
 
 pkgname = python2-iptools
 	depends = python2
-
diff --git a/LICENSE b/LICENSE
deleted file mode 100644
index deaf0fb4a27b..000000000000
--- a/LICENSE
+++ /dev/null
@@ -1,23 +0,0 @@
-Copyright (c) 2008-2014, Bryan Davis and iptools contributors
-All rights reserved.
-
-Redistribution and use in source and binary forms, with or without
-modification, are permitted provided that the following conditions are met:
-
-  a. Redistributions of source code must retain the above copyright notice,
-     this list of conditions and the following disclaimer.
-
-  b. Redistributions in binary form must reproduce the above copyright
-     notice, this list of conditions and the following disclaimer in the
-     documentation and/or other materials provided with the distribution.
-
-THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE
-FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/PKGBUILD b/PKGBUILD
index adf73593d75f..8f5d64972ce0 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,34 +1,57 @@
-# Maintainer: shieldwed <shieldwed [at] outlook [dot] com>
+# Maintainer: Luis Martinez <luis dot martinez at disroot dot org>
+# Contributor: shieldwed <shieldwed [at] outlook [dot] com>
 
 pkgbase=python-iptools
 pkgname=(python-iptools python2-iptools)
 pkgver=0.7.0
-pkgrel=1
+pkgrel=2
 pkgdesc="Collection of utilities for dealing with IP addresses"
-url="http://python-iptools.readthedocs.org/"
+url="https://python-iptools.readthedocs.org/"
 license=('BSD')
 arch=('any')
-makedepends=(
-  'python-setuptools'
-  'python2-setuptools'
-  )
-source=(
-  "LICENSE"
-  "https://github.com/bd808/$pkgbase/archive/v$pkgver.tar.gz"
-  )
-sha256sums=('c85e8d34884219ec4ac360f28983b015953ec34b1c6d91e6afbb8b421626ea9e'
-            '5ea59c0867e72d8243305ff1297fc5b2d8feaca650369a29985453ce4f39ca97')
+makedepends=('python-setuptools' 'python-sphinx' 'python2-setuptools')
+checkdepends=('python-nose' 'python2-nose')
+source=("$pkgbase-$pkgver.tar.gz::https://github.com/bd808/$pkgbase/archive/v$pkgver.tar.gz")
+sha256sums=('5ea59c0867e72d8243305ff1297fc5b2d8feaca650369a29985453ce4f39ca97')
+
+prepare() {
+	cp -a "$pkgbase-$pkgver" "$pkgbase-$pkgver-py2"
+}
+
+build() {
+	pushd "$pkgbase-$pkgver"
+	python setup.py build
+	cd docs
+	make man BUILDDIR="$srcdir"
+	popd
+
+	pushd "$pkgbase-$pkgver-py2"
+	python2 setup.py build
+}
+
+check() {
+	pushd "$pkgbase-$pkgver"
+	nosetests
+	popd
+
+	pushd "$pkgbase-$pkgver-py2"
+	nosetests2
+}
 
 package_python-iptools() {
-  depends=('python')
-  install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-  cd "$srcdir/$pkgbase-$pkgver"
-  python setup.py install "--root=$pkgdir" --optimize=1
+	depends=('python')
+
+	install -Dm 644 man/iptools.1 -t "$pkgdir/usr/share/man/man1/"
+	cd "$pkgbase-$pkgver"
+	PYTHONHASHSEED=0 python setup.py install --root="$pkgdir/" --optimize=1 --skip-build
+	install -Dm 644 LICENSE -t "$pkgdir/usr/share/licenses/$pkgname/"
 }
 
 package_python2-iptools() {
-  depends=('python2')
-  install -D -m644 LICENSE "${pkgdir}/usr/share/licenses/${pkgname}/LICENSE"
-  cd "$srcdir/$pkgbase-$pkgver"
-  python2 setup.py install "--root=$pkgdir" --optimize=1
+	depends=('python2')
+
+	install -Dm 644 man/iptools.1 "$pkgdir/usr/share/man/man1/iptools.py2.1"
+	cd "$srcdir/$pkgbase-$pkgver"
+	PYTHONHASHSEED=0 python2 setup.py install --root="$pkgdir/" --optimize=1 --skip-build
+	install -Dm 644 LICENSE -t "$pkgdir/usr/share/licenses/$pkgname/"
 }