Split packages into two independent packages

* Prevents unnecessary check, and make/check dependencies
* Also split build into a separate section
* No need for version bump
* Other minor cleanups

2 files changed, 13 insertions, 25 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 65c0a77bf5ee..523b46cfa9c0 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -6,21 +6,13 @@ pkgbase = python-vdf
 	arch = any
 	license = MIT
 	checkdepends = python
-	checkdepends = python2
 	checkdepends = python-nose
 	checkdepends = python-coverage
 	checkdepends = python-mock
-	checkdepends = python2-nose
-	checkdepends = python2-coverage
-	checkdepends = python2-mock
 	makedepends = python-setuptools
-	makedepends = python2-setuptools
+	depends = python
 	source = python-vdf-3.2.tar.gz::https://github.com/ValvePython/vdf/archive/v3.2.tar.gz
 	sha256sums = ad790a34a20d9c5f36b8bd9e93658f85a9e90be7c84bb3a24f893b531a94e3ca
 
 pkgname = python-vdf
-	depends = python
-
-pkgname = python2-vdf
-	depends = python2
 
diff --git a/PKGBUILD b/PKGBUILD
index b77399809e74..4d1a52d27147 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -3,35 +3,31 @@
 # Contributor: Ivan Semkin (ivan at semkin dot ru)
 
 _pkgname=vdf
-pkgname=(python-vdf python2-vdf)
+pkgname=(python-vdf)
 pkgver=3.2
 pkgrel=1
 pkgdesc="Library for working with Valve's VDF text format"
 arch=('any')
 url='https://github.com/ValvePython/vdf'
 license=('MIT')
-depends=()
-makedepends=(python-setuptools python2-setuptools)
-checkdepends=(python python2 python-nose python-coverage python-mock python2-nose python2-coverage python2-mock)
+depends=(python)
+makedepends=(python-setuptools)
+checkdepends=(python python-nose python-coverage python-mock)
 source=("$pkgname-$pkgver.tar.gz::https://github.com/ValvePython/vdf/archive/v$pkgver.tar.gz")
 sha256sums=('ad790a34a20d9c5f36b8bd9e93658f85a9e90be7c84bb3a24f893b531a94e3ca')
 
+build() {
+  cd "$_pkgname-$pkgver"
+  python setup.py build
+}
+
 check() {
-  cd "$srcdir/$_pkgname-$pkgver"
+  cd "$_pkgname-$pkgver"
   python setup.py test
-  python2 setup.py test
 }
 
-package_python-vdf() {
-  depends=(python)
-  cd "$srcdir/$_pkgname-$pkgver"
+package() {
+  cd "$_pkgname-$pkgver"
   python setup.py install --optimize=1 --root="${pkgdir}/"
   install -D -m644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 }
-
-package_python2-vdf() {
-  depends=(python2)
-  cd "$srcdir/$_pkgname-$pkgver"
-  python2 setup.py install --optimize=1 --root="${pkgdir}/"
-  install -D -m644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
-}