[arch-commits] Commit in python-yaml/trunk (PKGBUILD python-yaml.install)

[Levente Polyak]

    Date: Thursday, September 28, 2017 @ 00:57:32
  Author: anthraxx
Revision: 260723

upgpkg: python-yaml 3.12-3 (adding tests, readme and relro)

- ensure libyaml is used by enforcing it
- adding -O1

Modified:
  python-yaml/trunk/PKGBUILD
Deleted:
  python-yaml/trunk/python-yaml.install

---------------------+
 PKGBUILD            |   61 +++++++++++++++++++++++++++++++++++---------------
 python-yaml.install |    7 -----
 2 files changed, 43 insertions(+), 25 deletions(-)

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2017-09-27 20:47:35 UTC (rev 260722)
+++ PKGBUILD	2017-09-28 00:57:32 UTC (rev 260723)
@@ -1,36 +1,61 @@
-# $Id$
 # Maintainer: Sergej Pupykin <pupykin.s+arch at gmail.com>
+# Maintainer: Levente Polyak <anthraxx[at]archlinux[dot]org>
 # Contributor: Michal Bozon <michal.bozon__at__gmail.com>
 
 pkgbase=python-yaml
-pkgname=(python2-yaml python-yaml)
+pkgname=(python-yaml python2-yaml)
 pkgver=3.12
-pkgrel=2
-pkgdesc="Python bindings for YAML, using fast libYAML library"
+pkgrel=3
+pkgdesc='Python bindings for YAML, using fast libYAML library'
+url='http://pyyaml.org/wiki/PyYAML'
 arch=('i686' 'x86_64')
-url="http://pyyaml.org"
 license=('MIT')
 makedepends=('python' 'python2' 'libyaml')
-install='python-yaml.install'
-source=(http://pyyaml.org/download/pyyaml/PyYAML-$pkgver.tar.gz)
-md5sums=('4c129761b661d181ebf7ff4eb2d79950')
+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
+  )
 }
 
-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
+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 "$srcdir"/PyYAML-$pkgver
-  python setup.py install --prefix=/usr --root="$pkgdir"
-  install -m644 -D LICENSE "$pkgdir"/usr/share/licenses/$pkgname/LICENSE
+  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 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}
+}
+
+# vim: ts=2 sw=2 et:

Deleted: python-yaml.install
===================================================================
--- python-yaml.install	2017-09-27 20:47:35 UTC (rev 260722)
+++ python-yaml.install	2017-09-28 00:57:32 UTC (rev 260723)
@@ -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
-}