v20140602

Add Anaconda and Anaconda3 definitions for v2.0.0

CHANGELOG.md

@@ -1,5 +1,13 @@
 ## Version History
 
+#### 0.4.0-20140602
+
+* python-build: Add new Anaconda/Anaconda3 releases; anaconda-2.0.0, anaconda3-2.0.0 (#179)
+* python-build: Add new CPython release; 2.7.7 (#180)
+* python-build: Update default setuptools version (3.6 -> 4.0) (#181)
+* python-build: Respect environment variables of `CPPFLAGS` and `LDFLAGS` (#168)
+* python-build: Support for xz-compressed Python tarballs (#177)
+
 #### 0.4.0-20140520
 
 * python-build: Add new CPython release; 3.4.1 (#170, #171)

libexec/pyenv---version

@@ -12,7 +12,7 @@
 set -e
 [ -n "$PYENV_DEBUG" ] && set -x
 
-version="0.4.0-20140520"
+version="0.4.0-20140602"
 
 if cd "$PYENV_ROOT" 2>/dev/null; then
   git_revision="$(git describe --tags HEAD 2>/dev/null || true)"

plugins/python-build/bin/python-build

@@ -283,6 +283,11 @@ fetch_tarball() {
     tar_args="${tar_args/z/j}"
   fi
 
+   if [ "$package_url" != "${package_url%xz}" ]; then
+     package_filename="${package_filename%.gz}.xz"
+     tar_args="${tar_args/z/J}"
+   fi
+
   if ! reuse_existing_tarball "$package_filename" "$checksum"; then
     local tarball_filename=$(basename $package_url)
     echo "Downloading ${tarball_filename}..." >&2
@@ -1047,7 +1052,8 @@ needs_yaml() {
 use_homebrew_yaml() {
   local libdir="$(brew --prefix libyaml 2>/dev/null || true)"
   if [ -d "$libdir" ]; then
-    package_option python configure CPPFLAGS="-I$libdir/include" LDFLAGS="-L$libdir/lib"
+    export CPPFLAGS="-I$libdir/include ${CPPFLAGS}"
+    export LDFLAGS="-L$libdir/lib ${LDFLAGS}"
   else
     return 1
   fi
@@ -1079,7 +1085,8 @@ use_homebrew_readline() {
   if ! configured_with_readline_dir; then
     local libdir="$(brew --prefix readline 2>/dev/null || true)"
     if [ -d "$libdir" ]; then
-      package_option python configure CPPFLAGS="-I$libdir/include" LDFLAGS="-L$libdir/lib"
+      export CPPFLAGS="-I$libdir/include ${CPPFLAGS}"
+      export LDFLAGS="-L$libdir/lib ${LDFLAGS}"
     else
       return 1
     fi
@@ -1095,7 +1102,8 @@ has_broken_mac_openssl() {
 use_homebrew_openssl() {
   local ssldir="$(brew --prefix openssl 2>/dev/null || true)"
   if [ -d "$ssldir" ]; then
-    package_option python configure CPPFLAGS="-I$ssldir/include" LDFLAGS="-L$ssldir/lib"
+    export CPPFLAGS="-I$ssldir/include ${CPPFLAGS}"
+    export LDFLAGS="-L$ssldir/lib ${LDFLAGS}"
   else
     return 1
   fi
@@ -1109,7 +1117,8 @@ build_package_mac_openssl() {
   OPENSSLDIR="${OPENSSLDIR:-$OPENSSL_PREFIX_PATH/ssl}"
 
   # Tell Python to use this openssl for its extension.
-  package_option python configure CPPFLAGS="-I${OPENSSL_PREFIX_PATH}/include" LDFLAGS="-L${OPENSSL_PREFIX_PATH}/lib"
+  export CPPFLAGS="-I${OPENSSL_PREFIX_PATH}/include ${CPPFLAGS}"
+  export LDFLAGS="-L${OPENSSL_PREFIX_PATH}/lib ${LDFLAGS}"
 
   # Hint OpenSSL that we prefer a 64-bit build.
   export KERNEL_BITS="64"

plugins/python-build/share/python-build/2.6.6

@@ -1,5 +1,5 @@
 require_cc
 install_package "readline-6.3" "http://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#33c8fb279e981274f485fd91da77e94a" standard --if has_broken_mac_readline
 install_package "Python-2.6.6" "http://python.org/ftp/python/2.6.6/Python-2.6.6.tgz#b2f209df270a33315e62c1ffac1937f0" ldflags_dirs standard verify_py26
-install_package "setuptools-3.6" "https://pypi.python.org/packages/source/s/setuptools/setuptools-3.6.tar.gz#8f3a1dcdc14313c8334eb6af4f66ea0a" python
+install_package "setuptools-4.0" "https://pypi.python.org/packages/source/s/setuptools/setuptools-4.0.tar.gz#d7f08bf4fe55312f9f9fbe03d6642bce" python
 install_package "pip-1.5.6" "https://pypi.python.org/packages/source/p/pip/pip-1.5.6.tar.gz#01026f87978932060cc86c1dc527903e" python

plugins/python-build/share/python-build/2.6.7

@@ -1,5 +1,5 @@
 require_cc
 install_package "readline-6.3" "http://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#33c8fb279e981274f485fd91da77e94a" standard --if has_broken_mac_readline
 install_package "Python-2.6.7" "http://python.org/ftp/python/2.6.7/Python-2.6.7.tgz#af474f85a3af69ea50438a2a48039d7d" ldflags_dirs standard verify_py26
-install_package "setuptools-3.6" "https://pypi.python.org/packages/source/s/setuptools/setuptools-3.6.tar.gz#8f3a1dcdc14313c8334eb6af4f66ea0a" python
+install_package "setuptools-4.0" "https://pypi.python.org/packages/source/s/setuptools/setuptools-4.0.tar.gz#d7f08bf4fe55312f9f9fbe03d6642bce" python
 install_package "pip-1.5.6" "https://pypi.python.org/packages/source/p/pip/pip-1.5.6.tar.gz#01026f87978932060cc86c1dc527903e" python

plugins/python-build/share/python-build/2.6.8

@@ -1,5 +1,5 @@
 require_cc
 install_package "readline-6.3" "http://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#33c8fb279e981274f485fd91da77e94a" standard --if has_broken_mac_readline
 install_package "Python-2.6.8" "http://python.org/ftp/python/2.6.8/Python-2.6.8.tgz#f6c1781f5d73ab7dfa5181f43ea065f6" ldflags_dirs standard verify_py26
-install_package "setuptools-3.6" "https://pypi.python.org/packages/source/s/setuptools/setuptools-3.6.tar.gz#8f3a1dcdc14313c8334eb6af4f66ea0a" python
+install_package "setuptools-4.0" "https://pypi.python.org/packages/source/s/setuptools/setuptools-4.0.tar.gz#d7f08bf4fe55312f9f9fbe03d6642bce" python
 install_package "pip-1.5.6" "https://pypi.python.org/packages/source/p/pip/pip-1.5.6.tar.gz#01026f87978932060cc86c1dc527903e" python

plugins/python-build/share/python-build/2.6.9

@@ -1,5 +1,5 @@
 require_cc
 install_package "readline-6.3" "http://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#33c8fb279e981274f485fd91da77e94a" standard --if has_broken_mac_readline
 install_package "Python-2.6.9" "http://python.org/ftp/python/2.6.9/Python-2.6.9.tgz#bddbd64bf6f5344fc55bbe49a72fe4f3" ldflags_dirs standard verify_py26
-install_package "setuptools-3.6" "https://pypi.python.org/packages/source/s/setuptools/setuptools-3.6.tar.gz#8f3a1dcdc14313c8334eb6af4f66ea0a" python
+install_package "setuptools-4.0" "https://pypi.python.org/packages/source/s/setuptools/setuptools-4.0.tar.gz#d7f08bf4fe55312f9f9fbe03d6642bce" python
 install_package "pip-1.5.6" "https://pypi.python.org/packages/source/p/pip/pip-1.5.6.tar.gz#01026f87978932060cc86c1dc527903e" python

plugins/python-build/share/python-build/2.7

@@ -1,5 +1,5 @@
 require_cc
 install_package "readline-6.3" "http://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#33c8fb279e981274f485fd91da77e94a" standard --if has_broken_mac_readline
 install_package "Python-2.7" "http://python.org/ftp/python/2.7/Python-2.7.tgz#35f56b092ecf39a6bd59d64f142aae0f" ldflags_dirs standard verify_py27
-install_package "setuptools-3.6" "https://pypi.python.org/packages/source/s/setuptools/setuptools-3.6.tar.gz#8f3a1dcdc14313c8334eb6af4f66ea0a" python
+install_package "setuptools-4.0" "https://pypi.python.org/packages/source/s/setuptools/setuptools-4.0.tar.gz#d7f08bf4fe55312f9f9fbe03d6642bce" python
 install_package "pip-1.5.6" "https://pypi.python.org/packages/source/p/pip/pip-1.5.6.tar.gz#01026f87978932060cc86c1dc527903e" python

plugins/python-build/share/python-build/2.7-dev

@@ -1,5 +1,5 @@
 require_cc
 install_package "readline-6.3" "http://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#33c8fb279e981274f485fd91da77e94a" standard --if has_broken_mac_readline
 install_hg "Python-2.7-dev" "https://bitbucket.org/mirror/cpython" "2.7" standard verify_py27
-install_package "setuptools-3.6" "https://pypi.python.org/packages/source/s/setuptools/setuptools-3.6.tar.gz#8f3a1dcdc14313c8334eb6af4f66ea0a" python
+install_package "setuptools-4.0" "https://pypi.python.org/packages/source/s/setuptools/setuptools-4.0.tar.gz#d7f08bf4fe55312f9f9fbe03d6642bce" python
 install_package "pip-1.5.6" "https://pypi.python.org/packages/source/p/pip/pip-1.5.6.tar.gz#01026f87978932060cc86c1dc527903e" python

plugins/python-build/share/python-build/2.7.1

@@ -1,5 +1,5 @@
 require_cc
 install_package "readline-6.3" "http://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#33c8fb279e981274f485fd91da77e94a" standard --if has_broken_mac_readline
 install_package "Python-2.7.1" "http://python.org/ftp/python/2.7.1/Python-2.7.1.tgz#15ed56733655e3fab785e49a7278d2fb" ldflags_dirs standard verify_py27
-install_package "setuptools-3.6" "https://pypi.python.org/packages/source/s/setuptools/setuptools-3.6.tar.gz#8f3a1dcdc14313c8334eb6af4f66ea0a" python
+install_package "setuptools-4.0" "https://pypi.python.org/packages/source/s/setuptools/setuptools-4.0.tar.gz#d7f08bf4fe55312f9f9fbe03d6642bce" python
 install_package "pip-1.5.6" "https://pypi.python.org/packages/source/p/pip/pip-1.5.6.tar.gz#01026f87978932060cc86c1dc527903e" python

plugins/python-build/share/python-build/2.7.2

@@ -1,5 +1,5 @@
 require_cc
 install_package "readline-6.3" "http://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#33c8fb279e981274f485fd91da77e94a" standard --if has_broken_mac_readline
 install_package "Python-2.7.2" "http://python.org/ftp/python/2.7.2/Python-2.7.2.tgz#0ddfe265f1b3d0a8c2459f5bf66894c7" ldflags_dirs standard verify_py27
-install_package "setuptools-3.6" "https://pypi.python.org/packages/source/s/setuptools/setuptools-3.6.tar.gz#8f3a1dcdc14313c8334eb6af4f66ea0a" python
+install_package "setuptools-4.0" "https://pypi.python.org/packages/source/s/setuptools/setuptools-4.0.tar.gz#d7f08bf4fe55312f9f9fbe03d6642bce" python
 install_package "pip-1.5.6" "https://pypi.python.org/packages/source/p/pip/pip-1.5.6.tar.gz#01026f87978932060cc86c1dc527903e" python

plugins/python-build/share/python-build/2.7.3

@@ -1,5 +1,5 @@
 require_cc
 install_package "readline-6.3" "http://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#33c8fb279e981274f485fd91da77e94a" standard --if has_broken_mac_readline
 install_package "Python-2.7.3" "http://python.org/ftp/python/2.7.3/Python-2.7.3.tgz#2cf641732ac23b18d139be077bd906cd" ldflags_dirs standard verify_py27
-install_package "setuptools-3.6" "https://pypi.python.org/packages/source/s/setuptools/setuptools-3.6.tar.gz#8f3a1dcdc14313c8334eb6af4f66ea0a" python
+install_package "setuptools-4.0" "https://pypi.python.org/packages/source/s/setuptools/setuptools-4.0.tar.gz#d7f08bf4fe55312f9f9fbe03d6642bce" python
 install_package "pip-1.5.6" "https://pypi.python.org/packages/source/p/pip/pip-1.5.6.tar.gz#01026f87978932060cc86c1dc527903e" python

plugins/python-build/share/python-build/2.7.4

@@ -1,5 +1,5 @@
 require_cc
 install_package "readline-6.3" "http://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#33c8fb279e981274f485fd91da77e94a" standard --if has_broken_mac_readline
 install_package "Python-2.7.4" "http://python.org/ftp/python/2.7.4/Python-2.7.4.tgz#592603cfaf4490a980e93ecb92bde44a" ldflags_dirs standard verify_py27
-install_package "setuptools-3.6" "https://pypi.python.org/packages/source/s/setuptools/setuptools-3.6.tar.gz#8f3a1dcdc14313c8334eb6af4f66ea0a" python
+install_package "setuptools-4.0" "https://pypi.python.org/packages/source/s/setuptools/setuptools-4.0.tar.gz#d7f08bf4fe55312f9f9fbe03d6642bce" python
 install_package "pip-1.5.6" "https://pypi.python.org/packages/source/p/pip/pip-1.5.6.tar.gz#01026f87978932060cc86c1dc527903e" python

plugins/python-build/share/python-build/2.7.5

@@ -1,5 +1,5 @@
 require_cc
 install_package "readline-6.3" "http://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#33c8fb279e981274f485fd91da77e94a" standard --if has_broken_mac_readline
 install_package "Python-2.7.5" "http://python.org/ftp/python/2.7.5/Python-2.7.5.tgz#b4f01a1d0ba0b46b05c73b2ac909b1df" ldflags_dirs standard verify_py27
-install_package "setuptools-3.6" "https://pypi.python.org/packages/source/s/setuptools/setuptools-3.6.tar.gz#8f3a1dcdc14313c8334eb6af4f66ea0a" python
+install_package "setuptools-4.0" "https://pypi.python.org/packages/source/s/setuptools/setuptools-4.0.tar.gz#d7f08bf4fe55312f9f9fbe03d6642bce" python
 install_package "pip-1.5.6" "https://pypi.python.org/packages/source/p/pip/pip-1.5.6.tar.gz#01026f87978932060cc86c1dc527903e" python

plugins/python-build/share/python-build/2.7.6

@@ -1,5 +1,5 @@
 require_cc
 install_package "readline-6.3" "http://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#33c8fb279e981274f485fd91da77e94a" standard --if has_broken_mac_readline
 install_package "Python-2.7.6" "http://python.org/ftp/python/2.7.6/Python-2.7.6.tgz#1d8728eb0dfcac72a0fd99c17ec7f386" ldflags_dirs standard verify_py27
-install_package "setuptools-3.6" "https://pypi.python.org/packages/source/s/setuptools/setuptools-3.6.tar.gz#8f3a1dcdc14313c8334eb6af4f66ea0a" python
+install_package "setuptools-4.0" "https://pypi.python.org/packages/source/s/setuptools/setuptools-4.0.tar.gz#d7f08bf4fe55312f9f9fbe03d6642bce" python
 install_package "pip-1.5.6" "https://pypi.python.org/packages/source/p/pip/pip-1.5.6.tar.gz#01026f87978932060cc86c1dc527903e" python

plugins/python-build/share/python-build/2.7.7

@@ -0,0 +1,5 @@
+require_cc
+install_package "readline-6.3" "http://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#33c8fb279e981274f485fd91da77e94a" standard --if has_broken_mac_readline
+install_package "Python-2.7.7" "https://www.python.org/ftp/python/2.7.7/Python-2.7.7.tgz#cf842800b67841d64e7fb3cd8acb5663" ldflags_dirs standard verify_py27
+install_package "setuptools-4.0" "https://pypi.python.org/packages/source/s/setuptools/setuptools-4.0.tar.gz#d7f08bf4fe55312f9f9fbe03d6642bce" python
+install_package "pip-1.5.6" "https://pypi.python.org/packages/source/p/pip/pip-1.5.6.tar.gz#01026f87978932060cc86c1dc527903e" python

plugins/python-build/share/python-build/3.0.1

@@ -1,5 +1,5 @@
 require_cc
 install_package "readline-6.3" "http://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#33c8fb279e981274f485fd91da77e94a" standard --if has_broken_mac_readline
 install_package "Python-3.0.1" "http://python.org/ftp/python/3.0.1/Python-3.0.1.tgz#220b73f0a1a20c4b1cdf9f9db4cd52fe" ldflags_dirs standard verify_py30
-install_package "setuptools-3.6" "https://pypi.python.org/packages/source/s/setuptools/setuptools-3.6.tar.gz#8f3a1dcdc14313c8334eb6af4f66ea0a" python
+install_package "setuptools-4.0" "https://pypi.python.org/packages/source/s/setuptools/setuptools-4.0.tar.gz#d7f08bf4fe55312f9f9fbe03d6642bce" python
 install_package "pip-1.5.6" "https://pypi.python.org/packages/source/p/pip/pip-1.5.6.tar.gz#01026f87978932060cc86c1dc527903e" python

plugins/python-build/share/python-build/3.1-dev

@@ -1,5 +1,5 @@
 require_cc
 install_package "readline-6.3" "http://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#33c8fb279e981274f485fd91da77e94a" standard --if has_broken_mac_readline
 install_hg "Python-3.1-dev" "https://bitbucket.org/mirror/cpython" "3.1" standard verify_py31
-install_package "setuptools-3.6" "https://pypi.python.org/packages/source/s/setuptools/setuptools-3.6.tar.gz#8f3a1dcdc14313c8334eb6af4f66ea0a" python
+install_package "setuptools-4.0" "https://pypi.python.org/packages/source/s/setuptools/setuptools-4.0.tar.gz#d7f08bf4fe55312f9f9fbe03d6642bce" python
 install_package "pip-1.5.6" "https://pypi.python.org/packages/source/p/pip/pip-1.5.6.tar.gz#01026f87978932060cc86c1dc527903e" python

plugins/python-build/share/python-build/3.1.3

@@ -1,5 +1,5 @@
 require_cc
 install_package "readline-6.3" "http://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#33c8fb279e981274f485fd91da77e94a" standard --if has_broken_mac_readline
 install_package "Python-3.1.3" "http://python.org/ftp/python/3.1.3/Python-3.1.3.tgz#d797fa6abe82c21227e328f05a535424" ldflags_dirs standard verify_py31
-install_package "setuptools-3.6" "https://pypi.python.org/packages/source/s/setuptools/setuptools-3.6.tar.gz#8f3a1dcdc14313c8334eb6af4f66ea0a" python
+install_package "setuptools-4.0" "https://pypi.python.org/packages/source/s/setuptools/setuptools-4.0.tar.gz#d7f08bf4fe55312f9f9fbe03d6642bce" python
 install_package "pip-1.5.6" "https://pypi.python.org/packages/source/p/pip/pip-1.5.6.tar.gz#01026f87978932060cc86c1dc527903e" python

plugins/python-build/share/python-build/3.1.4

@@ -1,5 +1,5 @@
 require_cc
 install_package "readline-6.3" "http://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#33c8fb279e981274f485fd91da77e94a" standard --if has_broken_mac_readline
 install_package "Python-3.1.4" "http://python.org/ftp/python/3.1.4/Python-3.1.4.tgz#fa9f8efdc63944c8393870282e8b5c35" ldflags_dirs standard verify_py31
-install_package "setuptools-3.6" "https://pypi.python.org/packages/source/s/setuptools/setuptools-3.6.tar.gz#8f3a1dcdc14313c8334eb6af4f66ea0a" python
+install_package "setuptools-4.0" "https://pypi.python.org/packages/source/s/setuptools/setuptools-4.0.tar.gz#d7f08bf4fe55312f9f9fbe03d6642bce" python
 install_package "pip-1.5.6" "https://pypi.python.org/packages/source/p/pip/pip-1.5.6.tar.gz#01026f87978932060cc86c1dc527903e" python

plugins/python-build/share/python-build/3.1.5

@@ -1,5 +1,5 @@
 require_cc
 install_package "readline-6.3" "http://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#33c8fb279e981274f485fd91da77e94a" standard --if has_broken_mac_readline
 install_package "Python-3.1.5" "http://python.org/ftp/python/3.1.5/Python-3.1.5.tgz#02196d3fc7bc76bdda68aa36b0dd16ab" ldflags_dirs standard verify_py31
-install_package "setuptools-3.6" "https://pypi.python.org/packages/source/s/setuptools/setuptools-3.6.tar.gz#8f3a1dcdc14313c8334eb6af4f66ea0a" python
+install_package "setuptools-4.0" "https://pypi.python.org/packages/source/s/setuptools/setuptools-4.0.tar.gz#d7f08bf4fe55312f9f9fbe03d6642bce" python
 install_package "pip-1.5.6" "https://pypi.python.org/packages/source/p/pip/pip-1.5.6.tar.gz#01026f87978932060cc86c1dc527903e" python

plugins/python-build/share/python-build/3.2

@@ -1,5 +1,5 @@
 require_cc
 install_package "readline-6.3" "http://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#33c8fb279e981274f485fd91da77e94a" standard --if has_broken_mac_readline
 install_package "Python-3.2" "http://python.org/ftp/python/3.2/Python-3.2.tgz#5efe838a7878b170f6728d7e5d7517af" ldflags_dirs standard verify_py32
-install_package "setuptools-3.6" "https://pypi.python.org/packages/source/s/setuptools/setuptools-3.6.tar.gz#8f3a1dcdc14313c8334eb6af4f66ea0a" python
+install_package "setuptools-4.0" "https://pypi.python.org/packages/source/s/setuptools/setuptools-4.0.tar.gz#d7f08bf4fe55312f9f9fbe03d6642bce" python
 install_package "pip-1.5.6" "https://pypi.python.org/packages/source/p/pip/pip-1.5.6.tar.gz#01026f87978932060cc86c1dc527903e" python

plugins/python-build/share/python-build/3.2-dev

@@ -1,5 +1,5 @@
 require_cc
 install_package "readline-6.3" "http://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#33c8fb279e981274f485fd91da77e94a" standard --if has_broken_mac_readline
 install_hg "Python-3.2-dev" "https://bitbucket.org/mirror/cpython" "3.2" standard verify_py32
-install_package "setuptools-3.6" "https://pypi.python.org/packages/source/s/setuptools/setuptools-3.6.tar.gz#8f3a1dcdc14313c8334eb6af4f66ea0a" python
+install_package "setuptools-4.0" "https://pypi.python.org/packages/source/s/setuptools/setuptools-4.0.tar.gz#d7f08bf4fe55312f9f9fbe03d6642bce" python
 install_package "pip-1.5.6" "https://pypi.python.org/packages/source/p/pip/pip-1.5.6.tar.gz#01026f87978932060cc86c1dc527903e" python

plugins/python-build/share/python-build/3.2.1

@@ -1,5 +1,5 @@
 require_cc
 install_package "readline-6.3" "http://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#33c8fb279e981274f485fd91da77e94a" standard --if has_broken_mac_readline
 install_package "Python-3.2.1" "http://python.org/ftp/python/3.2.1/Python-3.2.1.tgz#6c2aa3481cadb7bdf74e625fffc352b2" ldflags_dirs standard verify_py32
-install_package "setuptools-3.6" "https://pypi.python.org/packages/source/s/setuptools/setuptools-3.6.tar.gz#8f3a1dcdc14313c8334eb6af4f66ea0a" python
+install_package "setuptools-4.0" "https://pypi.python.org/packages/source/s/setuptools/setuptools-4.0.tar.gz#d7f08bf4fe55312f9f9fbe03d6642bce" python
 install_package "pip-1.5.6" "https://pypi.python.org/packages/source/p/pip/pip-1.5.6.tar.gz#01026f87978932060cc86c1dc527903e" python

plugins/python-build/share/python-build/3.2.2

@@ -1,5 +1,5 @@
 require_cc
 install_package "readline-6.3" "http://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#33c8fb279e981274f485fd91da77e94a" standard --if has_broken_mac_readline
 install_package "Python-3.2.2" "http://python.org/ftp/python/3.2.2/Python-3.2.2.tgz#3c63a6d97333f4da35976b6a0755eb67" ldflags_dirs standard verify_py32
-install_package "setuptools-3.6" "https://pypi.python.org/packages/source/s/setuptools/setuptools-3.6.tar.gz#8f3a1dcdc14313c8334eb6af4f66ea0a" python
+install_package "setuptools-4.0" "https://pypi.python.org/packages/source/s/setuptools/setuptools-4.0.tar.gz#d7f08bf4fe55312f9f9fbe03d6642bce" python
 install_package "pip-1.5.6" "https://pypi.python.org/packages/source/p/pip/pip-1.5.6.tar.gz#01026f87978932060cc86c1dc527903e" python

plugins/python-build/share/python-build/3.2.3

@@ -1,5 +1,5 @@
 require_cc
 install_package "readline-6.3" "http://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#33c8fb279e981274f485fd91da77e94a" standard --if has_broken_mac_readline
 install_package "Python-3.2.3" "http://python.org/ftp/python/3.2.3/Python-3.2.3.tgz#dcf3a738e7028f1deb41b180bf0e2cbc" ldflags_dirs standard verify_py32
-install_package "setuptools-3.6" "https://pypi.python.org/packages/source/s/setuptools/setuptools-3.6.tar.gz#8f3a1dcdc14313c8334eb6af4f66ea0a" python
+install_package "setuptools-4.0" "https://pypi.python.org/packages/source/s/setuptools/setuptools-4.0.tar.gz#d7f08bf4fe55312f9f9fbe03d6642bce" python
 install_package "pip-1.5.6" "https://pypi.python.org/packages/source/p/pip/pip-1.5.6.tar.gz#01026f87978932060cc86c1dc527903e" python

plugins/python-build/share/python-build/3.2.4

@@ -1,5 +1,5 @@
 require_cc
 install_package "readline-6.3" "http://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#33c8fb279e981274f485fd91da77e94a" standard --if has_broken_mac_readline
 install_package "Python-3.2.4" "http://python.org/ftp/python/3.2.4/Python-3.2.4.tgz#3af05758d0bc2b1a27249e8d622c3e91" ldflags_dirs standard verify_py32
-install_package "setuptools-3.6" "https://pypi.python.org/packages/source/s/setuptools/setuptools-3.6.tar.gz#8f3a1dcdc14313c8334eb6af4f66ea0a" python
+install_package "setuptools-4.0" "https://pypi.python.org/packages/source/s/setuptools/setuptools-4.0.tar.gz#d7f08bf4fe55312f9f9fbe03d6642bce" python
 install_package "pip-1.5.6" "https://pypi.python.org/packages/source/p/pip/pip-1.5.6.tar.gz#01026f87978932060cc86c1dc527903e" python

plugins/python-build/share/python-build/3.2.5

@@ -1,5 +1,5 @@
 require_cc
 install_package "readline-6.3" "http://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#33c8fb279e981274f485fd91da77e94a" standard --if has_broken_mac_readline
 install_package "Python-3.2.5" "http://python.org/ftp/python/3.2.5/Python-3.2.5.tgz#ed8d5529d2aebc36b53f4e0a0c9e6728" ldflags_dirs standard verify_py32
-install_package "setuptools-3.6" "https://pypi.python.org/packages/source/s/setuptools/setuptools-3.6.tar.gz#8f3a1dcdc14313c8334eb6af4f66ea0a" python
+install_package "setuptools-4.0" "https://pypi.python.org/packages/source/s/setuptools/setuptools-4.0.tar.gz#d7f08bf4fe55312f9f9fbe03d6642bce" python
 install_package "pip-1.5.6" "https://pypi.python.org/packages/source/p/pip/pip-1.5.6.tar.gz#01026f87978932060cc86c1dc527903e" python

plugins/python-build/share/python-build/3.3-dev

@@ -1,5 +1,5 @@
 require_cc
 install_package "readline-6.3" "http://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#33c8fb279e981274f485fd91da77e94a" standard --if has_broken_mac_readline
 install_hg "Python-3.3-dev" "https://bitbucket.org/mirror/cpython" "3.3" standard verify_py33
-install_package "setuptools-3.6" "https://pypi.python.org/packages/source/s/setuptools/setuptools-3.6.tar.gz#8f3a1dcdc14313c8334eb6af4f66ea0a" python
+install_package "setuptools-4.0" "https://pypi.python.org/packages/source/s/setuptools/setuptools-4.0.tar.gz#d7f08bf4fe55312f9f9fbe03d6642bce" python
 install_package "pip-1.5.6" "https://pypi.python.org/packages/source/p/pip/pip-1.5.6.tar.gz#01026f87978932060cc86c1dc527903e" python

plugins/python-build/share/python-build/3.3.0

@@ -1,5 +1,5 @@
 require_cc
 install_package "readline-6.3" "http://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#33c8fb279e981274f485fd91da77e94a" standard --if has_broken_mac_readline
 install_package "Python-3.3.0" "http://python.org/ftp/python/3.3.0/Python-3.3.0.tgz#198a64f7a04d1d5e95ce2782d5fd8254" ldflags_dirs standard verify_py33
-install_package "setuptools-3.6" "https://pypi.python.org/packages/source/s/setuptools/setuptools-3.6.tar.gz#8f3a1dcdc14313c8334eb6af4f66ea0a" python
+install_package "setuptools-4.0" "https://pypi.python.org/packages/source/s/setuptools/setuptools-4.0.tar.gz#d7f08bf4fe55312f9f9fbe03d6642bce" python
 install_package "pip-1.5.6" "https://pypi.python.org/packages/source/p/pip/pip-1.5.6.tar.gz#01026f87978932060cc86c1dc527903e" python

plugins/python-build/share/python-build/3.3.1

@@ -1,5 +1,5 @@
 require_cc
 install_package "readline-6.3" "http://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#33c8fb279e981274f485fd91da77e94a" standard --if has_broken_mac_readline
 install_package "Python-3.3.1" "http://python.org/ftp/python/3.3.1/Python-3.3.1.tgz#c19bfd6ea252b61779a4f2996fb3b330" ldflags_dirs standard verify_py33
-install_package "setuptools-3.6" "https://pypi.python.org/packages/source/s/setuptools/setuptools-3.6.tar.gz#8f3a1dcdc14313c8334eb6af4f66ea0a" python
+install_package "setuptools-4.0" "https://pypi.python.org/packages/source/s/setuptools/setuptools-4.0.tar.gz#d7f08bf4fe55312f9f9fbe03d6642bce" python
 install_package "pip-1.5.6" "https://pypi.python.org/packages/source/p/pip/pip-1.5.6.tar.gz#01026f87978932060cc86c1dc527903e" python

plugins/python-build/share/python-build/3.3.2

@@ -1,5 +1,5 @@
 require_cc
 install_package "readline-6.3" "http://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#33c8fb279e981274f485fd91da77e94a" standard --if has_broken_mac_readline
 install_package "Python-3.3.2" "http://python.org/ftp/python/3.3.2/Python-3.3.2.tgz#0a2ea57f6184baf45b150aee53c0c8da" ldflags_dirs standard verify_py33
-install_package "setuptools-3.6" "https://pypi.python.org/packages/source/s/setuptools/setuptools-3.6.tar.gz#8f3a1dcdc14313c8334eb6af4f66ea0a" python
+install_package "setuptools-4.0" "https://pypi.python.org/packages/source/s/setuptools/setuptools-4.0.tar.gz#d7f08bf4fe55312f9f9fbe03d6642bce" python
 install_package "pip-1.5.6" "https://pypi.python.org/packages/source/p/pip/pip-1.5.6.tar.gz#01026f87978932060cc86c1dc527903e" python

plugins/python-build/share/python-build/3.3.3

@@ -1,5 +1,5 @@
 require_cc
 install_package "readline-6.3" "http://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#33c8fb279e981274f485fd91da77e94a" standard --if has_broken_mac_readline
 install_package "Python-3.3.3" "http://python.org/ftp/python/3.3.3/Python-3.3.3.tgz#831d59212568dc12c95df222865d3441" ldflags_dirs standard verify_py33
-install_package "setuptools-3.6" "https://pypi.python.org/packages/source/s/setuptools/setuptools-3.6.tar.gz#8f3a1dcdc14313c8334eb6af4f66ea0a" python
+install_package "setuptools-4.0" "https://pypi.python.org/packages/source/s/setuptools/setuptools-4.0.tar.gz#d7f08bf4fe55312f9f9fbe03d6642bce" python
 install_package "pip-1.5.6" "https://pypi.python.org/packages/source/p/pip/pip-1.5.6.tar.gz#01026f87978932060cc86c1dc527903e" python

plugins/python-build/share/python-build/3.3.4

@@ -1,5 +1,5 @@
 require_cc
 install_package "readline-6.3" "http://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#33c8fb279e981274f485fd91da77e94a" standard --if has_broken_mac_readline
 install_package "Python-3.3.4" "http://python.org/ftp/python/3.3.4/Python-3.3.4.tgz#9f7df0dde690132c63b1dd2b640ed3a6" ldflags_dirs standard verify_py33
-install_package "setuptools-3.6" "https://pypi.python.org/packages/source/s/setuptools/setuptools-3.6.tar.gz#8f3a1dcdc14313c8334eb6af4f66ea0a" python
+install_package "setuptools-4.0" "https://pypi.python.org/packages/source/s/setuptools/setuptools-4.0.tar.gz#d7f08bf4fe55312f9f9fbe03d6642bce" python
 install_package "pip-1.5.6" "https://pypi.python.org/packages/source/p/pip/pip-1.5.6.tar.gz#01026f87978932060cc86c1dc527903e" python

plugins/python-build/share/python-build/3.3.5

@@ -1,5 +1,5 @@
 require_cc
 install_package "readline-6.3" "http://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#33c8fb279e981274f485fd91da77e94a" standard --if has_broken_mac_readline
 install_package "Python-3.3.5" "http://python.org/ftp/python/3.3.5/Python-3.3.5.tgz#803a75927f8f241ca78633890c798021" ldflags_dirs standard verify_py33
-install_package "setuptools-3.6" "https://pypi.python.org/packages/source/s/setuptools/setuptools-3.6.tar.gz#8f3a1dcdc14313c8334eb6af4f66ea0a" python
+install_package "setuptools-4.0" "https://pypi.python.org/packages/source/s/setuptools/setuptools-4.0.tar.gz#d7f08bf4fe55312f9f9fbe03d6642bce" python
 install_package "pip-1.5.6" "https://pypi.python.org/packages/source/p/pip/pip-1.5.6.tar.gz#01026f87978932060cc86c1dc527903e" python

plugins/python-build/share/python-build/anaconda-2.0.0

@@ -0,0 +1,19 @@
+case "$(anaconda_architecture 2>/dev/null || true)" in
+"Linux-x86" )
+  install_script "Anaconda-2.0.0-Linux-x86" "http://repo.continuum.io/archive/Anaconda-2.0.0-Linux-x86.sh#48b6773dacf45e4df0da91cfc149bb23" "anaconda" verify_py27
+  ;;
+"Linux-x86_64" )
+  install_script "Anaconda-2.0.0-Linux-x86_64" "http://repo.continuum.io/archive/Anaconda-2.0.0-Linux-x86_64.sh#480ba8864579a457db91cd774bd373c1" "anaconda" verify_py27
+  ;;
+"MacOSX-x86_64" )
+  install_script "Anaconda-2.0.0-MacOSX-x86_64" "http://repo.continuum.io/archive/Anaconda-2.0.0-MacOSX-x86_64.sh#ec288bc9901facac5a1e098ded8c9936" "anaconda" verify_py27
+  ;;
+* )
+  { echo
+    colorize 1 "ERROR"
+    echo ": The binary distribution of Anaconda is not available for $(anaconda_architecture 2>/dev/null || true)."
+    echo
+  } >&2
+  exit 1
+  ;;
+esac

plugins/python-build/share/python-build/anaconda3-2.0.0

@@ -0,0 +1,19 @@
+case "$(anaconda_architecture 2>/dev/null || true)" in
+"Linux-x86" )
+  install_script "Anaconda3-2.0.0-Linux-x86" "http://repo.continuum.io/anaconda3/Anaconda3-2.0.0-Linux-x86.sh#860a11c39e58bb574bad5be9d44e2063" "anaconda" verify_py34
+  ;;
+"Linux-x86_64" )
+  install_script "Anaconda3-2.0.0-Linux-x86_64" "http://repo.continuum.io/anaconda3/Anaconda3-2.0.0-Linux-x86_64.sh#c9af4bee8d2da4d74de0d02400ac1c10" "anaconda" verify_py34
+  ;;
+"MacOSX-x86_64" )
+  install_script "Anaconda3-2.0.0-MacOSX-x86_64" "http://repo.continuum.io/anaconda3/Anaconda3-2.0.0-MacOSX-x86_64.sh#ba8d37fdafb2381585ddb24bde34b9ff" "anaconda" verify_py34
+  ;;
+* )
+  { echo
+    colorize 1 "ERROR"
+    echo ": The binary distribution of Anaconda3 is not available for $(anaconda_architecture 2>/dev/null || true)."
+    echo
+  } >&2
+  exit 1
+  ;;
+esac

plugins/python-build/share/python-build/jython-2.7-beta1

@@ -1,6 +1,6 @@
 require_java
 install_jar "jython-2.7-beta1" "http://search.maven.org/remotecontent?filepath=org/python/jython-installer/2.7-b1/jython-installer-2.7-b1.jar" jython
-install_package "setuptools-3.6" "https://pypi.python.org/packages/source/s/setuptools/setuptools-3.6.tar.gz#8f3a1dcdc14313c8334eb6af4f66ea0a" python
+install_package "setuptools-4.0" "https://pypi.python.org/packages/source/s/setuptools/setuptools-4.0.tar.gz#d7f08bf4fe55312f9f9fbe03d6642bce" python
 # pip (>= 1.3) does not work properly since it uses HTTPS for downloads
 # * https://github.com/yyuu/pyenv/issues/15
 install_package "pip-1.2.1" "https://pypi.python.org/packages/source/p/pip/pip-1.2.1.tar.gz#db8a6d8a4564d3dc7f337ebed67b1a85" python

plugins/python-build/share/python-build/jython-2.7-beta2

@@ -1,6 +1,6 @@
 require_java
-install_jar "jython-2.7-beta2" "http://search.maven.org/remotecontent?filepath=org/python/jython-installer/2.7-b1/jython-installer-2.7-b1.jar" jython
-install_package "setuptools-3.6" "https://pypi.python.org/packages/source/s/setuptools/setuptools-3.6.tar.gz#8f3a1dcdc14313c8334eb6af4f66ea0a" python
+install_jar "jython-2.7-beta2" "http://search.maven.org/remotecontent?filepath=org/python/jython-installer/2.7-b2/jython-installer-2.7-b2.jar" jython
+install_package "setuptools-4.0" "https://pypi.python.org/packages/source/s/setuptools/setuptools-4.0.tar.gz#d7f08bf4fe55312f9f9fbe03d6642bce" python
 # pip (>= 1.3) does not work properly since it uses HTTPS for downloads
 # * https://github.com/yyuu/pyenv/issues/15
 install_package "pip-1.2.1" "https://pypi.python.org/packages/source/p/pip/pip-1.2.1.tar.gz#db8a6d8a4564d3dc7f337ebed67b1a85" python

plugins/python-build/share/python-build/jython-dev

@@ -1,6 +1,6 @@
 require_java
 install_hg "jython-dev" "http://hg.python.org/jython" "default" jython_builder
-install_package "setuptools-3.6" "https://pypi.python.org/packages/source/s/setuptools/setuptools-3.6.tar.gz#8f3a1dcdc14313c8334eb6af4f66ea0a" python
+install_package "setuptools-4.0" "https://pypi.python.org/packages/source/s/setuptools/setuptools-4.0.tar.gz#d7f08bf4fe55312f9f9fbe03d6642bce" python
 # pip (>= 1.3) does not work properly since it uses HTTPS for downloads
 # * https://github.com/yyuu/pyenv/issues/15
 install_package "pip-1.2.1" "https://pypi.python.org/packages/source/p/pip/pip-1.2.1.tar.gz#db8a6d8a4564d3dc7f337ebed67b1a85" python

plugins/python-build/share/python-build/pypy-1.5

@@ -23,5 +23,5 @@ case "$(pypy_architecture 2>/dev/null || true)" in
   ;;
 esac
 
-install_package "setuptools-3.6" "https://pypi.python.org/packages/source/s/setuptools/setuptools-3.6.tar.gz#8f3a1dcdc14313c8334eb6af4f66ea0a" python
+install_package "setuptools-4.0" "https://pypi.python.org/packages/source/s/setuptools/setuptools-4.0.tar.gz#d7f08bf4fe55312f9f9fbe03d6642bce" python
 install_package "pip-1.5.6" "https://pypi.python.org/packages/source/p/pip/pip-1.5.6.tar.gz#01026f87978932060cc86c1dc527903e" python

plugins/python-build/share/python-build/pypy-1.5-src

@@ -1,4 +1,4 @@
 require_gcc
 install_package "pypy-1.5-src" "https://bitbucket.org/pypy/pypy/downloads/pypy-1.5-src.tar.bz2" "pypy_builder" verify_py27
-install_package "setuptools-3.6" "https://pypi.python.org/packages/source/s/setuptools/setuptools-3.6.tar.gz#8f3a1dcdc14313c8334eb6af4f66ea0a" python
+install_package "setuptools-4.0" "https://pypi.python.org/packages/source/s/setuptools/setuptools-4.0.tar.gz#d7f08bf4fe55312f9f9fbe03d6642bce" python
 install_package "pip-1.5.6" "https://pypi.python.org/packages/source/p/pip/pip-1.5.6.tar.gz#01026f87978932060cc86c1dc527903e" python

plugins/python-build/share/python-build/pypy-1.6

@@ -22,5 +22,5 @@ case "$(pypy_architecture 2>/dev/null || true)" in
   ;;
 esac
 
-install_package "setuptools-3.6" "https://pypi.python.org/packages/source/s/setuptools/setuptools-3.6.tar.gz#8f3a1dcdc14313c8334eb6af4f66ea0a" python
+install_package "setuptools-4.0" "https://pypi.python.org/packages/source/s/setuptools/setuptools-4.0.tar.gz#d7f08bf4fe55312f9f9fbe03d6642bce" python
 install_package "pip-1.5.6" "https://pypi.python.org/packages/source/p/pip/pip-1.5.6.tar.gz#01026f87978932060cc86c1dc527903e" python

plugins/python-build/share/python-build/pypy-1.7

@@ -23,5 +23,5 @@ case "$(pypy_architecture 2>/dev/null || true)" in
   ;;
 esac
 
-install_package "setuptools-3.6" "https://pypi.python.org/packages/source/s/setuptools/setuptools-3.6.tar.gz#8f3a1dcdc14313c8334eb6af4f66ea0a" python
+install_package "setuptools-4.0" "https://pypi.python.org/packages/source/s/setuptools/setuptools-4.0.tar.gz#d7f08bf4fe55312f9f9fbe03d6642bce" python
 install_package "pip-1.5.6" "https://pypi.python.org/packages/source/p/pip/pip-1.5.6.tar.gz#01026f87978932060cc86c1dc527903e" python

plugins/python-build/share/python-build/pypy-1.7-dev

@@ -1,4 +1,4 @@
 require_gcc
 install_hg "pypy-1.7-dev" "https://bitbucket.org/pypy/pypy" "release-1.7.x" "pypy_builder" verify_py27
-install_package "setuptools-3.6" "https://pypi.python.org/packages/source/s/setuptools/setuptools-3.6.tar.gz#8f3a1dcdc14313c8334eb6af4f66ea0a" python
+install_package "setuptools-4.0" "https://pypi.python.org/packages/source/s/setuptools/setuptools-4.0.tar.gz#d7f08bf4fe55312f9f9fbe03d6642bce" python
 install_package "pip-1.5.6" "https://pypi.python.org/packages/source/p/pip/pip-1.5.6.tar.gz#01026f87978932060cc86c1dc527903e" python

plugins/python-build/share/python-build/pypy-1.8

@@ -23,5 +23,5 @@ case "$(pypy_architecture 2>/dev/null || true)" in
   ;;
 esac
 
-install_package "setuptools-3.6" "https://pypi.python.org/packages/source/s/setuptools/setuptools-3.6.tar.gz#8f3a1dcdc14313c8334eb6af4f66ea0a" python
+install_package "setuptools-4.0" "https://pypi.python.org/packages/source/s/setuptools/setuptools-4.0.tar.gz#d7f08bf4fe55312f9f9fbe03d6642bce" python
 install_package "pip-1.5.6" "https://pypi.python.org/packages/source/p/pip/pip-1.5.6.tar.gz#01026f87978932060cc86c1dc527903e" python

plugins/python-build/share/python-build/pypy-1.8-dev

@@ -1,4 +1,4 @@
 require_gcc
 install_hg "pypy-1.8-dev" "https://bitbucket.org/pypy/pypy" "release-1.8.x" "pypy_builder" verify_py27
-install_package "setuptools-3.6" "https://pypi.python.org/packages/source/s/setuptools/setuptools-3.6.tar.gz#8f3a1dcdc14313c8334eb6af4f66ea0a" python
+install_package "setuptools-4.0" "https://pypi.python.org/packages/source/s/setuptools/setuptools-4.0.tar.gz#d7f08bf4fe55312f9f9fbe03d6642bce" python
 install_package "pip-1.5.6" "https://pypi.python.org/packages/source/p/pip/pip-1.5.6.tar.gz#01026f87978932060cc86c1dc527903e" python

plugins/python-build/share/python-build/pypy-1.9

@@ -23,5 +23,5 @@ case "$(pypy_architecture 2>/dev/null || true)" in
   ;;
 esac
 
-install_package "setuptools-3.6" "https://pypi.python.org/packages/source/s/setuptools/setuptools-3.6.tar.gz#8f3a1dcdc14313c8334eb6af4f66ea0a" python
+install_package "setuptools-4.0" "https://pypi.python.org/packages/source/s/setuptools/setuptools-4.0.tar.gz#d7f08bf4fe55312f9f9fbe03d6642bce" python
 install_package "pip-1.5.6" "https://pypi.python.org/packages/source/p/pip/pip-1.5.6.tar.gz#01026f87978932060cc86c1dc527903e" python

plugins/python-build/share/python-build/pypy-1.9-dev

@@ -1,4 +1,4 @@
 require_gcc
 install_hg "pypy-1.9-dev" "https://bitbucket.org/pypy/pypy" "release-1.9.x" "pypy_builder" verify_py27
-install_package "setuptools-3.6" "https://pypi.python.org/packages/source/s/setuptools/setuptools-3.6.tar.gz#8f3a1dcdc14313c8334eb6af4f66ea0a" python
+install_package "setuptools-4.0" "https://pypi.python.org/packages/source/s/setuptools/setuptools-4.0.tar.gz#d7f08bf4fe55312f9f9fbe03d6642bce" python
 install_package "pip-1.5.6" "https://pypi.python.org/packages/source/p/pip/pip-1.5.6.tar.gz#01026f87978932060cc86c1dc527903e" python

plugins/python-build/share/python-build/pypy-2.0

@@ -45,5 +45,5 @@ case "$(pypy_architecture 2>/dev/null || true)" in
   ;;
 esac
 
-install_package "setuptools-3.6" "https://pypi.python.org/packages/source/s/setuptools/setuptools-3.6.tar.gz#8f3a1dcdc14313c8334eb6af4f66ea0a" python
+install_package "setuptools-4.0" "https://pypi.python.org/packages/source/s/setuptools/setuptools-4.0.tar.gz#d7f08bf4fe55312f9f9fbe03d6642bce" python
 install_package "pip-1.5.6" "https://pypi.python.org/packages/source/p/pip/pip-1.5.6.tar.gz#01026f87978932060cc86c1dc527903e" python

plugins/python-build/share/python-build/pypy-2.0-dev

@@ -1,4 +1,4 @@
 require_gcc
 install_hg "pypy-2.0-dev" "https://bitbucket.org/pypy/pypy" "release-2.0.x" "pypy_builder" verify_py27
-install_package "setuptools-3.6" "https://pypi.python.org/packages/source/s/setuptools/setuptools-3.6.tar.gz#8f3a1dcdc14313c8334eb6af4f66ea0a" python
+install_package "setuptools-4.0" "https://pypi.python.org/packages/source/s/setuptools/setuptools-4.0.tar.gz#d7f08bf4fe55312f9f9fbe03d6642bce" python
 install_package "pip-1.5.6" "https://pypi.python.org/packages/source/p/pip/pip-1.5.6.tar.gz#01026f87978932060cc86c1dc527903e" python

plugins/python-build/share/python-build/pypy-2.0-src

@@ -1,4 +1,4 @@
 require_gcc
 install_package "pypy-2.0-src" "https://bitbucket.org/pypy/pypy/downloads/pypy-2.0-src.tar.bz2#4dc82e2240dd2b5be313119672988538" "pypy_builder" verify_py27
-install_package "setuptools-3.6" "https://pypi.python.org/packages/source/s/setuptools/setuptools-3.6.tar.gz#8f3a1dcdc14313c8334eb6af4f66ea0a" python
+install_package "setuptools-4.0" "https://pypi.python.org/packages/source/s/setuptools/setuptools-4.0.tar.gz#d7f08bf4fe55312f9f9fbe03d6642bce" python
 install_package "pip-1.5.6" "https://pypi.python.org/packages/source/p/pip/pip-1.5.6.tar.gz#01026f87978932060cc86c1dc527903e" python

plugins/python-build/share/python-build/pypy-2.0.1

@@ -37,5 +37,5 @@ case "$(pypy_architecture 2>/dev/null || true)" in
   ;;
 esac
 
-install_package "setuptools-3.6" "https://pypi.python.org/packages/source/s/setuptools/setuptools-3.6.tar.gz#8f3a1dcdc14313c8334eb6af4f66ea0a" python
+install_package "setuptools-4.0" "https://pypi.python.org/packages/source/s/setuptools/setuptools-4.0.tar.gz#d7f08bf4fe55312f9f9fbe03d6642bce" python
 install_package "pip-1.5.6" "https://pypi.python.org/packages/source/p/pip/pip-1.5.6.tar.gz#01026f87978932060cc86c1dc527903e" python

plugins/python-build/share/python-build/pypy-2.0.1-src

@@ -1,4 +1,4 @@
 require_gcc
 install_package "pypy-2.0.1-src" "https://bitbucket.org/pypy/pypy/downloads/pypy-2.0.1-src.tar.bz2#34072be1eeb63f9d37cf387e58aae81d" "pypy_builder" verify_py27
-install_package "setuptools-3.6" "https://pypi.python.org/packages/source/s/setuptools/setuptools-3.6.tar.gz#8f3a1dcdc14313c8334eb6af4f66ea0a" python
+install_package "setuptools-4.0" "https://pypi.python.org/packages/source/s/setuptools/setuptools-4.0.tar.gz#d7f08bf4fe55312f9f9fbe03d6642bce" python
 install_package "pip-1.5.6" "https://pypi.python.org/packages/source/p/pip/pip-1.5.6.tar.gz#01026f87978932060cc86c1dc527903e" python

plugins/python-build/share/python-build/pypy-2.0.2

@@ -37,5 +37,5 @@ case "$(pypy_architecture 2>/dev/null || true)" in
   ;;
 esac
 
-install_package "setuptools-3.6" "https://pypi.python.org/packages/source/s/setuptools/setuptools-3.6.tar.gz#8f3a1dcdc14313c8334eb6af4f66ea0a" python
+install_package "setuptools-4.0" "https://pypi.python.org/packages/source/s/setuptools/setuptools-4.0.tar.gz#d7f08bf4fe55312f9f9fbe03d6642bce" python
 install_package "pip-1.5.6" "https://pypi.python.org/packages/source/p/pip/pip-1.5.6.tar.gz#01026f87978932060cc86c1dc527903e" python

plugins/python-build/share/python-build/pypy-2.0.2-src

@@ -1,4 +1,4 @@
 require_gcc
 install_package "pypy-2.0.2-src" "https://bitbucket.org/pypy/pypy/downloads/pypy-2.0.2-src.tar.bz2#c26662e348159b460057548ddaf35333" "pypy_builder" verify_py27
-install_package "setuptools-3.6" "https://pypi.python.org/packages/source/s/setuptools/setuptools-3.6.tar.gz#8f3a1dcdc14313c8334eb6af4f66ea0a" python
+install_package "setuptools-4.0" "https://pypi.python.org/packages/source/s/setuptools/setuptools-4.0.tar.gz#d7f08bf4fe55312f9f9fbe03d6642bce" python
 install_package "pip-1.5.6" "https://pypi.python.org/packages/source/p/pip/pip-1.5.6.tar.gz#01026f87978932060cc86c1dc527903e" python

plugins/python-build/share/python-build/pypy-2.1

@@ -49,5 +49,5 @@ case "$(pypy_architecture 2>/dev/null || true)" in
   ;;
 esac
 
-install_package "setuptools-3.6" "https://pypi.python.org/packages/source/s/setuptools/setuptools-3.6.tar.gz#8f3a1dcdc14313c8334eb6af4f66ea0a" python
+install_package "setuptools-4.0" "https://pypi.python.org/packages/source/s/setuptools/setuptools-4.0.tar.gz#d7f08bf4fe55312f9f9fbe03d6642bce" python
 install_package "pip-1.5.6" "https://pypi.python.org/packages/source/p/pip/pip-1.5.6.tar.gz#01026f87978932060cc86c1dc527903e" python

plugins/python-build/share/python-build/pypy-2.1-src

@@ -1,4 +1,4 @@
 require_gcc
 install_package "pypy-2.1-src" "https://bitbucket.org/pypy/pypy/downloads/pypy-2.1-src.tar.bz2#7c43cd95aa37a7f0ca2465ed930646c0" "pypy_builder" verify_py27
-install_package "setuptools-3.6" "https://pypi.python.org/packages/source/s/setuptools/setuptools-3.6.tar.gz#8f3a1dcdc14313c8334eb6af4f66ea0a" python
+install_package "setuptools-4.0" "https://pypi.python.org/packages/source/s/setuptools/setuptools-4.0.tar.gz#d7f08bf4fe55312f9f9fbe03d6642bce" python
 install_package "pip-1.5.6" "https://pypi.python.org/packages/source/p/pip/pip-1.5.6.tar.gz#01026f87978932060cc86c1dc527903e" python

plugins/python-build/share/python-build/pypy-2.2

@@ -49,5 +49,5 @@ case "$(pypy_architecture 2>/dev/null || true)" in
   ;;
 esac
 
-install_package "setuptools-3.6" "https://pypi.python.org/packages/source/s/setuptools/setuptools-3.6.tar.gz#8f3a1dcdc14313c8334eb6af4f66ea0a" python
+install_package "setuptools-4.0" "https://pypi.python.org/packages/source/s/setuptools/setuptools-4.0.tar.gz#d7f08bf4fe55312f9f9fbe03d6642bce" python
 install_package "pip-1.5.6" "https://pypi.python.org/packages/source/p/pip/pip-1.5.6.tar.gz#01026f87978932060cc86c1dc527903e" python

plugins/python-build/share/python-build/pypy-2.2-src

@@ -1,4 +1,4 @@
 require_gcc
 install_package "pypy-2.2-src" "https://bitbucket.org/pypy/pypy/downloads/pypy-2.2-src.tar.bz2#5a5a3822605d7d811066b1b279da3c6e" "pypy_builder" verify_py27
-install_package "setuptools-3.6" "https://pypi.python.org/packages/source/s/setuptools/setuptools-3.6.tar.gz#8f3a1dcdc14313c8334eb6af4f66ea0a" python
+install_package "setuptools-4.0" "https://pypi.python.org/packages/source/s/setuptools/setuptools-4.0.tar.gz#d7f08bf4fe55312f9f9fbe03d6642bce" python
 install_package "pip-1.5.6" "https://pypi.python.org/packages/source/p/pip/pip-1.5.6.tar.gz#01026f87978932060cc86c1dc527903e" python

plugins/python-build/share/python-build/pypy-2.2.1

@@ -49,5 +49,5 @@ case "$(pypy_architecture 2>/dev/null || true)" in
   ;;
 esac
 
-install_package "setuptools-3.6" "https://pypi.python.org/packages/source/s/setuptools/setuptools-3.6.tar.gz#8f3a1dcdc14313c8334eb6af4f66ea0a" python
+install_package "setuptools-4.0" "https://pypi.python.org/packages/source/s/setuptools/setuptools-4.0.tar.gz#d7f08bf4fe55312f9f9fbe03d6642bce" python
 install_package "pip-1.5.6" "https://pypi.python.org/packages/source/p/pip/pip-1.5.6.tar.gz#01026f87978932060cc86c1dc527903e" python

plugins/python-build/share/python-build/pypy-2.2.1-src

@@ -1,4 +1,4 @@
 require_gcc
 install_package "pypy-2.2.1-src" "https://bitbucket.org/pypy/pypy/downloads/pypy-2.2.1-src.tar.bz2#7ec9f48702323f9e93654ba73dd46720" "pypy_builder" verify_py27
-install_package "setuptools-3.6" "https://pypi.python.org/packages/source/s/setuptools/setuptools-3.6.tar.gz#8f3a1dcdc14313c8334eb6af4f66ea0a" python
+install_package "setuptools-4.0" "https://pypi.python.org/packages/source/s/setuptools/setuptools-4.0.tar.gz#d7f08bf4fe55312f9f9fbe03d6642bce" python
 install_package "pip-1.5.6" "https://pypi.python.org/packages/source/p/pip/pip-1.5.6.tar.gz#01026f87978932060cc86c1dc527903e" python

plugins/python-build/share/python-build/pypy-2.3

@@ -49,5 +49,5 @@ case "$(pypy_architecture 2>/dev/null || true)" in
   ;;
 esac
 
-install_package "setuptools-3.6" "https://pypi.python.org/packages/source/s/setuptools/setuptools-3.6.tar.gz#8f3a1dcdc14313c8334eb6af4f66ea0a" python
+install_package "setuptools-4.0" "https://pypi.python.org/packages/source/s/setuptools/setuptools-4.0.tar.gz#d7f08bf4fe55312f9f9fbe03d6642bce" python
 install_package "pip-1.5.6" "https://pypi.python.org/packages/source/p/pip/pip-1.5.6.tar.gz#01026f87978932060cc86c1dc527903e" python

plugins/python-build/share/python-build/pypy-2.3-src

@@ -1,4 +1,4 @@
 require_gcc
 install_package "pypy-pypy-394146e9bb67" "https://bitbucket.org/pypy/pypy/downloads/pypy-2.3-src.tar.bz2#c93a8e47f3b3109af2f66d2bd766eb97" "pypy_builder" verify_py27
-install_package "setuptools-3.6" "https://pypi.python.org/packages/source/s/setuptools/setuptools-3.6.tar.gz#8f3a1dcdc14313c8334eb6af4f66ea0a" python
+install_package "setuptools-4.0" "https://pypi.python.org/packages/source/s/setuptools/setuptools-4.0.tar.gz#d7f08bf4fe55312f9f9fbe03d6642bce" python
 install_package "pip-1.5.6" "https://pypi.python.org/packages/source/p/pip/pip-1.5.6.tar.gz#01026f87978932060cc86c1dc527903e" python

plugins/python-build/share/python-build/pypy-dev

@@ -1,4 +1,4 @@
 require_gcc
 install_hg "pypy-dev" "https://bitbucket.org/pypy/pypy" "default" "pypy_builder" verify_py27
-install_package "setuptools-3.6" "https://pypi.python.org/packages/source/s/setuptools/setuptools-3.6.tar.gz#8f3a1dcdc14313c8334eb6af4f66ea0a" python
+install_package "setuptools-4.0" "https://pypi.python.org/packages/source/s/setuptools/setuptools-4.0.tar.gz#d7f08bf4fe55312f9f9fbe03d6642bce" python
 install_package "pip-1.5.6" "https://pypi.python.org/packages/source/p/pip/pip-1.5.6.tar.gz#01026f87978932060cc86c1dc527903e" python

plugins/python-build/share/python-build/pypy3-2.1-beta1

@@ -49,5 +49,5 @@ case "$(pypy_architecture 2>/dev/null || true)" in
   ;;
 esac
 
-install_package "setuptools-3.6" "https://pypi.python.org/packages/source/s/setuptools/setuptools-3.6.tar.gz#8f3a1dcdc14313c8334eb6af4f66ea0a" python
+install_package "setuptools-4.0" "https://pypi.python.org/packages/source/s/setuptools/setuptools-4.0.tar.gz#d7f08bf4fe55312f9f9fbe03d6642bce" python
 install_package "pip-1.5.6" "https://pypi.python.org/packages/source/p/pip/pip-1.5.6.tar.gz#01026f87978932060cc86c1dc527903e" python

plugins/python-build/share/python-build/pypy3-2.1-beta1-src

@@ -1,4 +1,4 @@
 require_gcc
 install_package "pypy3-2.1-beta1-src" "https://bitbucket.org/pypy/pypy/downloads/pypy3-2.1-beta1-src.tar.bz2#bc2013d1927dc1c0c91228e566abd8da" "pypy_builder" verify_py32
-install_package "setuptools-3.6" "https://pypi.python.org/packages/source/s/setuptools/setuptools-3.6.tar.gz#8f3a1dcdc14313c8334eb6af4f66ea0a" python
+install_package "setuptools-4.0" "https://pypi.python.org/packages/source/s/setuptools/setuptools-4.0.tar.gz#d7f08bf4fe55312f9f9fbe03d6642bce" python
 install_package "pip-1.5.6" "https://pypi.python.org/packages/source/p/pip/pip-1.5.6.tar.gz#01026f87978932060cc86c1dc527903e" python

plugins/python-build/share/python-build/pypy3-dev

@@ -1,4 +1,4 @@
 require_gcc
 install_hg "pypy3-dev" "https://bitbucket.org/pypy/pypy" "py3k" "pypy_builder" verify_py32
-install_package "setuptools-3.6" "https://pypi.python.org/packages/source/s/setuptools/setuptools-3.6.tar.gz#8f3a1dcdc14313c8334eb6af4f66ea0a" python
+install_package "setuptools-4.0" "https://pypi.python.org/packages/source/s/setuptools/setuptools-4.0.tar.gz#d7f08bf4fe55312f9f9fbe03d6642bce" python
 install_package "pip-1.5.6" "https://pypi.python.org/packages/source/p/pip/pip-1.5.6.tar.gz#01026f87978932060cc86c1dc527903e" python

plugins/python-build/share/python-build/stackless-2.7-dev

@@ -1,5 +1,5 @@
 require_cc
 install_package "readline-6.3" "http://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#33c8fb279e981274f485fd91da77e94a" standard --if has_broken_mac_readline
 install_hg "stackless-2.7-dev" "http://hg.python.org/stackless" "2.7-slp" standard verify_py27
-install_package "setuptools-3.6" "https://pypi.python.org/packages/source/s/setuptools/setuptools-3.6.tar.gz#8f3a1dcdc14313c8334eb6af4f66ea0a" python
+install_package "setuptools-4.0" "https://pypi.python.org/packages/source/s/setuptools/setuptools-4.0.tar.gz#d7f08bf4fe55312f9f9fbe03d6642bce" python
 install_package "pip-1.5.6" "https://pypi.python.org/packages/source/p/pip/pip-1.5.6.tar.gz#01026f87978932060cc86c1dc527903e" python

plugins/python-build/share/python-build/stackless-2.7.2

@@ -1,5 +1,5 @@
 require_cc
 install_package "readline-6.3" "http://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#33c8fb279e981274f485fd91da77e94a" standard --if has_broken_mac_readline
 install_package "stackless-272-export" "http://www.stackless.com/binaries/stackless-272-export.tar.bz2#79a718db998f2cdd95478d2cb54d56f2" ldflags_dirs standard verify_py27
-install_package "setuptools-3.6" "https://pypi.python.org/packages/source/s/setuptools/setuptools-3.6.tar.gz#8f3a1dcdc14313c8334eb6af4f66ea0a" python
+install_package "setuptools-4.0" "https://pypi.python.org/packages/source/s/setuptools/setuptools-4.0.tar.gz#d7f08bf4fe55312f9f9fbe03d6642bce" python
 install_package "pip-1.5.6" "https://pypi.python.org/packages/source/p/pip/pip-1.5.6.tar.gz#01026f87978932060cc86c1dc527903e" python

plugins/python-build/share/python-build/stackless-2.7.3

@@ -1,5 +1,5 @@
 require_cc
 install_package "readline-6.3" "http://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#33c8fb279e981274f485fd91da77e94a" standard --if has_broken_mac_readline
 install_package "stackless-273-export" "http://www.stackless.com/binaries/stackless-273-export.tar.bz2#1f2a9bc68b0712477fb36e6e1491a7ca" ldflags_dirs standard verify_py27
-install_package "setuptools-3.6" "https://pypi.python.org/packages/source/s/setuptools/setuptools-3.6.tar.gz#8f3a1dcdc14313c8334eb6af4f66ea0a" python
+install_package "setuptools-4.0" "https://pypi.python.org/packages/source/s/setuptools/setuptools-4.0.tar.gz#d7f08bf4fe55312f9f9fbe03d6642bce" python
 install_package "pip-1.5.6" "https://pypi.python.org/packages/source/p/pip/pip-1.5.6.tar.gz#01026f87978932060cc86c1dc527903e" python

plugins/python-build/share/python-build/stackless-2.7.4

@@ -1,5 +1,5 @@
 require_cc
 install_package "readline-6.3" "http://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#33c8fb279e981274f485fd91da77e94a" standard --if has_broken_mac_readline
 install_package "stackless-274-export" "http://www.stackless.com/binaries/stackless-274-export.tar.bz2#f611b877720dd25cd466ba3e6acd7e4a" ldflags_dirs standard verify_py27
-install_package "setuptools-3.6" "https://pypi.python.org/packages/source/s/setuptools/setuptools-3.6.tar.gz#8f3a1dcdc14313c8334eb6af4f66ea0a" python
+install_package "setuptools-4.0" "https://pypi.python.org/packages/source/s/setuptools/setuptools-4.0.tar.gz#d7f08bf4fe55312f9f9fbe03d6642bce" python
 install_package "pip-1.5.6" "https://pypi.python.org/packages/source/p/pip/pip-1.5.6.tar.gz#01026f87978932060cc86c1dc527903e" python

plugins/python-build/share/python-build/stackless-2.7.5

@@ -1,5 +1,5 @@
 require_cc
 install_package "readline-6.3" "http://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#33c8fb279e981274f485fd91da77e94a" standard --if has_broken_mac_readline
 install_package "stackless-275-export" "http://www.stackless.com/binaries/stackless-275-export.tar.bz2#1b6d603d07d872168aaeb9a51ef8fc84" ldflags_dirs standard verify_py27
-install_package "setuptools-3.6" "https://pypi.python.org/packages/source/s/setuptools/setuptools-3.6.tar.gz#8f3a1dcdc14313c8334eb6af4f66ea0a" python
+install_package "setuptools-4.0" "https://pypi.python.org/packages/source/s/setuptools/setuptools-4.0.tar.gz#d7f08bf4fe55312f9f9fbe03d6642bce" python
 install_package "pip-1.5.6" "https://pypi.python.org/packages/source/p/pip/pip-1.5.6.tar.gz#01026f87978932060cc86c1dc527903e" python

plugins/python-build/share/python-build/stackless-2.7.6

@@ -1,5 +1,5 @@
 require_cc
 install_package "readline-6.3" "http://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#33c8fb279e981274f485fd91da77e94a" standard --if has_broken_mac_readline
 install_package "stackless-276-export" "http://www.stackless.com/binaries/stackless-276-export.tar.bz2#8325397efc327d9836c31931cce7bd62" ldflags_dirs standard verify_py27
-install_package "setuptools-3.6" "https://pypi.python.org/packages/source/s/setuptools/setuptools-3.6.tar.gz#8f3a1dcdc14313c8334eb6af4f66ea0a" python
+install_package "setuptools-4.0" "https://pypi.python.org/packages/source/s/setuptools/setuptools-4.0.tar.gz#d7f08bf4fe55312f9f9fbe03d6642bce" python
 install_package "pip-1.5.6" "https://pypi.python.org/packages/source/p/pip/pip-1.5.6.tar.gz#01026f87978932060cc86c1dc527903e" python

plugins/python-build/share/python-build/stackless-3.2-dev

@@ -1,5 +1,5 @@
 require_cc
 install_package "readline-6.3" "http://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#33c8fb279e981274f485fd91da77e94a" standard --if has_broken_mac_readline
 install_hg "stackless-3.2-dev" "http://hg.python.org/stackless" "3.2-slp" standard verify_py32
-install_package "setuptools-3.6" "https://pypi.python.org/packages/source/s/setuptools/setuptools-3.6.tar.gz#8f3a1dcdc14313c8334eb6af4f66ea0a" python
+install_package "setuptools-4.0" "https://pypi.python.org/packages/source/s/setuptools/setuptools-4.0.tar.gz#d7f08bf4fe55312f9f9fbe03d6642bce" python
 install_package "pip-1.5.6" "https://pypi.python.org/packages/source/p/pip/pip-1.5.6.tar.gz#01026f87978932060cc86c1dc527903e" python

plugins/python-build/share/python-build/stackless-3.2.2

@@ -1,5 +1,5 @@
 require_cc
 install_package "readline-6.3" "http://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#33c8fb279e981274f485fd91da77e94a" standard --if has_broken_mac_readline
 install_package "stackless-322-export" "http://www.stackless.com/binaries/stackless-322-export.tar.bz2#3a3edcfb4240bdcc580cec2baea60af4" ldflags_dirs standard verify_py32
-install_package "setuptools-3.6" "https://pypi.python.org/packages/source/s/setuptools/setuptools-3.6.tar.gz#8f3a1dcdc14313c8334eb6af4f66ea0a" python
+install_package "setuptools-4.0" "https://pypi.python.org/packages/source/s/setuptools/setuptools-4.0.tar.gz#d7f08bf4fe55312f9f9fbe03d6642bce" python
 install_package "pip-1.5.6" "https://pypi.python.org/packages/source/p/pip/pip-1.5.6.tar.gz#01026f87978932060cc86c1dc527903e" python

plugins/python-build/share/python-build/stackless-3.2.5

@@ -1,5 +1,5 @@
 require_cc
 install_package "readline-6.3" "http://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#33c8fb279e981274f485fd91da77e94a" standard --if has_broken_mac_readline
 install_package "stackless-325-export" "http://www.stackless.com/binaries/stackless-325-export.tar.bz2#39eebb5701ca0afd0f73507fbfeda7fb" ldflags_dirs standard verify_py32
-install_package "setuptools-3.6" "https://pypi.python.org/packages/source/s/setuptools/setuptools-3.6.tar.gz#8f3a1dcdc14313c8334eb6af4f66ea0a" python
+install_package "setuptools-4.0" "https://pypi.python.org/packages/source/s/setuptools/setuptools-4.0.tar.gz#d7f08bf4fe55312f9f9fbe03d6642bce" python
 install_package "pip-1.5.6" "https://pypi.python.org/packages/source/p/pip/pip-1.5.6.tar.gz#01026f87978932060cc86c1dc527903e" python

plugins/python-build/share/python-build/stackless-3.3-dev

@@ -1,5 +1,5 @@
 require_cc
 install_package "readline-6.3" "http://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#33c8fb279e981274f485fd91da77e94a" standard --if has_broken_mac_readline
 install_hg "stackless-3.3-dev" "http://hg.python.org/stackless" "3.3-slp" standard verify_py33
-install_package "setuptools-3.6" "https://pypi.python.org/packages/source/s/setuptools/setuptools-3.6.tar.gz#8f3a1dcdc14313c8334eb6af4f66ea0a" python
+install_package "setuptools-4.0" "https://pypi.python.org/packages/source/s/setuptools/setuptools-4.0.tar.gz#d7f08bf4fe55312f9f9fbe03d6642bce" python
 install_package "pip-1.5.6" "https://pypi.python.org/packages/source/p/pip/pip-1.5.6.tar.gz#01026f87978932060cc86c1dc527903e" python

plugins/python-build/share/python-build/stackless-3.3.5

@@ -1,5 +1,5 @@
 require_cc
 install_package "readline-6.3" "http://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#33c8fb279e981274f485fd91da77e94a" standard --if has_broken_mac_readline
 install_package "stackless-335-export" "http://www.stackless.com/binaries/stackless-335-export.tar.bz2#f3970d783f146ad21bfb6ae7b8cf6f01" ldflags_dirs standard verify_py33
-install_package "setuptools-3.6" "https://pypi.python.org/packages/source/s/setuptools/setuptools-3.6.tar.gz#8f3a1dcdc14313c8334eb6af4f66ea0a" python
+install_package "setuptools-4.0" "https://pypi.python.org/packages/source/s/setuptools/setuptools-4.0.tar.gz#d7f08bf4fe55312f9f9fbe03d6642bce" python
 install_package "pip-1.5.6" "https://pypi.python.org/packages/source/p/pip/pip-1.5.6.tar.gz#01026f87978932060cc86c1dc527903e" python

plugins/python-build/share/python-build/stackless-dev

@@ -1,5 +1,5 @@
 require_cc
 install_package "readline-6.3" "http://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#33c8fb279e981274f485fd91da77e94a" standard --if has_broken_mac_readline
 install_hg "stackless-dev" "http://hg.python.org/stackless" "default" standard verify_py33
-install_package "setuptools-3.6" "https://pypi.python.org/packages/source/s/setuptools/setuptools-3.6.tar.gz#8f3a1dcdc14313c8334eb6af4f66ea0a" python
+install_package "setuptools-4.0" "https://pypi.python.org/packages/source/s/setuptools/setuptools-4.0.tar.gz#d7f08bf4fe55312f9f9fbe03d6642bce" python
 install_package "pip-1.5.6" "https://pypi.python.org/packages/source/p/pip/pip-1.5.6.tar.gz#01026f87978932060cc86c1dc527903e" python

plugins/python-build/test/build.bats

@@ -33,6 +33,7 @@ tarball() {
 
   executable "$configure" <<OUT
 #!$BASH
+echo "$name: CPPFLAGS=\\"\$CPPFLAGS\\" LDFLAGS=\\"\$LDFLAGS\\"" >> build.log
 echo "$name: \$@" \${PYTHONOPT:+PYTHONOPT=\$PYTHONOPT} >> build.log
 OUT
 
@@ -69,9 +70,11 @@ assert_build_log() {
   unstub make
 
   assert_build_log <<OUT
+yaml-0.1.6: CPPFLAGS="-I${TMP}/install/include " LDFLAGS="-L${TMP}/install/lib "
 yaml-0.1.6: --prefix=$INSTALL_ROOT --libdir=$INSTALL_ROOT/lib
 make -j 2
 make install
+Python-3.2.1: CPPFLAGS="-I${TMP}/install/include " LDFLAGS="-L${TMP}/install/lib "
 Python-3.2.1: --prefix=$INSTALL_ROOT --libdir=$INSTALL_ROOT/lib
 make -j 2
 make install
@@ -94,10 +97,12 @@ OUT
   unstub patch
 
   assert_build_log <<OUT
+yaml-0.1.6: CPPFLAGS="-I${TMP}/install/include " LDFLAGS="-L${TMP}/install/lib "
 yaml-0.1.6: --prefix=$INSTALL_ROOT --libdir=$INSTALL_ROOT/lib
 make -j 2
 make install
 patch -p0 -i -
+Python-3.2.1: CPPFLAGS="-I${TMP}/install/include " LDFLAGS="-L${TMP}/install/lib "
 Python-3.2.1: --prefix=$INSTALL_ROOT --libdir=$INSTALL_ROOT/lib
 make -j 2
 make install
@@ -120,7 +125,8 @@ OUT
   unstub make
 
   assert_build_log <<OUT
-Python-3.2.1: --prefix=$INSTALL_ROOT --libdir=$INSTALL_ROOT/lib CPPFLAGS=-I$brew_libdir/include LDFLAGS=-L$brew_libdir/lib
+Python-3.2.1: CPPFLAGS="-I$brew_libdir/include -I${TMP}/install/include " LDFLAGS="-L$brew_libdir/lib -L${TMP}/install/lib "
+Python-3.2.1: --prefix=$INSTALL_ROOT --libdir=$INSTALL_ROOT/lib
 make -j 2
 make install
 OUT
@@ -144,7 +150,8 @@ DEF
   unstub make
 
   assert_build_log <<OUT
-Python-3.2.1: --prefix=$INSTALL_ROOT --libdir=$INSTALL_ROOT/lib CPPFLAGS=-I$readline_libdir/include LDFLAGS=-L$readline_libdir/lib
+Python-3.2.1: CPPFLAGS="-I$readline_libdir/include -I${TMP}/install/include " LDFLAGS="-L$readline_libdir/lib -L${TMP}/install/lib "
+Python-3.2.1: --prefix=$INSTALL_ROOT --libdir=$INSTALL_ROOT/lib
 make -j 2
 make install
 OUT
@@ -171,6 +178,7 @@ DEF
   unstub make
 
   assert_build_log <<OUT
+Python-3.2.1: CPPFLAGS="-I${TMP}/install/include " LDFLAGS="-L${TMP}/install/lib "
 Python-3.2.1: --prefix=$INSTALL_ROOT --libdir=$INSTALL_ROOT/lib CPPFLAGS=-I$readline_libdir/include LDFLAGS=-L$readline_libdir/lib
 make -j 2
 make install
@@ -194,6 +202,7 @@ DEF
   unstub make
 
   assert_build_log <<OUT
+Python-3.2.1: CPPFLAGS="-I${TMP}/install/include " LDFLAGS="-L${TMP}/install/lib "
 Python-3.2.1: --prefix=$INSTALL_ROOT --libdir=$INSTALL_ROOT/lib
 make -j 2
 make install
@@ -218,6 +227,7 @@ DEF
   unstub make
 
   assert_build_log <<OUT
+Python-3.2.1: CPPFLAGS="-I${TMP}/install/include " LDFLAGS="-L${TMP}/install/lib "
 Python-3.2.1: --prefix=$INSTALL_ROOT --libdir=$INSTALL_ROOT/lib
 make -j 4
 make install
@@ -238,6 +248,7 @@ DEF
   unstub make
 
   assert_build_log <<OUT
+Python-3.2.1: CPPFLAGS="-I${TMP}/install/include " LDFLAGS="-L${TMP}/install/lib "
 Python-3.2.1: --prefix=$INSTALL_ROOT --libdir=$INSTALL_ROOT/lib
 make -j 2
 make install DOGE="such wow"
@@ -258,6 +269,7 @@ DEF
   unstub make
 
   assert_build_log <<OUT
+Python-3.2.1: CPPFLAGS="-I${TMP}/install/include " LDFLAGS="-L${TMP}/install/lib "
 Python-3.2.1: --prefix=$INSTALL_ROOT --libdir=$INSTALL_ROOT/lib
 make -j 2
 make install DOGE="such wow"
@@ -309,6 +321,7 @@ DEF
 
   assert_build_log <<OUT
 apply -p1 -i /my/patch.diff
+Python-3.2.1: CPPFLAGS="-I${TMP}/install/include " LDFLAGS="-L${TMP}/install/lib "
 Python-3.2.1: --prefix=$INSTALL_ROOT --libdir=$INSTALL_ROOT/lib
 make -j 2
 make install

test/pyenv.bats

@@ -5,7 +5,7 @@ load test_helper
 @test "blank invocation" {
   run pyenv
   assert_success
-  assert [ "${lines[0]}" == "pyenv 0.4.0-20140520" ]
+  assert [ "${lines[0]}" == "pyenv 0.4.0-20140602" ]
 }
 
 @test "invalid command" {