[arch-commits] Commit in python-virtualenv/trunk (3 files)

Dan McGee dan at archlinux.org
Mon Jun 20 04:49:56 UTC 2011


    Date: Monday, June 20, 2011 @ 00:49:55
  Author: dan
Revision: 127947

upgpkg: python-virtualenv 1.6.1-1
verbump and py3k upgrade

Added:
  python-virtualenv/trunk/python-virtualenv.install
Modified:
  python-virtualenv/trunk/PKGBUILD
Deleted:
  python-virtualenv/trunk/LICENSE.txt

---------------------------+
 LICENSE.txt               |   22 --------------------
 PKGBUILD                  |   47 ++++++++++++++++++++++++++++++--------------
 python-virtualenv.install |    5 ++++
 3 files changed, 38 insertions(+), 36 deletions(-)

Deleted: LICENSE.txt
===================================================================
--- LICENSE.txt	2011-06-20 03:39:16 UTC (rev 127946)
+++ LICENSE.txt	2011-06-20 04:49:55 UTC (rev 127947)
@@ -1,22 +0,0 @@
-Copyright (c) 2007 Ian Bicking and Contributors
-Copyright (c) 2009 Ian Bicking, The Open Planning Project
-Copyright (c) 2011 The virtualenv developers
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

Modified: PKGBUILD
===================================================================
--- PKGBUILD	2011-06-20 03:39:16 UTC (rev 127946)
+++ PKGBUILD	2011-06-20 04:49:55 UTC (rev 127947)
@@ -1,32 +1,51 @@
+# $Id$
 # Maintainer: Dan McGee <dan at archlinux.org>
 # Contributor: Daniele Paolella <dp at mcrservice.it>
 
-pkgname=python-virtualenv
-pkgver=1.5.2
+pkgname=('python-virtualenv' 'python2-virtualenv')
+pkgver=1.6.1
 pkgrel=1
 pkgdesc="Virtual Python Environment builder"
+url="http://www.virtualenv.org/"
 arch=('any')
-url="http://pypi.python.org/pypi/virtualenv"
 license=('MIT')
-depends=('python2' 'setuptools')
+makedepends=('python' 'python-distribute' 'python2' 'python2-distribute')
 replaces=('virtualenv')
 conflicts=('virtualenv')
-source=("http://pypi.python.org/packages/source/v/virtualenv/virtualenv-$pkgver.tar.gz"
-        LICENSE.txt)
+source=("http://pypi.python.org/packages/source/v/virtualenv/virtualenv-$pkgver.tar.gz")
 
-build() {
+package_python-virtualenv() {
+  depends=('python' 'python-distribute')
+  install=python-virtualenv.install
+
   cd "$srcdir/virtualenv-$pkgver"
+  python setup.py build
+  python setup.py install --prefix=/usr --root="$pkgdir"
+
+  # link to a version with 3 suffix as well
+  ln "$pkgdir/usr/bin/virtualenv" "$pkgdir/usr/bin/virtualenv3"
+
+  install -D -m644 LICENSE.txt \
+    "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
+}
+
+package_python2-virtualenv() {
+  depends=('python2' 'python2-distribute')
+
+  cd "$srcdir/virtualenv-$pkgver"
   python2 setup.py build
   python2 setup.py install --prefix=/usr --root="$pkgdir"
-  
+
+  # move this "old" version out of the way
+  mv "$pkgdir/usr/bin/virtualenv" "$pkgdir/usr/bin/virtualenv2"
+
+  # should report this upstream as still not fixed...
   sed -i "s|#!/usr/bin/env python$|#!/usr/bin/env python2|" \
     $pkgdir/usr/lib/python2.7/site-packages/virtualenv.py
-  
-  install -D -m644 "$srcdir/LICENSE.txt" \
+ 
+  install -D -m644 LICENSE.txt \
     "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 }
 
-md5sums=('fbcefbd8520bb64bc24a560c6019a73c'
-         '4409588baf5837a2ce0215dc08b30305')
-sha256sums=('54b2e9c4fcb5d30e6d0a35b938f0d962412b38433921de33a476b203e72834d7'
-            '941229fb2bd6273917359d557e69ad10cda2901c7288781ca23baae9b7b8848a')
+md5sums=('1a475df2219457b6b4febb9fe595d915')
+sha256sums=('d066d7e5d4924766950d1d78c851cd442dfed9ca966694f614f2cc8c5cb48a26')

Added: python-virtualenv.install
===================================================================
--- python-virtualenv.install	                        (rev 0)
+++ python-virtualenv.install	2011-06-20 04:49:55 UTC (rev 127947)
@@ -0,0 +1,5 @@
+post_upgrade() {
+  if [ $(vercmp $2 1.6.1) -lt 0 ]; then
+    echo "Note: Install python2-virtualenv for continued python2 support."
+  fi
+}




More information about the arch-commits mailing list