3 files changed, 109 insertions, 91 deletions

diff --git a/devel/py-pip/Makefile b/devel/py-pip/Makefile
index 4091412a0243..0caecd174abe 100644
--- a/devel/py-pip/Makefile
+++ b/devel/py-pip/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	pip
-PORTVERSION=	0.7.1
+PORTVERSION=	0.8
 PORTREVISION=	0
 CATEGORIES=	devel python
 MASTER_SITES=	CHEESESHOP \
@@ -16,14 +16,14 @@ PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 MAINTAINER=	nivit@FreeBSD.org
 COMMENT=	Pip installs (Python) packages. An easy_install replacement
 
-RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}setuptools>=0.6c9:${PORTSDIR}/devel/py-setuptools
-
 DOCSDIR=	${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME}
 
 REINPLACE_ARGS=	-i.bak -e "s/env python$$/&${PYTHON_VER}/"
 
+PLIST_SUB=	PYTHON_VER=${PYTHON_VER}
+
 USE_PYTHON=	yes
-USE_PYDISTUTILS=	yes
+USE_PYDISTUTILS=	easy_install
 
 post-patch:
 	${FIND} ${WRKSRC} -type f -name "pip*" -print0 | ${XARGS} -0 ${REINPLACE_CMD}
diff --git a/devel/py-pip/distinfo b/devel/py-pip/distinfo
index d0e05348725a..564c27e2d1ce 100644
--- a/devel/py-pip/distinfo
+++ b/devel/py-pip/distinfo
@@ -1,3 +1,3 @@
-MD5 (pip-0.7.1.tar.gz) = 420c83ad67bdcb542f772eb64392cce6
-SHA256 (pip-0.7.1.tar.gz) = f54f05aa17edd0036de433c44892c8fedb1fd2871c97829838feb995818d24c3
-SIZE (pip-0.7.1.tar.gz) = 82468
+MD5 (pip-0.8.tar.gz) = 468d9adc309f33ad51cee38f0d455429
+SHA256 (pip-0.8.tar.gz) = 9017e4484a212dd4e1a43dd9f039dd7fc8338d4eea1c339d5ae1c80726de5b0f
+SIZE (pip-0.8.tar.gz) = 98347
diff --git a/devel/py-pip/pkg-plist b/devel/py-pip/pkg-plist
index c146b8f53e0f..b3d5d8b1ff6e 100644
--- a/devel/py-pip/pkg-plist
+++ b/devel/py-pip/pkg-plist
@@ -1,86 +1,99 @@
 @comment $FreeBSD$
 bin/pip
-%%PYTHON_SITELIBDIR%%/pip/__init__.py
-%%PYTHON_SITELIBDIR%%/pip/__init__.pyc
-%%PYTHON_SITELIBDIR%%/pip/__init__.pyo
-%%PYTHON_SITELIBDIR%%/pip/backwardcompat.py
-%%PYTHON_SITELIBDIR%%/pip/backwardcompat.pyc
-%%PYTHON_SITELIBDIR%%/pip/backwardcompat.pyo
-%%PYTHON_SITELIBDIR%%/pip/basecommand.py
-%%PYTHON_SITELIBDIR%%/pip/basecommand.pyc
-%%PYTHON_SITELIBDIR%%/pip/basecommand.pyo
-%%PYTHON_SITELIBDIR%%/pip/baseparser.py
-%%PYTHON_SITELIBDIR%%/pip/baseparser.pyc
-%%PYTHON_SITELIBDIR%%/pip/baseparser.pyo
-%%PYTHON_SITELIBDIR%%/pip/commands/__init__.py
-%%PYTHON_SITELIBDIR%%/pip/commands/__init__.pyc
-%%PYTHON_SITELIBDIR%%/pip/commands/__init__.pyo
-%%PYTHON_SITELIBDIR%%/pip/commands/bundle.py
-%%PYTHON_SITELIBDIR%%/pip/commands/bundle.pyc
-%%PYTHON_SITELIBDIR%%/pip/commands/bundle.pyo
-%%PYTHON_SITELIBDIR%%/pip/commands/completion.py
-%%PYTHON_SITELIBDIR%%/pip/commands/completion.pyc
-%%PYTHON_SITELIBDIR%%/pip/commands/completion.pyo
-%%PYTHON_SITELIBDIR%%/pip/commands/freeze.py
-%%PYTHON_SITELIBDIR%%/pip/commands/freeze.pyc
-%%PYTHON_SITELIBDIR%%/pip/commands/freeze.pyo
-%%PYTHON_SITELIBDIR%%/pip/commands/help.py
-%%PYTHON_SITELIBDIR%%/pip/commands/help.pyc
-%%PYTHON_SITELIBDIR%%/pip/commands/help.pyo
-%%PYTHON_SITELIBDIR%%/pip/commands/install.py
-%%PYTHON_SITELIBDIR%%/pip/commands/install.pyc
-%%PYTHON_SITELIBDIR%%/pip/commands/install.pyo
-%%PYTHON_SITELIBDIR%%/pip/commands/search.py
-%%PYTHON_SITELIBDIR%%/pip/commands/search.pyc
-%%PYTHON_SITELIBDIR%%/pip/commands/search.pyo
-%%PYTHON_SITELIBDIR%%/pip/commands/uninstall.py
-%%PYTHON_SITELIBDIR%%/pip/commands/uninstall.pyc
-%%PYTHON_SITELIBDIR%%/pip/commands/uninstall.pyo
-%%PYTHON_SITELIBDIR%%/pip/commands/unzip.py
-%%PYTHON_SITELIBDIR%%/pip/commands/unzip.pyc
-%%PYTHON_SITELIBDIR%%/pip/commands/unzip.pyo
-%%PYTHON_SITELIBDIR%%/pip/commands/zip.py
-%%PYTHON_SITELIBDIR%%/pip/commands/zip.pyc
-%%PYTHON_SITELIBDIR%%/pip/commands/zip.pyo
-%%PYTHON_SITELIBDIR%%/pip/exceptions.py
-%%PYTHON_SITELIBDIR%%/pip/exceptions.pyc
-%%PYTHON_SITELIBDIR%%/pip/exceptions.pyo
-%%PYTHON_SITELIBDIR%%/pip/index.py
-%%PYTHON_SITELIBDIR%%/pip/index.pyc
-%%PYTHON_SITELIBDIR%%/pip/index.pyo
-%%PYTHON_SITELIBDIR%%/pip/locations.py
-%%PYTHON_SITELIBDIR%%/pip/locations.pyc
-%%PYTHON_SITELIBDIR%%/pip/locations.pyo
-%%PYTHON_SITELIBDIR%%/pip/log.py
-%%PYTHON_SITELIBDIR%%/pip/log.pyc
-%%PYTHON_SITELIBDIR%%/pip/log.pyo
-%%PYTHON_SITELIBDIR%%/pip/req.py
-%%PYTHON_SITELIBDIR%%/pip/req.pyc
-%%PYTHON_SITELIBDIR%%/pip/req.pyo
-%%PYTHON_SITELIBDIR%%/pip/runner.py
-%%PYTHON_SITELIBDIR%%/pip/runner.pyc
-%%PYTHON_SITELIBDIR%%/pip/runner.pyo
-%%PYTHON_SITELIBDIR%%/pip/util.py
-%%PYTHON_SITELIBDIR%%/pip/util.pyc
-%%PYTHON_SITELIBDIR%%/pip/util.pyo
-%%PYTHON_SITELIBDIR%%/pip/vcs/__init__.py
-%%PYTHON_SITELIBDIR%%/pip/vcs/__init__.pyc
-%%PYTHON_SITELIBDIR%%/pip/vcs/__init__.pyo
-%%PYTHON_SITELIBDIR%%/pip/vcs/bazaar.py
-%%PYTHON_SITELIBDIR%%/pip/vcs/bazaar.pyc
-%%PYTHON_SITELIBDIR%%/pip/vcs/bazaar.pyo
-%%PYTHON_SITELIBDIR%%/pip/vcs/git.py
-%%PYTHON_SITELIBDIR%%/pip/vcs/git.pyc
-%%PYTHON_SITELIBDIR%%/pip/vcs/git.pyo
-%%PYTHON_SITELIBDIR%%/pip/vcs/mercurial.py
-%%PYTHON_SITELIBDIR%%/pip/vcs/mercurial.pyc
-%%PYTHON_SITELIBDIR%%/pip/vcs/mercurial.pyo
-%%PYTHON_SITELIBDIR%%/pip/vcs/subversion.py
-%%PYTHON_SITELIBDIR%%/pip/vcs/subversion.pyc
-%%PYTHON_SITELIBDIR%%/pip/vcs/subversion.pyo
-%%PYTHON_SITELIBDIR%%/pip/venv.py
-%%PYTHON_SITELIBDIR%%/pip/venv.pyc
-%%PYTHON_SITELIBDIR%%/pip/venv.pyo
+bin/pip-%%PYTHON_VER%%
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/PKG-INFO
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/SOURCES.txt
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/dependency_links.txt
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/entry_points.txt
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/not-zip-safe
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO/top_level.txt
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pip/__init__.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pip/__init__.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pip/__init__.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pip/_pkgutil.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pip/_pkgutil.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pip/_pkgutil.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pip/backwardcompat.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pip/backwardcompat.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pip/backwardcompat.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pip/basecommand.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pip/basecommand.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pip/basecommand.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pip/baseparser.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pip/baseparser.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pip/baseparser.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pip/commands/__init__.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pip/commands/__init__.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pip/commands/__init__.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pip/commands/bundle.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pip/commands/bundle.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pip/commands/bundle.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pip/commands/completion.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pip/commands/completion.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pip/commands/completion.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pip/commands/freeze.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pip/commands/freeze.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pip/commands/freeze.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pip/commands/help.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pip/commands/help.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pip/commands/help.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pip/commands/install.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pip/commands/install.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pip/commands/install.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pip/commands/search.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pip/commands/search.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pip/commands/search.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pip/commands/uninstall.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pip/commands/uninstall.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pip/commands/uninstall.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pip/commands/unzip.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pip/commands/unzip.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pip/commands/unzip.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pip/commands/zip.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pip/commands/zip.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pip/commands/zip.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pip/download.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pip/download.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pip/download.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pip/exceptions.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pip/exceptions.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pip/exceptions.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pip/index.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pip/index.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pip/index.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pip/locations.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pip/locations.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pip/locations.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pip/log.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pip/log.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pip/log.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pip/req.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pip/req.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pip/req.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pip/runner.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pip/runner.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pip/runner.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pip/util.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pip/util.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pip/util.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pip/vcs/__init__.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pip/vcs/__init__.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pip/vcs/__init__.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pip/vcs/bazaar.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pip/vcs/bazaar.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pip/vcs/bazaar.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pip/vcs/git.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pip/vcs/git.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pip/vcs/git.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pip/vcs/mercurial.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pip/vcs/mercurial.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pip/vcs/mercurial.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pip/vcs/subversion.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pip/vcs/subversion.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pip/vcs/subversion.pyo
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pip/venv.py
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pip/venv.pyc
+%%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pip/venv.pyo
 %%PORTDOCS%%%%DOCSDIR%%/_build/branches.html
 %%PORTDOCS%%%%DOCSDIR%%/_build/configuration.html
 %%PORTDOCS%%%%DOCSDIR%%/_build/index.html
@@ -89,13 +102,18 @@ bin/pip
 %%PORTDOCS%%%%DOCSDIR%%/_build/requirement-format.html
 %%PORTDOCS%%%%DOCSDIR%%/_build/search.html
 %%PORTDOCS%%%%DOCSDIR%%/branches.txt
+%%PORTDOCS%%%%DOCSDIR%%/ci-server-step-by-step.txt
 %%PORTDOCS%%%%DOCSDIR%%/configuration.txt
+%%PORTDOCS%%%%DOCSDIR%%/how-to-contribute.txt
 %%PORTDOCS%%%%DOCSDIR%%/index.txt
 %%PORTDOCS%%%%DOCSDIR%%/license.txt
 %%PORTDOCS%%%%DOCSDIR%%/news.txt
 %%PORTDOCS%%%%DOCSDIR%%/requirement-format.txt
-@dirrm %%PYTHON_SITELIBDIR%%/pip/vcs
-@dirrm %%PYTHON_SITELIBDIR%%/pip/commands
-@dirrm %%PYTHON_SITELIBDIR%%/pip
+%%PORTDOCS%%%%DOCSDIR%%/running-tests.txt
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pip/vcs
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pip/commands
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/pip
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%/EGG-INFO
+@dirrm %%PYTHON_SITELIBDIR%%/%%PYEASYINSTALL_EGG%%
 %%PORTDOCS%%@dirrm %%DOCSDIR%%/_build
 %%PORTDOCS%%@dirrm %%DOCSDIR%%