[arch-commits] Commit in python-distribute/repos (5 files)

Stéphane Gaudreault stephane at nymeria.archlinux.org
Thu May 23 16:40:13 EDT 2013


    Date: Thursday, May 23, 2013 @ 22:40:13
  Author: stephane
Revision: 186285

db-move: moved python-distribute from [testing] to [extra] (any)

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

------------------------------------------+
 /PKGBUILD                                |   58 +++++++++++++++++++++++++++++
 /distribute-python2_and_3.patch          |   36 ++++++++++++++++++
 extra-any/PKGBUILD                       |   55 ---------------------------
 extra-any/distribute-python2_and_3.patch |   36 ------------------
 4 files changed, 94 insertions(+), 91 deletions(-)

Deleted: extra-any/PKGBUILD
===================================================================
--- extra-any/PKGBUILD	2013-05-23 19:50:57 UTC (rev 186284)
+++ extra-any/PKGBUILD	2013-05-23 20:40:13 UTC (rev 186285)
@@ -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.39
-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=('1dd11f1c9143c25ede79347873832e6b5db7226f'
-          '420bc5d35e1dbfff8015f12e1a13d46973e34c68')
-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}
-
-   sed -i -e "s|^#\!.*/usr/bin/python|#!/usr/bin/python3|" setuptools/tests/test_resources.py
-
-   python3 setup.py build
-
-   # 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
-}
-
-package_python-distribute() {
-   depends=('python>=3.3')
-
-   cd "${srcdir}/distribute-${pkgver}"
-   python3 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
-}

Copied: python-distribute/repos/extra-any/PKGBUILD (from rev 186284, python-distribute/repos/testing-any/PKGBUILD)
===================================================================
--- extra-any/PKGBUILD	                        (rev 0)
+++ extra-any/PKGBUILD	2013-05-23 20:40:13 UTC (rev 186285)
@@ -0,0 +1,58 @@
+# $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.40
+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=('46654be10177014bbb502a4c516627173de67d15'
+          '420bc5d35e1dbfff8015f12e1a13d46973e34c68')
+
+prepare() {
+   cd "${srcdir}"
+
+   pushd distribute-${pkgver}
+   patch -Np1 -i ../distribute-python2_and_3.patch
+   popd
+
+   cp -a distribute-${pkgver}{,-python2}
+
+   cd "${srcdir}"/distribute-${pkgver}
+   sed -i -e "s|^#\!.*/usr/bin/python|#!/usr/bin/python3|" setuptools/tests/test_resources.py
+
+   cd ../distribute-${pkgver}-python2
+   sed -i -e "s|^#\!.*/usr/bin/python|#!/usr/bin/python2|" setuptools/tests/test_resources.py
+}
+
+build() {
+   # Build python 3 module
+   cd "${srcdir}"/distribute-${pkgver}
+   python3 setup.py build
+
+   # Build python 2 module
+   cd ../distribute-${pkgver}-python2
+   python2 setup.py build
+}
+
+package_python-distribute() {
+   depends=('python>=3.3')
+
+   cd "${srcdir}/distribute-${pkgver}"
+   python3 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: extra-any/distribute-python2_and_3.patch
===================================================================
--- extra-any/distribute-python2_and_3.patch	2013-05-23 19:50:57 UTC (rev 186284)
+++ extra-any/distribute-python2_and_3.patch	2013-05-23 20:40:13 UTC (rev 186285)
@@ -1,36 +0,0 @@
-diff -Naur distribute-0.6.34.ori/distribute.egg-info/entry_points.txt distribute-0.6.34/distribute.egg-info/entry_points.txt
---- distribute-0.6.34.ori/distribute.egg-info/entry_points.txt	2012-12-31 10:26:53.000000000 -0500
-+++ distribute-0.6.34/distribute.egg-info/entry_points.txt	2013-01-09 12:35:22.573071193 -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.3 = 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.34.ori/distribute_setup.py distribute-0.6.34/distribute_setup.py
---- distribute-0.6.34.ori/distribute_setup.py	2012-12-29 17:10:53.000000000 -0500
-+++ distribute-0.6.34/distribute_setup.py	2013-01-09 12:33:26.439725679 -0500
-@@ -319,8 +319,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.34.ori/setup.py distribute-0.6.34/setup.py
---- distribute-0.6.34.ori/setup.py	2012-12-29 17:10:53.000000000 -0500
-+++ distribute-0.6.34/setup.py	2013-01-09 12:33:26.439725679 -0500
-@@ -106,6 +106,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 186284, python-distribute/repos/testing-any/distribute-python2_and_3.patch)
===================================================================
--- extra-any/distribute-python2_and_3.patch	                        (rev 0)
+++ extra-any/distribute-python2_and_3.patch	2013-05-23 20:40:13 UTC (rev 186285)
@@ -0,0 +1,36 @@
+diff -Naur distribute-0.6.34.ori/distribute.egg-info/entry_points.txt distribute-0.6.34/distribute.egg-info/entry_points.txt
+--- distribute-0.6.34.ori/distribute.egg-info/entry_points.txt	2012-12-31 10:26:53.000000000 -0500
++++ distribute-0.6.34/distribute.egg-info/entry_points.txt	2013-01-09 12:35:22.573071193 -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.3 = 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.34.ori/distribute_setup.py distribute-0.6.34/distribute_setup.py
+--- distribute-0.6.34.ori/distribute_setup.py	2012-12-29 17:10:53.000000000 -0500
++++ distribute-0.6.34/distribute_setup.py	2013-01-09 12:33:26.439725679 -0500
+@@ -319,8 +319,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.34.ori/setup.py distribute-0.6.34/setup.py
+--- distribute-0.6.34.ori/setup.py	2012-12-29 17:10:53.000000000 -0500
++++ distribute-0.6.34/setup.py	2013-01-09 12:33:26.439725679 -0500
+@@ -106,6 +106,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