Date: Tuesday, October 2, 2012 @ 21:01:17 Author: stephane Revision: 167691
archrelease: copy trunk to staging-any Added: python-distribute/repos/staging-any/PKGBUILD (from rev 167690, python-distribute/trunk/PKGBUILD) python-distribute/repos/staging-any/distribute-python2_and_3.patch (from rev 167690, python-distribute/trunk/distribute-python2_and_3.patch) Deleted: python-distribute/repos/staging-any/PKGBUILD python-distribute/repos/staging-any/distribute-python2_and_3.patch --------------------------------+ PKGBUILD | 106 +++++++++++++++++++-------------------- distribute-python2_and_3.patch | 72 +++++++++++++------------- 2 files changed, 88 insertions(+), 90 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2012-10-03 01:01:11 UTC (rev 167690) +++ PKGBUILD 2012-10-03 01:01:17 UTC (rev 167691) @@ -1,54 +0,0 @@ -# $Id$ -# Maintainer: Stéphane Gaudreault <steph...@archlinux.org> -# Contributor: Sebastien Binet <binet@farnsworth> -pkgbase=python-distribute -pkgname=('python-distribute' 'python2-distribute') -pkgver=0.6.28 -pkgrel=2 -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=('709bd97d46050d69865d4b588c7707768dfe6711' - '9c19c12edac507b0f76696d282b9831c4b653a7e') -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 -} Copied: python-distribute/repos/staging-any/PKGBUILD (from rev 167690, python-distribute/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2012-10-03 01:01:17 UTC (rev 167691) @@ -0,0 +1,52 @@ +# $Id$ +# Maintainer: Stéphane Gaudreault <steph...@archlinux.org> +# Contributor: Sebastien Binet <binet@farnsworth> +pkgbase=python-distribute +pkgname=('python-distribute' 'python2-distribute') +pkgver=0.6.28 +pkgrel=3 +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=('709bd97d46050d69865d4b588c7707768dfe6711' + '9c19c12edac507b0f76696d282b9831c4b653a7e') +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} + 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 +} Deleted: distribute-python2_and_3.patch =================================================================== --- distribute-python2_and_3.patch 2012-10-03 01:01:11 UTC (rev 167690) +++ distribute-python2_and_3.patch 2012-10-03 01:01:17 UTC (rev 167691) @@ -1,36 +0,0 @@ -diff -Naur distribute-0.6.27.ori/distribute.egg-info/entry_points.txt distribute-0.6.27/distribute.egg-info/entry_points.txt ---- distribute-0.6.27.ori/distribute.egg-info/entry_points.txt 2012-05-18 15:46:04.000000000 -0400 -+++ distribute-0.6.27/distribute.egg-info/entry_points.txt 2012-05-22 18:14:17.443383039 -0400 -@@ -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.27.ori/distribute_setup.py distribute-0.6.27/distribute_setup.py ---- distribute-0.6.27.ori/distribute_setup.py 2012-05-18 15:45:03.000000000 -0400 -+++ distribute-0.6.27/distribute_setup.py 2012-05-22 18:14:17.443383039 -0400 -@@ -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.27.ori/setup.py distribute-0.6.27/setup.py ---- distribute-0.6.27.ori/setup.py 2012-05-18 15:19:51.000000000 -0400 -+++ distribute-0.6.27/setup.py 2012-05-22 18:14:17.443383039 -0400 -@@ -100,6 +100,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/staging-any/distribute-python2_and_3.patch (from rev 167690, python-distribute/trunk/distribute-python2_and_3.patch) =================================================================== --- distribute-python2_and_3.patch (rev 0) +++ distribute-python2_and_3.patch 2012-10-03 01:01:17 UTC (rev 167691) @@ -0,0 +1,36 @@ +diff -Naur distribute-0.6.27.ori/distribute.egg-info/entry_points.txt distribute-0.6.27/distribute.egg-info/entry_points.txt +--- distribute-0.6.27.ori/distribute.egg-info/entry_points.txt 2012-05-18 15:46:04.000000000 -0400 ++++ distribute-0.6.27/distribute.egg-info/entry_points.txt 2012-05-22 18:14:17.443383039 -0400 +@@ -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.27.ori/distribute_setup.py distribute-0.6.27/distribute_setup.py +--- distribute-0.6.27.ori/distribute_setup.py 2012-05-18 15:45:03.000000000 -0400 ++++ distribute-0.6.27/distribute_setup.py 2012-05-22 18:14:17.443383039 -0400 +@@ -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.27.ori/setup.py distribute-0.6.27/setup.py +--- distribute-0.6.27.ori/setup.py 2012-05-18 15:19:51.000000000 -0400 ++++ distribute-0.6.27/setup.py 2012-05-22 18:14:17.443383039 -0400 +@@ -100,6 +100,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