Date: Monday, November 10, 2014 @ 09:37:31 Author: foutrelis Revision: 122286
archrelease: copy trunk to community-any Added: python-pygments/repos/community-any/PKGBUILD (from rev 122285, python-pygments/trunk/PKGBUILD) python-pygments/repos/community-any/python-pygments.install (from rev 122285, python-pygments/trunk/python-pygments.install) Deleted: python-pygments/repos/community-any/PKGBUILD python-pygments/repos/community-any/make-pygments.lexers.guess_lexer_for_filename-py3-compatible.patch python-pygments/repos/community-any/python-pygments.install --------------------------------------------------------------------+ PKGBUILD | 108 ++++------ make-pygments.lexers.guess_lexer_for_filename-py3-compatible.patch | 29 -- python-pygments.install | 14 - 3 files changed, 51 insertions(+), 100 deletions(-) Deleted: PKGBUILD =================================================================== --- PKGBUILD 2014-11-10 08:37:25 UTC (rev 122285) +++ PKGBUILD 2014-11-10 08:37:31 UTC (rev 122286) @@ -1,64 +0,0 @@ -# $Id$ -# Maintainer: Evangelos Foutras <evange...@foutrelis.com> -# Contributor: Timm Preetz <t...@preetz.us> - -pkgname=('python-pygments' 'python2-pygments') -pkgver=1.6 -pkgrel=4 -pkgdesc="Python syntax highlighter" -arch=('any') -url="http://pygments.org/" -license=('BSD') -makedepends=('python-setuptools' 'python2-setuptools') -options=('!emptydirs') -source=(https://pypi.python.org/packages/source/P/Pygments/Pygments-$pkgver.tar.gz - make-pygments.lexers.guess_lexer_for_filename-py3-compatible.patch) -sha256sums=('799ed4caf77516e54440806d8d9cd82a7607dfdf4e4fb643815171a4b5c921c0' - '15cf8323ce343d32cbf78d35ab20001ce3204abe90b68a80607c7aea41499f07') - -prepare() { - cd "$srcdir/Pygments-$pkgver" - - patch -Np1 -i "$srcdir/make-pygments.lexers.guess_lexer_for_filename-py3-compatible.patch" -} - -build() { - cd "$srcdir" - - rm -rf python{2,3}-build - for builddir in python{2,3}-build; do - cp -r Pygments-$pkgver $builddir - pushd $builddir - ${builddir%-build} setup.py build - popd - done -} - -package_python-pygments() { - depends=('python-setuptools') - install=python-pygments.install - - cd "$srcdir/python3-build" - - python3 setup.py install --root="$pkgdir" -O1 - - # pygmentize has been moved to the python2-pygments package - rm "$pkgdir/usr/bin/pygmentize" - - install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" -} - -package_python2-pygments() { - depends=('python2-setuptools') - - cd "$srcdir/python2-build" - - python2 setup.py install --root="$pkgdir" -O1 - - install -Dm644 external/pygments.bashcomp \ - "$pkgdir/usr/share/bash-completion/completions/pygmentize" - - install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" -} - -# vim:set ts=2 sw=2 et: Copied: python-pygments/repos/community-any/PKGBUILD (from rev 122285, python-pygments/trunk/PKGBUILD) =================================================================== --- PKGBUILD (rev 0) +++ PKGBUILD 2014-11-10 08:37:31 UTC (rev 122286) @@ -0,0 +1,44 @@ +# $Id$ +# Maintainer: Evangelos Foutras <evange...@foutrelis.com> +# Contributor: Timm Preetz <t...@preetz.us> + +pkgname=('python-pygments' 'python2-pygments') +pkgver=2.0 +pkgrel=1 +pkgdesc="Python syntax highlighter" +arch=('any') +url="http://pygments.org/" +license=('BSD') +makedepends=('python-setuptools' 'python2-setuptools') +options=('!emptydirs') +source=(https://pypi.python.org/packages/source/P/Pygments/Pygments-$pkgver.tar.gz) +sha256sums=('4de23e88eeb7570e0425270d1013deff6343d78776dd38aeaf26c98ec3552421') + +package_python-pygments() { + depends=('python-setuptools') + install=python-pygments.install + + cd "$srcdir/Pygments-$pkgver" + + python3 setup.py install --root="$pkgdir" -O1 + + # pygmentize has been moved to the python2-pygments package + rm "$pkgdir/usr/bin/pygmentize" + + install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" +} + +package_python2-pygments() { + depends=('python2-setuptools') + + cd "$srcdir/Pygments-$pkgver" + + python2 setup.py install --root="$pkgdir" -O1 + + install -Dm644 external/pygments.bashcomp \ + "$pkgdir/usr/share/bash-completion/completions/pygmentize" + + install -Dm644 LICENSE "$pkgdir/usr/share/licenses/$pkgname/LICENSE" +} + +# vim:set ts=2 sw=2 et: Deleted: make-pygments.lexers.guess_lexer_for_filename-py3-compatible.patch =================================================================== --- make-pygments.lexers.guess_lexer_for_filename-py3-compatible.patch 2014-11-10 08:37:25 UTC (rev 122285) +++ make-pygments.lexers.guess_lexer_for_filename-py3-compatible.patch 2014-11-10 08:37:31 UTC (rev 122286) @@ -1,29 +0,0 @@ -# HG changeset patch -# User goodwillcoding <goodwillcod...@webhippo.net> -# Date 1376769053 25200 -# Node ID c31841d2fd2171419134f30e815dcafb1e8c7eee -# Parent 7304e4759ae65343d89a51359ca538912519cc31 -Make pygments.lexers.guess_lexer_for_filename py3 compatible. -Background: -In py3 one can longer sort classes by class names -the fix addes a custome sorting function that works -the same in py2 and py3 - -diff --git a/pygments/lexers/__init__.py b/pygments/lexers/__init__.py ---- a/pygments/lexers/__init__.py -+++ b/pygments/lexers/__init__.py -@@ -188,7 +188,13 @@ - if rv == 1.0: - return lexer(**options) - result.append((rv, lexer)) -- result.sort() -+ -+ # since py3 can no longer sort by class name by default, here is the -+ # sorting function that works in both -+ def type_sort(type_): -+ return (type_[0], type_[1].__name__) -+ result.sort(key=type_sort) -+ - if not result[-1][0] and primary is not None: - return primary(**options) - return result[-1][1](**options) Deleted: python-pygments.install =================================================================== --- python-pygments.install 2014-11-10 08:37:25 UTC (rev 122285) +++ python-pygments.install 2014-11-10 08:37:31 UTC (rev 122286) @@ -1,7 +0,0 @@ -post_upgrade() { - if (($(vercmp $2 1.4-5) < 0)); then - echo '/usr/bin/pygmentize has been moved to the python2-pygments package' - fi -} - -# vim:set ts=2 sw=2 et: Copied: python-pygments/repos/community-any/python-pygments.install (from rev 122285, python-pygments/trunk/python-pygments.install) =================================================================== --- python-pygments.install (rev 0) +++ python-pygments.install 2014-11-10 08:37:31 UTC (rev 122286) @@ -0,0 +1,7 @@ +post_upgrade() { + if (($(vercmp $2 1.4-5) < 0)); then + echo '/usr/bin/pygmentize has been moved to the python2-pygments package' + fi +} + +# vim:set ts=2 sw=2 et: