3 files changed, 47 insertions, 30 deletions
diff --git a/abs/core/python_modules/python-yaml/PKGBUILD b/abs/core/python_modules/python-yaml/PKGBUILD
index f0fd7e6..7b6026d 100644
--- a/abs/core/python_modules/python-yaml/PKGBUILD
+++ b/abs/core/python_modules/python-yaml/PKGBUILD
@@ -1,36 +1,61 @@
-# $Id$
 # Maintainer: Sergej Pupykin <pupykin.s+arch@gmail.com>
+# Maintainer: Levente Polyak <anthraxx[at]archlinux[dot]org>
 # Contributor: Michal Bozon <michal.bozon__at__gmail.com>
 
 pkgbase=python-yaml
-pkgname=(python2-yaml)
-pkgver=3.11
-pkgrel=1
-pkgdesc="Python bindings for YAML, using fast libYAML library"
-arch=('i686' 'x86_64')
-url="http://pyyaml.org"
+pkgname=(python-yaml python2-yaml)
+pkgver=3.12
+pkgrel=3
+pkgdesc='Python bindings for YAML, using fast libYAML library'
+url='http://pyyaml.org/wiki/PyYAML'
+arch=('x86_64')
 license=('MIT')
-makedepends=('python2' 'libyaml')
-install='python-yaml.install'
-source=(http://pyyaml.org/download/pyyaml/PyYAML-$pkgver.tar.gz)
-md5sums=('f50e08ef0fe55178479d3a618efe21db')
+makedepends=('python' 'python2' 'libyaml')
+source=(http://pyyaml.org/download/pyyaml/PyYAML-${pkgver}.tar.gz)
+sha512sums=('e16d8b7f4f026b6a95b11fb59c54ec5f114f6f516294eaa95e718abdf5d37c17a9c4b5e0a0a61fca04e801792d9b7fb801087cf849ff22b9581f6af204b1883a')
+
+prepare() {
+  cp -a PyYAML-${pkgver}{,-py2}
+}
 
 build() {
-  true
+  msg2 "Building python..."
+  (cd PyYAML-${pkgver}
+    python setup.py --with-libyaml build
+  )
+  msg2 "Building python2..."
+  (cd PyYAML-${pkgver}-py2
+    python2 setup.py --with-libyaml build
+  )
+}
+
+check() {
+  msg2 "Checking python..."
+  (cd PyYAML-${pkgver}
+    python setup.py test
+  )
+  msg2 "Checking python2..."
+  (cd PyYAML-${pkgver}-py2
+    python2 setup.py test
+  )
+}
+
+package_python-yaml() {
+  depends=('python' 'libyaml')
+
+  cd PyYAML-${pkgver}
+  python setup.py  --with-libyaml install --prefix=/usr --root="${pkgdir}" -O1 --skip-build
+  install -Dm 644 LICENSE -t "${pkgdir}"/usr/share/licenses/${pkgname}
+  install -Dm 644 CHANGES README -t "${pkgdir}"/usr/share/doc/${pkgname}
 }
 
 package_python2-yaml() {
   depends=('python2' 'libyaml')
 
-  cd $srcdir/PyYAML-$pkgver
-  python2 setup.py install --prefix=/usr --root=$pkgdir
-  install -m644 -D LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE
+  cd PyYAML-${pkgver}-py2
+  python2 setup.py --with-libyaml install --prefix=/usr --root="${pkgdir}" -O1 --skip-build
+  install -Dm 644 LICENSE -t "${pkgdir}"/usr/share/licenses/${pkgname}
+  install -Dm 644 CHANGES README -t "${pkgdir}"/usr/share/doc/${pkgname}
 }
 
-#package_python-yaml() {
-#  depends=('python' 'libyaml')
-
-#  cd $srcdir/PyYAML-$pkgver
-#  python setup.py install --prefix=/usr --root=$pkgdir
-#  install -m644 -D LICENSE $pkgdir/usr/share/licenses/$pkgname/LICENSE
-#}
+# vim: ts=2 sw=2 et:
diff --git a/abs/core/python_modules/python-yaml/__changelog b/abs/core/python_modules/python-yaml/__changelog
deleted file mode 100644
index 488d3cf..0000000
--- a/abs/core/python_modules/python-yaml/__changelog
+++ /dev/null
@@ -1 +0,0 @@
-PKGBUILD: rm py 3 stuff
diff --git a/abs/core/python_modules/python-yaml/python-yaml.install b/abs/core/python_modules/python-yaml/python-yaml.install
deleted file mode 100644
index e2ae067..0000000
--- a/abs/core/python_modules/python-yaml/python-yaml.install
+++ /dev/null
@@ -1,7 +0,0 @@
-post_install() {
-  cat << EOT
-==> Note that even though this package uses libyaml library,
-==> slower pure python implementation is used by default.
-==> See http://pyyaml.org/wiki/PyYAMLDocumentation
-EOT
-}