Update py-pip to 1.1.

Based on PR 46531 by Wen Heping.
* convert to use python/egg.mk.

1.1 (2012-02-16)
----------------

* Fixed issue #326 - don't crash when a package's setup.py emits UTF-8 and
  then fails. Thanks Marc Abramowitz.

* Added ``--target`` option for installing directly to arbitrary directory.
  Thanks Stavros Korokithakis.

* Added support for authentication with Subversion repositories. Thanks
  Qiangning Hong.

* Fixed issue #315 - ``--download`` now downloads dependencies as well.
  Thanks Qiangning Hong.

* Errors from subprocesses will display the current working directory.
  Thanks Antti Kaihola.

* Fixed issue #369 - compatibility with Subversion 1.7. Thanks Qiangning
  Hong. Note that setuptools remains incompatible with Subversion 1.7; to
  get the benefits of pip's support you must use Distribute rather than
  setuptools.

* Fixed issue #57 - ignore py2app-generated OS X mpkg zip files in finder.
  Thanks Rene Dudfield.

* Fixed issue #182 - log to ~/Library/Logs/ by default on OS X framework
  installs. Thanks Dan Callahan for report and patch.

* Fixed issue #310 - understand version tags without minor version ("py3")
  in sdist filenames. Thanks Stuart Andrews for report and Olivier Girardot for
  patch.

* Fixed issue #7 - Pip now supports optionally installing setuptools
  "extras" dependencies; e.g. "pip install Paste[openid]". Thanks Matt Maker
  and Olivier Girardot.

* Fixed issue #391 - freeze no longer borks on requirements files with
  --index-url or --find-links. Thanks Herbert Pfennig.

* Fixed issue #288 - handle symlinks properly. Thanks lebedov for the patch.

* Fixed issue #49 - pip install -U no longer reinstalls the same versions of
  packages. Thanks iguananaut for the pull request.

* Removed ``-E`` option and ``PIP_RESPECT_VIRTUALENV``; both use a
  restart-in-venv mechanism that's broken, and neither one is useful since
  every virtualenv now has pip inside it.

* Fixed issue #366 - pip throws IndexError when it calls `scraped_rel_links`

* Fixed issue #22 - pip search should set and return a userful shell status code

* Fixed issue #351 and #365 - added global ``--exists-action`` command line
  option to easier script file exists conflicts, e.g. from editable
  requirements from VCS that have a changed repo URL.

3 files changed, 17 insertions, 23 deletions

diff --git a/devel/py-pip/Makefile b/devel/py-pip/Makefile
index 41f2279f231..e2a33e3b37b 100644
--- a/devel/py-pip/Makefile
+++ b/devel/py-pip/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.1.1.1 2012/01/23 21:39:32 pettai Exp $
+# $NetBSD: Makefile,v 1.2 2012/06/03 13:18:58 obache Exp $
 #
 
-DISTNAME=	pip-1.0.2
+DISTNAME=	pip-1.1
 PKGNAME=	${PYPKGPREFIX}-${DISTNAME}
 CATEGORIES=	devel
 MASTER_SITES=	http://pypi.python.org/packages/source/p/pip/
@@ -11,15 +11,9 @@ HOMEPAGE=	http://www.pip-installer.org/
 COMMENT=	Installs Python packages as an easy_install replacement
 LICENSE=	mit
 
-DEPENDS+=	${PYPKGPREFIX}-setuptools>=0.6c9:../../devel/py-setuptools
-
-REPLACE_PYTHON=	${WRKSRC}/*.py
-
 PKG_DESTDIR_SUPPORT=	user-destdir
 
 PLIST_SUBST+=		PYVERSSUFFIX="${PYVERSSUFFIX}"
 
-PYDISTUTILSPKG=	yes
-
-.include "../../lang/python/extension.mk"
+.include "../../lang/python/egg.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/py-pip/PLIST b/devel/py-pip/PLIST
index f2f181e3aab..4e95a1f0afb 100644
--- a/devel/py-pip/PLIST
+++ b/devel/py-pip/PLIST
@@ -1,12 +1,12 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2012/01/23 21:39:32 pettai Exp $
+@comment $NetBSD: PLIST,v 1.2 2012/06/03 13:18:58 obache Exp $
 bin/pip
 bin/pip-${PYVERSSUFFIX}
-${PYSITELIB}/pip-${PKGVERSION}-py${PYVERSSUFFIX}.egg-info/PKG-INFO
-${PYSITELIB}/pip-${PKGVERSION}-py${PYVERSSUFFIX}.egg-info/SOURCES.txt
-${PYSITELIB}/pip-${PKGVERSION}-py${PYVERSSUFFIX}.egg-info/dependency_links.txt
-${PYSITELIB}/pip-${PKGVERSION}-py${PYVERSSUFFIX}.egg-info/entry_points.txt
-${PYSITELIB}/pip-${PKGVERSION}-py${PYVERSSUFFIX}.egg-info/not-zip-safe
-${PYSITELIB}/pip-${PKGVERSION}-py${PYVERSSUFFIX}.egg-info/top_level.txt
+${PYSITELIB}/${EGG_INFODIR}/PKG-INFO
+${PYSITELIB}/${EGG_INFODIR}/SOURCES.txt
+${PYSITELIB}/${EGG_INFODIR}/dependency_links.txt
+${PYSITELIB}/${EGG_INFODIR}/entry_points.txt
+${PYSITELIB}/${EGG_INFODIR}/not-zip-safe
+${PYSITELIB}/${EGG_INFODIR}/top_level.txt
 ${PYSITELIB}/pip/__init__.py
 ${PYSITELIB}/pip/__init__.pyc
 ${PYSITELIB}/pip/__init__.pyo
@@ -73,6 +73,9 @@ ${PYSITELIB}/pip/req.pyo
 ${PYSITELIB}/pip/runner.py
 ${PYSITELIB}/pip/runner.pyc
 ${PYSITELIB}/pip/runner.pyo
+${PYSITELIB}/pip/status_codes.py
+${PYSITELIB}/pip/status_codes.pyc
+${PYSITELIB}/pip/status_codes.pyo
 ${PYSITELIB}/pip/util.py
 ${PYSITELIB}/pip/util.pyc
 ${PYSITELIB}/pip/util.pyo
@@ -91,6 +94,3 @@ ${PYSITELIB}/pip/vcs/mercurial.pyo
 ${PYSITELIB}/pip/vcs/subversion.py
 ${PYSITELIB}/pip/vcs/subversion.pyc
 ${PYSITELIB}/pip/vcs/subversion.pyo
-${PYSITELIB}/pip/venv.py
-${PYSITELIB}/pip/venv.pyc
-${PYSITELIB}/pip/venv.pyo
diff --git a/devel/py-pip/distinfo b/devel/py-pip/distinfo
index 6caa64a9520..988cf209b06 100644
--- a/devel/py-pip/distinfo
+++ b/devel/py-pip/distinfo
@@ -1,5 +1,5 @@
-$NetBSD: distinfo,v 1.1.1.1 2012/01/23 21:39:32 pettai Exp $
+$NetBSD: distinfo,v 1.2 2012/06/03 13:18:58 obache Exp $
 
-SHA1 (pip-1.0.2.tar.gz) = bb137ac723389651e6cf56c0c95af0a6547443b6
-RMD160 (pip-1.0.2.tar.gz) = 2a398d35c63f62194528aa16ce989ce532f6b895
-Size (pip-1.0.2.tar.gz) = 105820 bytes
+SHA1 (pip-1.1.tar.gz) = 3b002db66890880ee776bbe199c3d326d8fe3d6f
+RMD160 (pip-1.1.tar.gz) = 0ac4333d3c250056c06cadbe08cb02231dd322a6
+Size (pip-1.1.tar.gz) = 95197 bytes