[arch-commits] Commit in python-distribute/repos/extra-any (4 files)

Stéphane Gaudreault stephane at archlinux.org
Sat Mar 17 21:14:02 EDT 2012


    Date: Saturday, March 17, 2012 @ 21:14:01
  Author: stephane
Revision: 153689

archrelease: copy trunk to extra-any

Added:
  python-distribute/repos/extra-any/PKGBUILD
    (from rev 153688, python-distribute/trunk/PKGBUILD)
  python-distribute/repos/extra-any/distribute-python2_and_3.patch
    (from rev 153688, python-distribute/trunk/distribute-python2_and_3.patch)
Deleted:
  python-distribute/repos/extra-any/PKGBUILD
  python-distribute/repos/extra-any/distribute-python2_and_3.patch

--------------------------------+
 PKGBUILD                       |  110 +++++++++++++++++++--------------------
 distribute-python2_and_3.patch |   72 ++++++++++++-------------
 2 files changed, 91 insertions(+), 91 deletions(-)

Deleted: PKGBUILD
===================================================================
--- PKGBUILD	2012-03-18 01:13:56 UTC (rev 153688)
+++ PKGBUILD	2012-03-18 01:14:01 UTC (rev 153689)
@@ -1,55 +0,0 @@
-# $Id$
-# Maintainer: Stéphane Gaudreault <stephane at archlinux.org>
-# Contributor: Sebastien Binet <binet at farnsworth>
-pkgbase=python-distribute
-pkgname=('python-distribute' 'python2-distribute')
-pkgver=0.6.24
-pkgrel=1
-pkgdesc="Easily build and distribute Python packages"
-arch=('any')
-license=('PSF')
-url="http://pypi.python.org/pypi/distribute"
-makedepends=('python' 'python2')
-source=(http://pypi.python.org/packages/source/d/distribute/distribute-${pkgver}.tar.gz
-        distribute-python2_and_3.patch)
-sha1sums=('0670bdbba2be6892f67a6f946259776fa8331525'
-          '479a239fae1047fa4a8c64b89f4aec2934f027b9')
-
-build() {
-   cd "${srcdir}"
-
-   pushd distribute-${pkgver}
-   patch -Np1 -i ../distribute-python2_and_3.patch
-   popd
-
-   cp -a distribute-${pkgver}{,-python2}
-
-   # Build python 3 module
-   cd distribute-${pkgver}
-   python setup.py build
-   python setup.py test
-
-   # Build python 2 module
-   cd ../distribute-${pkgver}-python2
-
-   sed -i -e "s|^#\!.*/usr/bin/python|#!/usr/bin/python2|" setuptools/tests/test_resources.py
-
-   python2 setup.py build
-   python2 setup.py test
-}
-
-package_python-distribute() {
-   depends=('python>=3.2')
-
-   cd "${srcdir}/distribute-${pkgver}"
-   python setup.py install --prefix=/usr --root="${pkgdir}" --optimize=1 --skip-build
-}
-
-package_python2-distribute() {
-   depends=('python2>=2.7')
-   provides=('setuptools=0.6c11')
-   conflicts=('setuptools')
-
-   cd "${srcdir}/distribute-${pkgver}-python2"
-   python2 setup.py install --prefix=/usr --root="${pkgdir}" --optimize=1 --skip-build
-}

Copied: python-distribute/repos/extra-any/PKGBUILD (from rev 153688, python-distribute/trunk/PKGBUILD)
===================================================================
--- PKGBUILD	                        (rev 0)
+++ PKGBUILD	2012-03-18 01:14:01 UTC (rev 153689)
@@ -0,0 +1,55 @@
+# $Id$
+# Maintainer: Stéphane Gaudreault <stephane at archlinux.org>
+# Contributor: Sebastien Binet <binet at farnsworth>
+pkgbase=python-distribute
+pkgname=('python-distribute' 'python2-distribute')
+pkgver=0.6.25
+pkgrel=1
+pkgdesc="Easily build and distribute Python packages"
+arch=('any')
+license=('PSF')
+url="http://pypi.python.org/pypi/distribute"
+makedepends=('python' 'python2')
+source=(http://pypi.python.org/packages/source/d/distribute/distribute-${pkgver}.tar.gz
+        distribute-python2_and_3.patch)
+sha1sums=('6f402212f294840468d80dc154ebd454e76eba4b'
+          '479a239fae1047fa4a8c64b89f4aec2934f027b9')
+
+build() {
+   cd "${srcdir}"
+
+   pushd distribute-${pkgver}
+   patch -Np1 -i ../distribute-python2_and_3.patch
+   popd
+
+   cp -a distribute-${pkgver}{,-python2}
+
+   # Build python 3 module
+   cd distribute-${pkgver}
+   python setup.py build
+#   python setup.py test
+
+   # Build python 2 module
+   cd ../distribute-${pkgver}-python2
+
+   sed -i -e "s|^#\!.*/usr/bin/python|#!/usr/bin/python2|" setuptools/tests/test_resources.py
+
+   python2 setup.py build
+#   python2 setup.py test
+}
+
+package_python-distribute() {
+   depends=('python>=3.2')
+
+   cd "${srcdir}/distribute-${pkgver}"
+   python setup.py install --prefix=/usr --root="${pkgdir}" --optimize=1 --skip-build
+}
+
+package_python2-distribute() {
+   depends=('python2>=2.7')
+   provides=('setuptools')
+   conflicts=('setuptools')
+
+   cd "${srcdir}/distribute-${pkgver}-python2"
+   python2 setup.py install --prefix=/usr --root="${pkgdir}" --optimize=1 --skip-build
+}

Deleted: distribute-python2_and_3.patch
===================================================================
--- distribute-python2_and_3.patch	2012-03-18 01:13:56 UTC (rev 153688)
+++ distribute-python2_and_3.patch	2012-03-18 01:14:01 UTC (rev 153689)
@@ -1,36 +0,0 @@
-diff -Naur distribute-0.6.24.ori/distribute.egg-info/entry_points.txt distribute-0.6.24/distribute.egg-info/entry_points.txt
---- distribute-0.6.24.ori/distribute.egg-info/entry_points.txt	2011-10-16 09:09:39.000000000 -0400
-+++ distribute-0.6.24/distribute.egg-info/entry_points.txt	2011-11-16 21:40:38.410170855 -0500
-@@ -11,6 +11,8 @@
- install_egg_info = setuptools.command.install_egg_info:install_egg_info
- alias = setuptools.command.alias:alias
- easy_install = setuptools.command.easy_install:easy_install
-+easy_install-2.7 = setuptools.command.easy_install:main
-+easy_install-3.2 = setuptools.command.easy_install:main  
- install_scripts = setuptools.command.install_scripts:install_scripts
- bdist_wininst = setuptools.command.bdist_wininst:bdist_wininst
- bdist_egg = setuptools.command.bdist_egg:bdist_egg
-diff -Naur distribute-0.6.24.ori/distribute_setup.py distribute-0.6.24/distribute_setup.py
---- distribute-0.6.24.ori/distribute_setup.py	2011-10-16 09:05:57.000000000 -0400
-+++ distribute-0.6.24/distribute_setup.py	2011-11-16 21:41:55.990174043 -0500
-@@ -299,8 +299,7 @@
-         log.warn('Could not find the install location')
-         return
-     pyver = '%s.%s' % (sys.version_info[0], sys.version_info[1])
--    setuptools_file = 'setuptools-%s-py%s.egg-info' % \
--            (SETUPTOOLS_FAKED_VERSION, pyver)
-+    setuptools_file = 'setuptools-%s.egg-info' % SETUPTOOLS_FAKED_VERSION
-     pkg_info = os.path.join(placeholder, setuptools_file)
-     if os.path.exists(pkg_info):
-         log.warn('%s already exists', pkg_info)
-diff -Naur distribute-0.6.24.ori/setup.py distribute-0.6.24/setup.py
---- distribute-0.6.24.ori/setup.py	2011-10-16 09:05:57.000000000 -0400
-+++ distribute-0.6.24/setup.py	2011-11-16 21:42:52.496843023 -0500
-@@ -99,6 +99,7 @@
-             finally:
-                 f.close()
- 
-+console_scripts = ["easy_install-%s = setuptools.command.easy_install:main" % sys.version[:3]]
- 
- # if we are installing Distribute using "python setup.py install"
- # we need to get setuptools out of the way

Copied: python-distribute/repos/extra-any/distribute-python2_and_3.patch (from rev 153688, python-distribute/trunk/distribute-python2_and_3.patch)
===================================================================
--- distribute-python2_and_3.patch	                        (rev 0)
+++ distribute-python2_and_3.patch	2012-03-18 01:14:01 UTC (rev 153689)
@@ -0,0 +1,36 @@
+diff -Naur distribute-0.6.24.ori/distribute.egg-info/entry_points.txt distribute-0.6.24/distribute.egg-info/entry_points.txt
+--- distribute-0.6.24.ori/distribute.egg-info/entry_points.txt	2011-10-16 09:09:39.000000000 -0400
++++ distribute-0.6.24/distribute.egg-info/entry_points.txt	2011-11-16 21:40:38.410170855 -0500
+@@ -11,6 +11,8 @@
+ install_egg_info = setuptools.command.install_egg_info:install_egg_info
+ alias = setuptools.command.alias:alias
+ easy_install = setuptools.command.easy_install:easy_install
++easy_install-2.7 = setuptools.command.easy_install:main
++easy_install-3.2 = setuptools.command.easy_install:main  
+ install_scripts = setuptools.command.install_scripts:install_scripts
+ bdist_wininst = setuptools.command.bdist_wininst:bdist_wininst
+ bdist_egg = setuptools.command.bdist_egg:bdist_egg
+diff -Naur distribute-0.6.24.ori/distribute_setup.py distribute-0.6.24/distribute_setup.py
+--- distribute-0.6.24.ori/distribute_setup.py	2011-10-16 09:05:57.000000000 -0400
++++ distribute-0.6.24/distribute_setup.py	2011-11-16 21:41:55.990174043 -0500
+@@ -299,8 +299,7 @@
+         log.warn('Could not find the install location')
+         return
+     pyver = '%s.%s' % (sys.version_info[0], sys.version_info[1])
+-    setuptools_file = 'setuptools-%s-py%s.egg-info' % \
+-            (SETUPTOOLS_FAKED_VERSION, pyver)
++    setuptools_file = 'setuptools-%s.egg-info' % SETUPTOOLS_FAKED_VERSION
+     pkg_info = os.path.join(placeholder, setuptools_file)
+     if os.path.exists(pkg_info):
+         log.warn('%s already exists', pkg_info)
+diff -Naur distribute-0.6.24.ori/setup.py distribute-0.6.24/setup.py
+--- distribute-0.6.24.ori/setup.py	2011-10-16 09:05:57.000000000 -0400
++++ distribute-0.6.24/setup.py	2011-11-16 21:42:52.496843023 -0500
+@@ -99,6 +99,7 @@
+             finally:
+                 f.close()
+ 
++console_scripts = ["easy_install-%s = setuptools.command.easy_install:main" % sys.version[:3]]
+ 
+ # if we are installing Distribute using "python setup.py install"
+ # we need to get setuptools out of the way



More information about the arch-commits mailing list