[arch-commits] Commit in python-pip/trunk (LICENSE.txt PKGBUILD python-pip.install)

[Dan McGee]

    Date: Monday, June 20, 2011 @ 00:50:00
  Author: dan
Revision: 127949

upgpkg: python-pip 1.0.1-1
verbump and py3k upgrade

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

--------------------+
 LICENSE.txt        |   21 ---------------------
 PKGBUILD           |   45 ++++++++++++++++++++++++++-------------------
 python-pip.install |    5 +++++
 3 files changed, 31 insertions(+), 40 deletions(-)

Deleted: LICENSE.txt
===================================================================
--- LICENSE.txt	2011-06-20 04:49:58 UTC (rev 127948)
+++ LICENSE.txt	2011-06-20 04:50:00 UTC (rev 127949)
@@ -1,21 +0,0 @@
-Copyright (c) 2008-2010 Ian Bicking and Contributors
-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 04:49:58 UTC (rev 127948)
+++ PKGBUILD	2011-06-20 04:50:00 UTC (rev 127949)
@@ -2,39 +2,46 @@
 # Maintainer: Dan McGee <dan at archlinux.org>
 # Contributor: Sebastien Binet <binet at lblbox>
 
-pkgname=python-pip
-pkgver=0.8.3
+pkgname=('python-pip' 'python2-pip')
+pkgver=1.0.1
 pkgrel=1
 pkgdesc="An easy_install replacement for installing pypi python packages"
-url="http://pypi.python.org/pypi/pip"
+url="http://www.pip-installer.org/"
 arch=('any')
 license=('MIT')
-depends=('python2' 'setuptools')
-makedepends=()
-conflicts=('python-pyinstall')
-replaces=('python-pyinstall')
-backup=()
-install=
-source=(http://pypi.python.org/packages/source/p/pip/pip-${pkgver}.tar.gz
-        LICENSE.txt)
+makedepends=('python' 'python-distribute' 'python2' 'python2-distribute')
+source=(http://pypi.python.org/packages/source/p/pip/pip-${pkgver}.tar.gz)
 
-build() {
+package_python-pip() {
+  depends=('python' 'python-distribute')
+  install=python-pip.install
+
   cd "$srcdir/pip-$pkgver"
-  python2 setup.py build
+  python setup.py build
+  python setup.py install --prefix=/usr --root="$pkgdir"
+  
+  ln "$pkgdir/usr/bin/pip" "$pkgdir/usr/bin/pip3"
+
+  install -D -m644 LICENSE.txt \
+	  "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 }
 
-package() {
+package_python2-pip() {
+  depends=('python2' 'python2-distribute')
+  conflicts=('python-pyinstall')
+  replaces=('python-pyinstall')
+
   cd "$srcdir/pip-$pkgver"
+  python2 setup.py build
   python2 setup.py install --prefix=/usr --root="$pkgdir"
   
+  mv "$pkgdir/usr/bin/pip" "$pkgdir/usr/bin/pip2"
   sed -i "s|#!/usr/bin/env python$|#!/usr/bin/env python2|" \
     ${pkgdir}/usr/lib/python2.7/site-packages/pip/__init__.py
   
-  install -D -m644 "$srcdir/LICENSE.txt" \
+  install -D -m644 LICENSE.txt \
 	  "$pkgdir/usr/share/licenses/$pkgname/LICENSE"
 }
 
-md5sums=('0603337a81f83df2b1d2f1151565efac'
-         '2077e96dc6ee88d987bfb7ccb2e2bf44')
-sha256sums=('1be2e18edd38aa75b5e4ef38a99ec33ba9247177cfcb4a6d2d2b3e73430e3001'
-            'e5eaf3393dd7d6f34e1bc6de6c35654df33fa5a2d41044b5e7530c217c04421f')
+md5sums=('28dcc70225e5bf925532abc5b087a94b')
+sha256sums=('37d2f18213d3845d2038dd3686bc71fc12bb41ad66c945a8b0dfec2879f3497b')

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