[arch-commits] Commit in python-logilab-common/repos/extra-any (3 files)

[Ángel Velásquez]

    Date: Friday, June 28, 2013 @ 20:23:38
  Author: angvp
Revision: 189183

archrelease: copy trunk to extra-any

Added:
  python-logilab-common/repos/extra-any/PKGBUILD
    (from rev 189182, python-logilab-common/trunk/PKGBUILD)
  python-logilab-common/repos/extra-any/logilab_modutils.patch
    (from rev 189182, python-logilab-common/trunk/logilab_modutils.patch)
Deleted:
  python-logilab-common/repos/extra-any/PKGBUILD

------------------------+
 PKGBUILD               |  103 ++++++++++++++++++++++++-----------------------
 logilab_modutils.patch |   11 +++++
 2 files changed, 64 insertions(+), 50 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2013-06-28 18:21:40 UTC (rev 189182)
+++ PKGBUILD	2013-06-28 18:23:38 UTC (rev 189183)
@@ -1,50 +0,0 @@
-# $Id$
-# Maintainer: Angel Velasquez <angvp at archlinux.org> 
-# Contributor: Stéphane Gaudreault <stephane at archlinux.org>
-# Contributor: Alexander Fehr <pizzapunk gmail com>
-
-pkgbase=python-logilab-common
-pkgname=('python2-logilab-common' 'python-logilab-common')
-pkgver=0.59.1
-pkgrel=1
-pkgdesc="Useful miscellaneous modules used by Logilab projects"
-arch=('any')
-url="http://www.logilab.org/project/logilab-common"
-license=('LGPL')
-makedepends=('python2' 'python')
-source=(http://download.logilab.org/pub/common/logilab-common-${pkgver}.tar.gz)
-sha1sums=('30d88ccb3f3cc1915a9233b123f3ba8481a1cd4c')
-
-build() {
-  cd "${srcdir}"
-
-  cp -a logilab-common-${pkgver}{,-py3}
-
-  cd logilab-common-${pkgver}
-  python2 setup.py build
-
-  cd ../logilab-common-${pkgver}-py3
-  python3 setup.py build
-}
-
-package_python2-logilab-common() {
-  depends=('python2')
-  cd "${srcdir}"/logilab-common-${pkgver}
-
-  python2 setup.py install --optimize=1 --skip-build --prefix=/usr --root="${pkgdir}"
-
-  mv "${pkgdir}"/usr/bin/pytest{,2}
-
-  # fix permissions ...
-  find "${pkgdir}" -type f -exec chmod +r {} \;
-}
-
-package_python-logilab-common() {
-  depends=('python')
-  cd "${srcdir}"/logilab-common-${pkgver}-py3
-
-  python3 setup.py install --optimize=1 --skip-build --prefix=/usr --root="${pkgdir}"
-
-  # fix permissions ...
-  find "${pkgdir}" -type f -exec chmod +r {} \;
-}

Copied: python-logilab-common/repos/extra-any/PKGBUILD (from rev 189182, python-logilab-common/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2013-06-28 18:23:38 UTC (rev 189183)
@@ -0,0 +1,53 @@
+# $Id$
+# Maintainer: Angel Velasquez <angvp at archlinux.org> 
+# Contributor: Stéphane Gaudreault <stephane at archlinux.org>
+# Contributor: Alexander Fehr <pizzapunk gmail com>
+
+pkgbase=python-logilab-common
+pkgname=('python2-logilab-common' 'python-logilab-common')
+pkgver=0.59.1
+pkgrel=2
+pkgdesc="Useful miscellaneous modules used by Logilab projects"
+arch=('any')
+url="http://www.logilab.org/project/logilab-common"
+license=('LGPL')
+makedepends=('python2' 'python')
+source=(http://download.logilab.org/pub/common/logilab-common-${pkgver}.tar.gz
+logilab_modutils.patch)
+sha1sums=('30d88ccb3f3cc1915a9233b123f3ba8481a1cd4c'
+          '7a839e940813fb4ddf9ae8045f8798f53f0e7c0b')
+
+build() {
+  cd "${srcdir}"
+
+  cp -a logilab-common-${pkgver}{,-py3}
+
+  cd logilab-common-${pkgver}
+  python2 setup.py build
+
+  cd ../logilab-common-${pkgver}-py3
+  python3 setup.py build
+}
+
+package_python2-logilab-common() {
+  depends=('python2')
+  cd "${srcdir}"/logilab-common-${pkgver}
+
+  python2 setup.py install --optimize=1 --skip-build --prefix=/usr --root="${pkgdir}"
+
+  mv "${pkgdir}"/usr/bin/pytest{,2}
+
+  # fix permissions ...
+  find "${pkgdir}" -type f -exec chmod +r {} \;
+}
+
+package_python-logilab-common() {
+  depends=('python')
+  cd "${srcdir}"/logilab-common-${pkgver}-py3
+
+  python3 setup.py install --optimize=1 --skip-build --prefix=/usr --root="${pkgdir}"
+
+  # fix permissions ...
+  find "${pkgdir}" -type f -exec chmod +r {} \;
+  patch -Np1 -i "${srcdir}"/logilab_modutils.patch "${pkgdir}"/usr/lib/python3.3/site-packages/logilab/common/modutils.py
+}

Copied: python-logilab-common/repos/extra-any/logilab_modutils.patch (from rev 189182, python-logilab-common/trunk/logilab_modutils.patch)
===================================================================
--- logilab_modutils.patch	                        (rev 0)
+++ logilab_modutils.patch	2013-06-28 18:23:38 UTC (rev 189183)
@@ -0,0 +1,11 @@
+--- modutils.py	2013-06-28 15:00:05.169823983 -0300
++++ modutils.py.new	2013-06-28 15:00:15.733156861 -0300
+@@ -613,7 +613,7 @@
+                 return _search_zip(modpath, pic)[:2]
+             raise
+         else:
+-            if checkeggs:
++            if checkeggs and mp_filename:
+                 fullabspath = [abspath(x) for x in _path]
+                 try:
+                     pathindex = fullabspath.index(dirname(abspath(mp_filename)))