v0.4.0-20140211

Add support for Python 3.3.4

.travis.yml

@@ -1,4 +1,6 @@
 install: git clone https://github.com/sstephenson/bats.git
-script: bats/bin/bats --tap test
+script: bats/bin/bats --tap test plugins/python-build/test
-# skips unnecessary Python-specific setup
 language: c
+notifications:
+  email:
+    on_success: never

CHANGELOG.md

@@ -1,5 +1,23 @@
 ## Version History
 
+#### 0.4.0-20140211
+
+* python-build: Add new CPython release candidates; 3.3.4, 3.4.0b3
+* python-build: Add [Anaconda](https://store.continuum.io/cshop/anaconda/) and [Miniconda](http://repo.continuum.io/miniconda/) binary distributions
+* python-build: Display error if the wget does not support Server Name Indication (SNI) to avoid SSL verification error when downloading from https://pypi.python.org. (#60)
+* python-build: Update default setuptools version (2.1 -> 2.2)
+* python-build: Update default pip version (1.5.1 -> 1.5.2)
+* python-build: Import recent changes from ruby-build v20140204
+
+#### 0.4.0-20140123
+
+* pyenv: Always append the directory at the top of the `$PATH` to return proper value for `sys.executable` (#98)
+* pyenv: Unset `GREP_OPTIONS` to avoid issues of conflicting options (#101)
+* python-build: Install `pip` with using `ensurepip` if available
+* python-build: Add support for framework installation (`--enable-framework`) of CPython (#55, #99)
+* python-build: Import recent changes from ruby-build v20140110.1
+* python-build: Import `bats` tests from ruby-build v20140110.1
+
 #### 0.4.0-20140110.1
 
 * python-build: Fix build error of CPython 2.x on the platform where the `gcc` is llvm-gcc.

README.md

@@ -131,9 +131,9 @@ Each Python version is installed into its own directory under
 `~/.pyenv/versions`. For example, you might have these versions
 installed:
 
-* `~/.pyenv/versions/2.7.5/`
+* `~/.pyenv/versions/2.7.6/`
-* `~/.pyenv/versions/3.3.2/`
+* `~/.pyenv/versions/3.3.3/`
-* `~/.pyenv/versions/pypy-1.9/`
+* `~/.pyenv/versions/pypy-2.2.1/`
 
 Version names to pyenv are simply the names of the directories in
 `~/.pyenv/versions`.
@@ -178,9 +178,9 @@ to the `pyenv` command-line utility.
         $ exec $SHELL
 
 5. Install Python versions into `$PYENV_ROOT/versions`. For example, to
-   install Python 2.7.5, download and unpack the source, then run:
+   install Python 2.7.6, download and unpack the source, then run:
 
-        $ pyenv install 2.7.5
+        $ pyenv install 2.7.6
 
    **NOTE** If you need to pass configure option to build, please use
    ```CONFIGURE_OPTS``` environment variable.
@@ -287,7 +287,7 @@ overrides the global version, and can be overridden itself by setting
 the `PYENV_VERSION` environment variable or with the `pyenv shell`
 command.
 
-    $ pyenv local 2.7.5
+    $ pyenv local 2.7.6
 
 When run without a version number, `pyenv local` reports the currently
 configured local version. You can also unset the local version:
@@ -299,21 +299,38 @@ file named `.pyenv-version`. For backwards compatibility, pyenv will
 read a local version specified in an `.pyenv-version` file, but a
 `.python-version` file in the same directory will take precedence.
 
-**pyenv feature**
+#### pyenv local (advanced)
 
-You can specify multiple versions as local Python. Commands
+You can specify multiple versions as local Python at once.
-within these Python versions are searched by specified order.
 
-    $ pyenv local 2.7.5 3.2.5
+Let's say if you have two versions of 2.7.6 and 3.3.3. If you prefer 2.7.6 over 3.3.3,
-    $ pyenv local
+
-    2.7.5
+    $ pyenv local 2.7.6 3.3.3
-    3.2.5
+    $ pyenv versions
-    $ pyenv which python2.7
+      system
-    /home/yyuu/.pyenv/versions/2.7.5/bin/python2.7
+    * 2.7.6 (set by /Users/yyuu/path/to/project/.python-version)
-    $ pyenv which python3.2
+    * 3.3.3 (set by /Users/yyuu/path/to/project/.python-version)
-    /home/yyuu/.pyenv/versions/3.2.5/bin/python3.2
+    $ python --version
-    $ pyenv which python
+    Python 2.7.6
-    /home/yyuu/.pyenv/versions/2.7.5/bin/python
+    $ python2.7 --version
+    Python 2.7.6
+    $ python3.3 --version
+    Python 3.3.3
+
+or, if you prefer 3.3.3 over 2.7.6,
+
+    $ pyenv local 3.3.3 2.7.6
+    $ pyenv versions
+      system
+    * 2.7.6 (set by /Users/yyuu/path/to/project/.python-version)
+    * 3.3.3 (set by /Users/yyuu/path/to/project/.python-version)
+      venv27
+    $ python --version
+    Python 3.3.3
+    $ python2.7 --version
+    Python 2.7.6
+    $ python3.3 --version
+    Python 3.3.3
 
 ### pyenv global
 
@@ -322,7 +339,7 @@ the version name to the `~/.pyenv/version` file. This version can be
 overridden by an application-specific `.python-version` file, or by
 setting the `PYENV_VERSION` environment variable.
 
-    $ pyenv global 2.7.5
+    $ pyenv global 2.7.6
 
 The special version name `system` tells pyenv to use the system Python
 (detected by searching your `$PATH`).
@@ -330,21 +347,38 @@ The special version name `system` tells pyenv to use the system Python
 When run without a version number, `pyenv global` reports the
 currently configured global version.
 
-**pyenv feature**
+#### pyenv global (advanced)
 
-You can specify multiple versions as global Python. Commands
+You can specify multiple versions as global Python at once.
-within these Python versions are searched by specified order.
 
-    $ pyenv global 2.7.5 3.2.5
+Let's say if you have two versions of 2.7.6 and 3.3.3. If you prefer 2.7.6 over 3.3.3,
-    $ pyenv global
+
-    2.7.5
+    $ pyenv global 2.7.6 3.3.3
-    3.2.5
+    $ pyenv versions
-    $ pyenv which python2.7
+      system
-    /home/yyuu/.pyenv/versions/2.7.5/bin/python2.7
+    * 2.7.6 (set by /Users/yyuu/.pyenv/version)
-    $ pyenv which python3.2
+    * 3.3.3 (set by /Users/yyuu/.pyenv/version)
-    /home/yyuu/.pyenv/versions/3.2.5/bin/python3.2
+    $ python --version
-    $ pyenv which python
+    Python 2.7.6
-    /home/yyuu/.pyenv/versions/2.7.5/bin/python
+    $ python2.7 --version
+    Python 2.7.6
+    $ python3.3 --version
+    Python 3.3.3
+
+or, if you prefer 3.3.3 over 2.7.6,
+
+    $ pyenv global 3.3.3 2.7.6
+    $ pyenv versions
+      system
+    * 2.7.6 (set by /Users/yyuu/.pyenv/version)
+    * 3.3.3 (set by /Users/yyuu/.pyenv/version)
+      venv27
+    $ python --version
+    Python 3.3.3
+    $ python2.7 --version
+    Python 2.7.6
+    $ python3.3 --version
+    Python 3.3.3
 
 ### pyenv shell
 
@@ -352,7 +386,7 @@ Sets a shell-specific Python version by setting the `PYENV_VERSION`
 environment variable in your shell. This version overrides
 application-specific versions and the global version.
 
-    $ pyenv shell pypy-1.9
+    $ pyenv shell pypy-2.2.1
 
 When run without a version number, `pyenv shell` reports the current
 value of `PYENV_VERSION`. You can also unset the shell version:
@@ -364,19 +398,40 @@ the installation instructions) in order to use this command. If you
 prefer not to use shell integration, you may simply set the
 `PYENV_VERSION` variable yourself:
 
-    $ export PYENV_VERSION=pypy-1.9
+    $ export PYENV_VERSION=pypy-2.2.1
 
-**pyenv feature**
+#### pyenv shell (advanced)
 
-You can specify multiple versions via `PYENV_VERSION`
+You can specify multiple versions via `PYENV_VERSION` at once.
-environment variable in your shell.
 
-    $ pyenv shell pypy-1.9 2.7.5
+Let's say if you have two versions of 2.7.6 and 3.3.3. If you prefer 2.7.6 over 3.3.3,
-    $ echo $PYENV_VERSION
+
-    pypy-1.9:2.7.5
+    $ pyenv shell 2.7.6 3.3.3
-    $ pyenv version
+    $ pyenv versions
-    pypy-1.9 (set by PYENV_VERSION environment variable)
+      system
-    2.7.5 (set by PYENV_VERSION environment variable)
+    * 2.7.6 (set by PYENV_VERSION environment variable)
+    * 3.3.3 (set by PYENV_VERSION environment variable)
+    $ python --version
+    Python 2.7.6
+    $ python2.7 --version
+    Python 2.7.6
+    $ python3.3 --version
+    Python 3.3.3
+
+or, if you prefer 3.3.3 over 2.7.6,
+
+    $ pyenv shell 3.3.3 2.7.6
+    $ pyenv versions
+      system
+    * 2.7.6 (set by PYENV_VERSION environment variable)
+    * 3.3.3 (set by PYENV_VERSION environment variable)
+      venv27
+    $ python --version
+    Python 3.3.3
+    $ python2.7 --version
+    Python 2.7.6
+    $ python3.3 --version
+    Python 3.3.3
 
 ### pyenv versions
 
@@ -386,10 +441,10 @@ the currently active version.
     $ pyenv versions
       2.5.6
       2.6.8
-    * 2.7.5 (set by /home/yyuu/.pyenv/version)
+    * 2.7.6 (set by /home/yyuu/.pyenv/version)
-      3.2.5
+      3.3.3
       jython-2.5.3
-      pypy-1.9
+      pypy-2.2.1
 
 ### pyenv version
 
@@ -397,7 +452,7 @@ Displays the currently active Python version, along with information on
 how it was set.
 
     $ pyenv version
-    2.7.5 (set by /home/yyuu/.pyenv/version)
+    2.7.6 (set by /home/yyuu/.pyenv/version)
 
 ### pyenv rehash
 
@@ -412,8 +467,8 @@ version of Python, or install a package that provides binaries.
 Displays the full path to the executable that pyenv will invoke when
 you run the given command.
 
-    $ pyenv which python3.2
+    $ pyenv which python3.3
-    /home/yyuu/.pyenv/versions/3.2.5/bin/python3.2
+    /home/yyuu/.pyenv/versions/3.3.3/bin/python3.3
 
 ### pyenv whence
 
@@ -421,8 +476,8 @@ Lists all Python versions with the given command installed.
 
     $ pyenv whence 2to3
     2.6.8
-    2.7.5
+    2.7.6
-    3.2.5
+    3.3.3
 
 ## Development
 

libexec/pyenv

@@ -18,6 +18,8 @@ if [ -z "$READLINK" ]; then
   exit 1
 fi
 
+unset GREP_OPTIONS
+
 resolve_link() {
   $READLINK "$1"
 }

libexec/pyenv---version

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

libexec/pyenv-exec

@@ -41,7 +41,7 @@ for script in "${scripts[@]}"; do
 done
 
 shift 1
-if [ "$PYENV_VERSION" != "system" ]; then
+# CPython's `sys.executable` requires the `PYENV_BIN_PATH` to be at the top of the `PATH`.
+# https://github.com/yyuu/pyenv/issues/98
 export PATH="${PYENV_BIN_PATH}:${PATH}"
-fi
 exec -a "$PYENV_COMMAND" "$PYENV_COMMAND_PATH" "$@"

plugins/python-build/bin/pyenv-install

@@ -99,7 +99,7 @@ unset VERSION_NAME
 # version is specified by pyenv. Show usage instructions if a local
 # version is not specified.
 DEFINITION="${ARGUMENTS[0]}"
-[ -n "$DEFINITION" ] || DEFINITION="$(pyenv local 2>/dev/null || true)"
+[ -n "$DEFINITION" ] || DEFINITION="$(pyenv-local 2>/dev/null || true)"
 [ -n "$DEFINITION" ] || usage 1
 
 
@@ -118,10 +118,10 @@ after_install() {
   after_hooks["${#after_hooks[@]}"]="$hook"
 }
 
-# Load plugin hooks.
+OLDIFS="$IFS"
-for script in $(pyenv-hooks install); do
+IFS=$'\n' scripts=(`pyenv-hooks install`)
-  source "$script"
+IFS="$OLDIFS"
-done
+for script in "${scripts[@]}"; do source "$script"; done
 
 
 # Set VERSION_NAME from $DEFINITION, if it is not already set. Then
@@ -161,7 +161,13 @@ fi
 # unsatisfied local python version can cause the installer to
 # fail.)
 if [[ "${VERSION_NAME}" == [23]"."* ]]; then
-  export PYENV_VERSION="$(pyenv-whence "python${VERSION_NAME%%.${VERSION_NAME##*.}}" 2>/dev/null | tail -1 || true)"
+  for version in "${VERSION_NAME%-dev}" "${VERSION_NAME%.*}" "${VERSION_NAME%%.*}"; do
+    PYENV_VERSION="$(pyenv-whence "python${version}" 2>/dev/null | tail -n 1 || true)"
+    if [ -n "${PYENV_VERSION}" ]; then
+      export PYENV_VERSION
+      break
+    fi
+  done
 fi
 
 
@@ -201,7 +207,7 @@ for hook in "${after_hooks[@]}"; do eval "$hook"; done
 
 # Run `pyenv-rehash` after a successful installation.
 if [ "$STATUS" == "0" ]; then
-  pyenv rehash
+  pyenv-rehash
 else
   cleanup
 fi

plugins/python-build/bin/pyenv-uninstall

@@ -38,6 +38,24 @@ case "$DEFINITION" in
   ;;
 esac
 
+declare -a before_hooks after_hooks
+
+before_uninstall() {
+  local hook="$1"
+  before_hooks["${#before_hooks[@]}"]="$hook"
+}
+
+after_uninstall() {
+  local hook="$1"
+  after_hooks["${#after_hooks[@]}"]="$hook"
+}
+
+OLDIFS="$IFS"
+IFS=$'\n' scripts=(`pyenv-hooks uninstall`)
+IFS="$OLDIFS"
+for script in "${scripts[@]}"; do source "$script"; done
+
+
 VERSION_NAME="${DEFINITION##*/}"
 PREFIX="${PYENV_ROOT}/versions/${VERSION_NAME}"
 
@@ -54,7 +72,11 @@ if [ -z "$FORCE" ]; then
   esac
 fi
 
+for hook in "${before_hooks[@]}"; do eval "$hook"; done
+
 if [ -d "$PREFIX" ]; then
   rm -rf "$PREFIX"
-  pyenv rehash
+  pyenv-rehash
 fi
+
+for hook in "${after_hooks[@]}"; do eval "$hook"; done

plugins/python-build/bin/python-build

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-PYTHON_BUILD_VERSION="20131225.1"
+PYTHON_BUILD_VERSION="20140204"
 
 set -E
 exec 3<&2 # preserve original stderr at fd 3
@@ -131,6 +131,10 @@ install_zip() {
   install_package_using "zip" 1 "$@"
 }
 
+install_script() {
+  install_package_using "script" 1 "$@"
+}
+
 install_package_using() {
   local package_type="$1"
   local package_type_nargs="$2"
@@ -165,9 +169,11 @@ make_package() {
   shift
 
   pushd "$package_name" >&4
+  setup_builtin_patches "$package_name"
   before_install_package "$package_name"
   build_package "$package_name" $*
   after_install_package "$package_name"
+  cleanup_builtin_patches "$package_name"
   fix_directory_permissions
   popd >&4
 }
@@ -468,6 +474,34 @@ fetch_zip() {
   } >&4 2>&1
 }
 
+fetch_script() {
+  local package_name="$1"
+  local package_url="$2"
+  local mirror_url
+  local checksum
+
+  if [ "$package_url" != "${package_url/\#}" ]; then
+    checksum="${package_url#*#}"
+    package_url="${package_url%%#*}"
+
+    if [ -n "$PYTHON_BUILD_MIRROR_URL" ]; then
+      mirror_url="${PYTHON_BUILD_MIRROR_URL}/$checksum"
+    fi
+  fi
+
+  local package_filename="${package_name}.sh" # TODO: extract suffix from ${package_url}
+
+  if ! symlink_tarball_from_cache "$package_filename" "$checksum"; then
+    echo "Downloading ${package_filename}..." >&2
+    http head "$mirror_url" &&
+    download_tarball "$mirror_url" "$package_filename" "$checksum" ||
+    download_tarball "$package_url" "$package_filename" "$checksum"
+  fi
+
+  mkdir -p "$(dirname "${package_name}/${package_filename}")"
+  mv -f "${package_filename}" "${package_name}/${package_filename}"
+}
+
 build_package() {
   local package_name="$1"
   shift
@@ -514,6 +548,8 @@ build_package_standard() {
   local PACKAGE_CONFIGURE_OPTS_ARRAY="${package_var_name}_CONFIGURE_OPTS_ARRAY[@]"
   local PACKAGE_MAKE_OPTS="${package_var_name}_MAKE_OPTS"
   local PACKAGE_MAKE_OPTS_ARRAY="${package_var_name}_MAKE_OPTS_ARRAY[@]"
+  local PACKAGE_MAKE_INSTALL_OPTS="${package_var_name}_MAKE_INSTALL_OPTS"
+  local PACKAGE_MAKE_INSTALL_OPTS_ARRAY="${package_var_name}_MAKE_INSTALL_OPTS_ARRAY[@]"
   local PACKAGE_CFLAGS="${package_var_name}_CFLAGS"
 
   [ "$package_var_name" = "PYTHON" ] && use_homebrew_readline || true
@@ -527,7 +563,7 @@ build_package_standard() {
   ) >&4 2>&1
 
   { "$MAKE" $MAKE_OPTS ${!PACKAGE_MAKE_OPTS} "${!PACKAGE_MAKE_OPTS_ARRAY}"
-    "$MAKE" install
+    "$MAKE" install $MAKE_INSTALL_OPTS ${!PACKAGE_MAKE_INSTALL_OPTS} "${!PACKAGE_MAKE_INSTALL_OPTS_ARRAY}"
   } >&4 2>&1
 }
 
@@ -644,7 +680,7 @@ install_jruby_launcher() {
 fix_jruby_shebangs() {
   for file in "${PREFIX_PATH}/bin"/*; do
     if [ "$(head -c 20 "$file")" = "#!/usr/bin/env jruby" ]; then
-      sed -i.bak -E "1s:.+:#\!${PREFIX_PATH}/bin/jruby:" "$file"
+      sed -i.bak "1 s:.*:#\!${PREFIX_PATH}\/bin\/jruby:" "$file"
       rm "$file".bak
     fi
   done
@@ -692,6 +728,17 @@ build_package_pypy_builder() {
   build_package_pypy
 }
 
+build_package_anaconda() {
+  local package_name="$1"
+  { bash "${package_name}.sh" -b -p "${PREFIX_PATH}"
+  } >&4 2>&1
+}
+
+build_package_miniconda() {
+  build_package_anaconda "$@"
+  "${PREFIX_PATH}/bin/conda" install --yes "pip"
+}
+
 build_package_copy() {
   mkdir -p "$PREFIX_PATH"
   cp -fR . "$PREFIX_PATH"
@@ -699,29 +746,31 @@ build_package_copy() {
 
 before_install_package() {
   local stub=1
-  before_install_package_patch "$@"
 }
 
-before_install_package_patch() {
+after_install_package() {
+  local stub=1
+}
+
+setup_builtin_patches() {
   local package_name="$1"
   local package_patch_path="${PYTHON_BUILD_ROOT}/share/python-build/patches/${DEFINITION_PATH##*/}/${package_name}"
 
   ORIG_HAS_PATCH="$HAS_PATCH"
 # Apply built-in patches if patch was not given from stdin
   if [ -z "$HAS_PATCH" ] && [ -d "${package_patch_path}" ]; then
-    ( cat "${package_patch_path}"/* || true ) 2>/dev/null 1>"${package_name}.patch"
+    local patch
+    { for patch in "${package_patch_path}"/*; do
+        [ -f "${patch}" ] && echo "${patch}"
+      done
+    } 2>/dev/null | sort | xargs cat 1>"${package_name}.patch"
     exec <&-
     exec <"${package_name}.patch"
     HAS_PATCH=true
   fi
 }
 
-after_install_package() {
+cleanup_builtin_patches() {
-  local stub=1
-  after_install_package_patch "$@"
-}
-
-after_install_package_patch() {
   local package_name="$1"
   rm -f "${package_name}.patch"
   HAS_PATCH="$ORIG_HAS_PATCH"
@@ -897,7 +946,6 @@ require_java() {
 }
 
 needs_yaml() {
-  [[ "$PYTHON_CONFIGURE_OPTS" != *--with-libyaml-dir=* ]] &&
   ! use_homebrew_yaml
 }
 
@@ -910,28 +958,37 @@ use_homebrew_yaml() {
   fi
 }
 
-has_broken_mac_readline() {
+configured_with_readline_dir() {
-  if [ "$(uname -s)" = "Darwin" ] && ! use_homebrew_readline; then
+  # Mac OS X 10.4 has broken readline.
-    # MacOSX 10.4 has a broken readline.
   # https://github.com/yyuu/pyenv/issues/23
-    local retval=1
+  local arg flag
-    local conftest="$BUILD_PATH/has_broken_mac_readline.h"
+  for arg in ${CONFIGURE_OPTS} ${PYTHON_CONFIGURE_OPTS} "${PYTHON_CONFIGURE_OPTS_ARRAY[@]}"; do
-    echo "#include <readline/rlconf.h>" > "$conftest"
+    if [[ "$arg" == "CPPFLAGS="* ]]; then
-    "${CPP:-cpp}" $CPPFLAGS "$conftest" 1>/dev/null 2>&1 || retval=0
+      for flag in ${CPPFLAGS} ${arg##CPPFLAGS=}; do
-    rm -f "$conftest"
+        if [[ "$flag" == "-I"* ]] && [ -e "${flag##-I}/readline/rlconf.h" ]; then
-    return "$retval"
+          return 0
-  else
-    return 1
         fi
+      done
+    fi
+  done
+  return 1
+}
+
+has_broken_mac_readline() {
+  [ "$(uname -s)" = "Darwin" ] &&
+  ! configured_with_readline_dir &&
+  ! use_homebrew_readline
 }
 
 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"
     else
       return 1
     fi
+  fi
 }
 
 has_broken_mac_openssl() {
@@ -1048,23 +1105,16 @@ apply_python_patch() {
 }
 
 build_package_verify_python() {
-  # Check the existence of ./bin since pyenv-which searches the executables from there
+  local package_name="$1"
-  if [ ! -d "${PREFIX_PATH}/bin" ]; then
+  local python="$2"
-    echo "pyenv: invalid Python installation" >&4 2>&1
+  if [[ "$PYTHON_CONFIGURE_OPTS" == *"--enable-framework"* ]]; then
-    return 1
+    # Only symlinks are installed in ${PREFIX_PATH}/bin
+    rm -fr "${PREFIX_PATH}/bin"
+    ln -fs "${PREFIX_PATH}/Python.framework/Versions/Current/bin" "${PREFIX_PATH}/bin"
   fi
-
+  if [ ! -e "${PREFIX_PATH}/bin/python" ] && [ -e "${PREFIX_PATH}/bin/${python}" ]; then
-  # Create `python` executable if missing. Especially for Py3k.
+    ( cd "${PREFIX_PATH}/bin" && ln -fs "${python}" "python" )
-  if [ ! -e "${PREFIX_PATH}/bin/python" ]; then
-    local python
-    for python in "${PREFIX_PATH}/bin/python"*; do
-      if expr "$(basename "$python")" : '^python[0-9][0-9]*\.[0-9][0-9]*$' 2>&1 >/dev/null; then
-        ( cd "${PREFIX_PATH}/bin" && ln -fs "$(basename "$python")" python )
-        break
   fi
-    done
-  fi
-
   if [ ! -x "${PYTHON_BIN}" ]; then
     echo "pyenv: invalid Python executable: ${PYTHON_BIN}" >&4 2>&1
     return 1
@@ -1073,57 +1123,69 @@ build_package_verify_python() {
 
 # Post-install check for Python 2.4.x
 build_package_verify_py24() {
-  build_package_verify_python "$@"
+  build_package_verify_python "$1" "${2:-python2.4}"
-  build_package_verify_readline "$@"
+  build_package_verify_readline "$1" "${2:-python2.4}"
-  build_package_verify_zlib "$@"
+  build_package_verify_zlib "$1" "${2:-python2.4}"
-  build_package_verify_bz2 "$@"
+  build_package_verify_bz2 "$1" "${2:-python2.4}"
 }
 
 # Post-install check for Python 2.5.x
 build_package_verify_py25() {
-  build_package_verify_py24 "$@"
+  build_package_verify_py24 "$1" "${2:-python2.5}"
-  build_package_verify_sqlite3 "$@"
+  build_package_verify_sqlite3 "$1" "${2:-python2.5}"
 }
 
 # Post-install check for Python 2.6.x
 build_package_verify_py26() {
-  build_package_verify_py25 "$@"
+  build_package_verify_py25 "$1" "${2:-python2.6}"
-  build_package_verify_ssl "$@"
+  build_package_verify_ssl "$1" "${2:-python2.6}"
 }
 
 # Post-install check for Python 2.7.x
 build_package_verify_py27() {
-  build_package_verify_py26 "$@"
+  build_package_verify_py26 "$1" "${2:-python2.7}"
 }
 
 # Post-install check for Python 3.0.x
 build_package_verify_py30() {
-  build_package_verify_python "$@"
+  build_package_verify_python "$1" "${2:-python3.0}"
-  build_package_verify_readline "$@"
+  build_package_verify_readline "$1" "${2:-python3.0}"
-  build_package_verify_ssl "$@"
+  build_package_verify_ssl "$1" "${2:-python3.0}"
-  build_package_verify_sqlite3 "$@"
+  build_package_verify_sqlite3 "$1" "${2:-python3.0}"
-  build_package_verify_zlib "$@"
+  build_package_verify_zlib "$1" "${2:-python3.0}"
-  build_package_verify_bz2 "$@"
+  build_package_verify_bz2 "$1" "${2:-python3.0}"
 }
 
 # Post-install check for Python 3.1.x
 build_package_verify_py31() {
-  build_package_verify_py30 "$@"
+  build_package_verify_py30 "$1" "${2:-python3.1}"
 }
 
 # Post-install check for Python 3.2.x
 build_package_verify_py32() {
-  build_package_verify_py31 "$@"
+  build_package_verify_py31 "$1" "${2:-python3.2}"
 }
 
 # Post-install check for Python 3.3.x
 build_package_verify_py33() {
-  build_package_verify_py32 "$@"
+  build_package_verify_py32 "$1" "${2:-python3.3}"
 }
 
 # Post-install check for Python 3.4.x
 build_package_verify_py34() {
-  build_package_verify_py33 "$@"
+  build_package_verify_py33 "$1" "${2:-python3.4}"
+}
+
+build_package_ensurepip() {
+  { "$PYTHON_BIN" -m ensurepip
+  } >&4 2>&1
+
+  if [ ! -e "${PREFIX_PATH}/bin/pip" ]; then
+    local pip="$("$PYTHON_BIN" -c 'import sys;v=sys.version_info;sys.stdout.write("pip%d.%d"%(v[0],v[1]))')"
+    if [ -e "${PREFIX_PATH}/bin/${pip}" ]; then
+      ( cd "${PREFIX_PATH}/bin" && ln -fs "${pip}" "pip" )
+    fi
+  fi
 }
 
 build_package_verify_import() {
@@ -1193,8 +1255,8 @@ list_definitions() {
 unset VERBOSE
 unset KEEP_BUILD_PATH
 unset HAS_PATCH
-unset DEBUG
 PYTHON_BUILD_ROOT="$(abs_dirname "$0")/.."
+unset DEBUG
 
 parse_options "$@"
 
@@ -1311,19 +1373,39 @@ if [ -n "$DEBUG" ]; then
   package_option python configure --with-pydebug
 fi
 
-if [[ "$PYTHON_CONFIGURE_OPTS" == *"--enable-shared"* ]] && [[ "$LDFLAGS" != *"-rpath="* ]]; then
+if [[ "$CONFIGURE_OPTS" == *"--enable-shared"* ]] || [[ "$PYTHON_CONFIGURE_OPTS" == *"--enable-shared"* ]]; then
   # The ld on Darwin embeds the full paths to each dylib by default
-  if [[ "Darwin" != "$(uname -s)" ]]; then
+  if [[ "$LDFLAGS" != *"-rpath="* ]] && [[ "Darwin" != "$(uname -s)" ]]; then
     export LDFLAGS="-Wl,-rpath=${PREFIX_PATH}/lib ${LDFLAGS}"
   fi
 fi
 
+if [[ "$PYTHON_CONFIGURE_OPTS" == *"--enable-framework"* ]]; then
+  create_framework_dirs() {
+    local version="$(echo "$1" | sed -E 's/^[^0-9]*([0-9]+\.[0-9]+).*$/\1/')"
+    mkdir -p "${PREFIX_PATH}/Python.framework/Versions/${version}"
+    ( cd "${PREFIX_PATH}/Python.framework/Versions" && ln -fs "${version}" "Current")
+    local path
+    for path in include lib share; do
+      mkdir -p "${PREFIX_PATH}/Python.framework/Versions/Current/${path}"
+      ln -fs "${PREFIX_PATH}/Python.framework/Versions/Current/${path}" "${PREFIX_PATH}/${path}"
+    done
+  }
+  create_framework_dirs "${DEFINITION_PATH##*/}"
+  package_option python configure --enable-framework="${PREFIX_PATH}"
+fi
+
+if ! command -v curl 1>/dev/null 2>&1 && [[ "$(wget --version 2>/dev/null || true)" = "GNU Wget 1.1"[0-3]* ]]; then
+  echo "python-build: wget (< 1.14) doesn't support Server Name Indication. Please install curl (>= 7.18.1) and try again" >&2
+  exit 1
+fi
+
 SEED="$(date "+%Y%m%d%H%M%S").$$"
 LOG_PATH="${TMP}/python-build.${SEED}.log"
 PYTHON_BIN="${PREFIX_PATH}/bin/python"
 CWD="$(pwd)"
 
-if [ -z $PYTHON_BUILD_BUILD_PATH ]; then
+if [ -z "$PYTHON_BUILD_BUILD_PATH" ]; then
   BUILD_PATH="${TMP}/python-build.${SEED}"
 else
   BUILD_PATH="$PYTHON_BUILD_BUILD_PATH"

plugins/python-build/install.sh

@@ -17,4 +17,10 @@ SHARE_PATH="${PREFIX}/share/python-build"
 mkdir -p "$BIN_PATH" "$SHARE_PATH"
 
 install -p bin/* "$BIN_PATH"
-cp -RPp share/python-build/* "$SHARE_PATH"
+for share in share/python-build/*; do
+  if [ -d "$share" ]; then
+    cp -RPp "$share" "$SHARE_PATH"
+  else
+    install -p -m 0644 "$share" "$SHARE_PATH"
+  fi
+done

plugins/python-build/share/python-build/2.6-dev

@@ -1,5 +1,5 @@
 require_cc "gcc" "clang"
 install_package "readline-6.2" "http://ftpmirror.gnu.org/readline/readline-6.2.tar.gz#67948acb2ca081f23359d0256e9a271c" standard --if has_broken_mac_readline
 install_hg "Python-2.6-dev" "https://bitbucket.org/mirror/cpython" "2.6" standard verify_py26
-install_package "setuptools-2.1" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.1.tar.gz#2044725530450d0517393882dc4b7508" python
+install_package "setuptools-2.2" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.2.tar.gz#04a7664538957b832710653fd7d5b4e6" python
-install_package "pip-1.5" "https://pypi.python.org/packages/source/p/pip/pip-1.5.tar.gz#6969b8a8adc4c7f7c5eb1707118f0686" python
+install_package "pip-1.5.2" "https://pypi.python.org/packages/source/p/pip/pip-1.5.2.tar.gz#5da30919f732d68b1c666e484e7676f5" python

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

@@ -1,5 +1,5 @@
 require_cc "gcc" "clang"
 install_package "readline-6.2" "http://ftpmirror.gnu.org/readline/readline-6.2.tar.gz#67948acb2ca081f23359d0256e9a271c" 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-2.1" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.1.tar.gz#2044725530450d0517393882dc4b7508" python
+install_package "setuptools-2.2" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.2.tar.gz#04a7664538957b832710653fd7d5b4e6" python
-install_package "pip-1.5" "https://pypi.python.org/packages/source/p/pip/pip-1.5.tar.gz#6969b8a8adc4c7f7c5eb1707118f0686" python
+install_package "pip-1.5.2" "https://pypi.python.org/packages/source/p/pip/pip-1.5.2.tar.gz#5da30919f732d68b1c666e484e7676f5" python

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

@@ -1,5 +1,5 @@
 require_cc "gcc" "clang"
 install_package "readline-6.2" "http://ftpmirror.gnu.org/readline/readline-6.2.tar.gz#67948acb2ca081f23359d0256e9a271c" 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-2.1" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.1.tar.gz#2044725530450d0517393882dc4b7508" python
+install_package "setuptools-2.2" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.2.tar.gz#04a7664538957b832710653fd7d5b4e6" python
-install_package "pip-1.5" "https://pypi.python.org/packages/source/p/pip/pip-1.5.tar.gz#6969b8a8adc4c7f7c5eb1707118f0686" python
+install_package "pip-1.5.2" "https://pypi.python.org/packages/source/p/pip/pip-1.5.2.tar.gz#5da30919f732d68b1c666e484e7676f5" python

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

@@ -1,5 +1,5 @@
 require_cc "gcc" "clang"
 install_package "readline-6.2" "http://ftpmirror.gnu.org/readline/readline-6.2.tar.gz#67948acb2ca081f23359d0256e9a271c" 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-2.1" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.1.tar.gz#2044725530450d0517393882dc4b7508" python
+install_package "setuptools-2.2" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.2.tar.gz#04a7664538957b832710653fd7d5b4e6" python
-install_package "pip-1.5" "https://pypi.python.org/packages/source/p/pip/pip-1.5.tar.gz#6969b8a8adc4c7f7c5eb1707118f0686" python
+install_package "pip-1.5.2" "https://pypi.python.org/packages/source/p/pip/pip-1.5.2.tar.gz#5da30919f732d68b1c666e484e7676f5" python

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

@@ -1,5 +1,5 @@
 require_cc "gcc" "clang"
 install_package "readline-6.2" "http://ftpmirror.gnu.org/readline/readline-6.2.tar.gz#67948acb2ca081f23359d0256e9a271c" 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-2.1" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.1.tar.gz#2044725530450d0517393882dc4b7508" python
+install_package "setuptools-2.2" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.2.tar.gz#04a7664538957b832710653fd7d5b4e6" python
-install_package "pip-1.5" "https://pypi.python.org/packages/source/p/pip/pip-1.5.tar.gz#6969b8a8adc4c7f7c5eb1707118f0686" python
+install_package "pip-1.5.2" "https://pypi.python.org/packages/source/p/pip/pip-1.5.2.tar.gz#5da30919f732d68b1c666e484e7676f5" python

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

@@ -1,5 +1,5 @@
 require_cc "gcc" "clang"
 install_package "readline-6.2" "http://ftpmirror.gnu.org/readline/readline-6.2.tar.gz#67948acb2ca081f23359d0256e9a271c" 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-2.1" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.1.tar.gz#2044725530450d0517393882dc4b7508" python
+install_package "setuptools-2.2" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.2.tar.gz#04a7664538957b832710653fd7d5b4e6" python
-install_package "pip-1.5" "https://pypi.python.org/packages/source/p/pip/pip-1.5.tar.gz#6969b8a8adc4c7f7c5eb1707118f0686" python
+install_package "pip-1.5.2" "https://pypi.python.org/packages/source/p/pip/pip-1.5.2.tar.gz#5da30919f732d68b1c666e484e7676f5" python

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

@@ -1,5 +1,5 @@
 require_cc "gcc" "clang"
 install_package "readline-6.2" "http://ftpmirror.gnu.org/readline/readline-6.2.tar.gz#67948acb2ca081f23359d0256e9a271c" 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-2.1" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.1.tar.gz#2044725530450d0517393882dc4b7508" python
+install_package "setuptools-2.2" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.2.tar.gz#04a7664538957b832710653fd7d5b4e6" python
-install_package "pip-1.5" "https://pypi.python.org/packages/source/p/pip/pip-1.5.tar.gz#6969b8a8adc4c7f7c5eb1707118f0686" python
+install_package "pip-1.5.2" "https://pypi.python.org/packages/source/p/pip/pip-1.5.2.tar.gz#5da30919f732d68b1c666e484e7676f5" python

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

@@ -1,5 +1,5 @@
 require_cc "gcc" "clang"
 install_package "readline-6.2" "http://ftpmirror.gnu.org/readline/readline-6.2.tar.gz#67948acb2ca081f23359d0256e9a271c" 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-2.1" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.1.tar.gz#2044725530450d0517393882dc4b7508" python
+install_package "setuptools-2.2" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.2.tar.gz#04a7664538957b832710653fd7d5b4e6" python
-install_package "pip-1.5" "https://pypi.python.org/packages/source/p/pip/pip-1.5.tar.gz#6969b8a8adc4c7f7c5eb1707118f0686" python
+install_package "pip-1.5.2" "https://pypi.python.org/packages/source/p/pip/pip-1.5.2.tar.gz#5da30919f732d68b1c666e484e7676f5" python

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

@@ -1,5 +1,5 @@
 require_cc "gcc" "clang"
 install_package "readline-6.2" "http://ftpmirror.gnu.org/readline/readline-6.2.tar.gz#67948acb2ca081f23359d0256e9a271c" 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-2.1" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.1.tar.gz#2044725530450d0517393882dc4b7508" python
+install_package "setuptools-2.2" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.2.tar.gz#04a7664538957b832710653fd7d5b4e6" python
-install_package "pip-1.5" "https://pypi.python.org/packages/source/p/pip/pip-1.5.tar.gz#6969b8a8adc4c7f7c5eb1707118f0686" python
+install_package "pip-1.5.2" "https://pypi.python.org/packages/source/p/pip/pip-1.5.2.tar.gz#5da30919f732d68b1c666e484e7676f5" python

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

@@ -1,5 +1,5 @@
 require_cc "gcc" "clang"
 install_package "readline-6.2" "http://ftpmirror.gnu.org/readline/readline-6.2.tar.gz#67948acb2ca081f23359d0256e9a271c" 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-2.1" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.1.tar.gz#2044725530450d0517393882dc4b7508" python
+install_package "setuptools-2.2" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.2.tar.gz#04a7664538957b832710653fd7d5b4e6" python
-install_package "pip-1.5" "https://pypi.python.org/packages/source/p/pip/pip-1.5.tar.gz#6969b8a8adc4c7f7c5eb1707118f0686" python
+install_package "pip-1.5.2" "https://pypi.python.org/packages/source/p/pip/pip-1.5.2.tar.gz#5da30919f732d68b1c666e484e7676f5" python

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

@@ -1,5 +1,5 @@
 require_cc "gcc" "clang"
 install_package "readline-6.2" "http://ftpmirror.gnu.org/readline/readline-6.2.tar.gz#67948acb2ca081f23359d0256e9a271c" 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-2.1" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.1.tar.gz#2044725530450d0517393882dc4b7508" python
+install_package "setuptools-2.2" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.2.tar.gz#04a7664538957b832710653fd7d5b4e6" python
-install_package "pip-1.5" "https://pypi.python.org/packages/source/p/pip/pip-1.5.tar.gz#6969b8a8adc4c7f7c5eb1707118f0686" python
+install_package "pip-1.5.2" "https://pypi.python.org/packages/source/p/pip/pip-1.5.2.tar.gz#5da30919f732d68b1c666e484e7676f5" python

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

@@ -1,5 +1,5 @@
 require_cc "gcc" "clang"
 install_package "readline-6.2" "http://ftpmirror.gnu.org/readline/readline-6.2.tar.gz#67948acb2ca081f23359d0256e9a271c" 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-2.1" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.1.tar.gz#2044725530450d0517393882dc4b7508" python
+install_package "setuptools-2.2" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.2.tar.gz#04a7664538957b832710653fd7d5b4e6" python
-install_package "pip-1.5" "https://pypi.python.org/packages/source/p/pip/pip-1.5.tar.gz#6969b8a8adc4c7f7c5eb1707118f0686" python
+install_package "pip-1.5.2" "https://pypi.python.org/packages/source/p/pip/pip-1.5.2.tar.gz#5da30919f732d68b1c666e484e7676f5" python

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

@@ -1,5 +1,5 @@
 require_cc "gcc" "clang"
 install_package "readline-6.2" "http://ftpmirror.gnu.org/readline/readline-6.2.tar.gz#67948acb2ca081f23359d0256e9a271c" 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-2.1" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.1.tar.gz#2044725530450d0517393882dc4b7508" python
+install_package "setuptools-2.2" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.2.tar.gz#04a7664538957b832710653fd7d5b4e6" python
-install_package "pip-1.5" "https://pypi.python.org/packages/source/p/pip/pip-1.5.tar.gz#6969b8a8adc4c7f7c5eb1707118f0686" python
+install_package "pip-1.5.2" "https://pypi.python.org/packages/source/p/pip/pip-1.5.2.tar.gz#5da30919f732d68b1c666e484e7676f5" python

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

@@ -1,5 +1,5 @@
 require_cc "gcc" "clang"
 install_package "readline-6.2" "http://ftpmirror.gnu.org/readline/readline-6.2.tar.gz#67948acb2ca081f23359d0256e9a271c" 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-2.1" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.1.tar.gz#2044725530450d0517393882dc4b7508" python
+install_package "setuptools-2.2" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.2.tar.gz#04a7664538957b832710653fd7d5b4e6" python
-install_package "pip-1.5" "https://pypi.python.org/packages/source/p/pip/pip-1.5.tar.gz#6969b8a8adc4c7f7c5eb1707118f0686" python
+install_package "pip-1.5.2" "https://pypi.python.org/packages/source/p/pip/pip-1.5.2.tar.gz#5da30919f732d68b1c666e484e7676f5" python

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

@@ -1,5 +1,5 @@
 require_cc "gcc" "clang"
 install_package "readline-6.2" "http://ftpmirror.gnu.org/readline/readline-6.2.tar.gz#67948acb2ca081f23359d0256e9a271c" 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-2.1" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.1.tar.gz#2044725530450d0517393882dc4b7508" python
+install_package "setuptools-2.2" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.2.tar.gz#04a7664538957b832710653fd7d5b4e6" python
-install_package "pip-1.5" "https://pypi.python.org/packages/source/p/pip/pip-1.5.tar.gz#6969b8a8adc4c7f7c5eb1707118f0686" python
+install_package "pip-1.5.2" "https://pypi.python.org/packages/source/p/pip/pip-1.5.2.tar.gz#5da30919f732d68b1c666e484e7676f5" python

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

@@ -1,5 +1,5 @@
 require_cc "gcc" "clang"
 install_package "readline-6.2" "http://ftpmirror.gnu.org/readline/readline-6.2.tar.gz#67948acb2ca081f23359d0256e9a271c" 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-2.1" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.1.tar.gz#2044725530450d0517393882dc4b7508" python
+install_package "setuptools-2.2" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.2.tar.gz#04a7664538957b832710653fd7d5b4e6" python
-install_package "pip-1.5" "https://pypi.python.org/packages/source/p/pip/pip-1.5.tar.gz#6969b8a8adc4c7f7c5eb1707118f0686" python
+install_package "pip-1.5.2" "https://pypi.python.org/packages/source/p/pip/pip-1.5.2.tar.gz#5da30919f732d68b1c666e484e7676f5" python

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

@@ -1,5 +1,5 @@
 require_cc "gcc" "clang"
 install_package "readline-6.2" "http://ftpmirror.gnu.org/readline/readline-6.2.tar.gz#67948acb2ca081f23359d0256e9a271c" 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-2.1" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.1.tar.gz#2044725530450d0517393882dc4b7508" python
+install_package "setuptools-2.2" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.2.tar.gz#04a7664538957b832710653fd7d5b4e6" python
-install_package "pip-1.5" "https://pypi.python.org/packages/source/p/pip/pip-1.5.tar.gz#6969b8a8adc4c7f7c5eb1707118f0686" python
+install_package "pip-1.5.2" "https://pypi.python.org/packages/source/p/pip/pip-1.5.2.tar.gz#5da30919f732d68b1c666e484e7676f5" python

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

@@ -1,5 +1,5 @@
 require_cc "gcc" "clang"
 install_package "readline-6.2" "http://ftpmirror.gnu.org/readline/readline-6.2.tar.gz#67948acb2ca081f23359d0256e9a271c" 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-2.1" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.1.tar.gz#2044725530450d0517393882dc4b7508" python
+install_package "setuptools-2.2" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.2.tar.gz#04a7664538957b832710653fd7d5b4e6" python
-install_package "pip-1.5" "https://pypi.python.org/packages/source/p/pip/pip-1.5.tar.gz#6969b8a8adc4c7f7c5eb1707118f0686" python
+install_package "pip-1.5.2" "https://pypi.python.org/packages/source/p/pip/pip-1.5.2.tar.gz#5da30919f732d68b1c666e484e7676f5" python

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

@@ -1,5 +1,5 @@
 require_cc "gcc" "clang"
 install_package "readline-6.2" "http://ftpmirror.gnu.org/readline/readline-6.2.tar.gz#67948acb2ca081f23359d0256e9a271c" 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-2.1" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.1.tar.gz#2044725530450d0517393882dc4b7508" python
+install_package "setuptools-2.2" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.2.tar.gz#04a7664538957b832710653fd7d5b4e6" python
-install_package "pip-1.5" "https://pypi.python.org/packages/source/p/pip/pip-1.5.tar.gz#6969b8a8adc4c7f7c5eb1707118f0686" python
+install_package "pip-1.5.2" "https://pypi.python.org/packages/source/p/pip/pip-1.5.2.tar.gz#5da30919f732d68b1c666e484e7676f5" python

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

@@ -1,5 +1,5 @@
 require_cc "gcc" "clang"
 install_package "readline-6.2" "http://ftpmirror.gnu.org/readline/readline-6.2.tar.gz#67948acb2ca081f23359d0256e9a271c" 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-2.1" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.1.tar.gz#2044725530450d0517393882dc4b7508" python
+install_package "setuptools-2.2" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.2.tar.gz#04a7664538957b832710653fd7d5b4e6" python
-install_package "pip-1.5" "https://pypi.python.org/packages/source/p/pip/pip-1.5.tar.gz#6969b8a8adc4c7f7c5eb1707118f0686" python
+install_package "pip-1.5.2" "https://pypi.python.org/packages/source/p/pip/pip-1.5.2.tar.gz#5da30919f732d68b1c666e484e7676f5" python

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

@@ -1,5 +1,5 @@
 require_cc "gcc" "clang"
 install_package "readline-6.2" "http://ftpmirror.gnu.org/readline/readline-6.2.tar.gz#67948acb2ca081f23359d0256e9a271c" 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-2.1" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.1.tar.gz#2044725530450d0517393882dc4b7508" python
+install_package "setuptools-2.2" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.2.tar.gz#04a7664538957b832710653fd7d5b4e6" python
-install_package "pip-1.5" "https://pypi.python.org/packages/source/p/pip/pip-1.5.tar.gz#6969b8a8adc4c7f7c5eb1707118f0686" python
+install_package "pip-1.5.2" "https://pypi.python.org/packages/source/p/pip/pip-1.5.2.tar.gz#5da30919f732d68b1c666e484e7676f5" python

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

@@ -1,5 +1,5 @@
 require_cc "gcc" "clang"
 install_package "readline-6.2" "http://ftpmirror.gnu.org/readline/readline-6.2.tar.gz#67948acb2ca081f23359d0256e9a271c" 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-2.1" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.1.tar.gz#2044725530450d0517393882dc4b7508" python
+install_package "setuptools-2.2" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.2.tar.gz#04a7664538957b832710653fd7d5b4e6" python
-install_package "pip-1.5" "https://pypi.python.org/packages/source/p/pip/pip-1.5.tar.gz#6969b8a8adc4c7f7c5eb1707118f0686" python
+install_package "pip-1.5.2" "https://pypi.python.org/packages/source/p/pip/pip-1.5.2.tar.gz#5da30919f732d68b1c666e484e7676f5" python

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

@@ -1,5 +1,5 @@
 require_cc "gcc" "clang"
 install_package "readline-6.2" "http://ftpmirror.gnu.org/readline/readline-6.2.tar.gz#67948acb2ca081f23359d0256e9a271c" 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-2.1" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.1.tar.gz#2044725530450d0517393882dc4b7508" python
+install_package "setuptools-2.2" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.2.tar.gz#04a7664538957b832710653fd7d5b4e6" python
-install_package "pip-1.5" "https://pypi.python.org/packages/source/p/pip/pip-1.5.tar.gz#6969b8a8adc4c7f7c5eb1707118f0686" python
+install_package "pip-1.5.2" "https://pypi.python.org/packages/source/p/pip/pip-1.5.2.tar.gz#5da30919f732d68b1c666e484e7676f5" python

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

@@ -1,5 +1,5 @@
 require_cc "gcc" "clang"
 install_package "readline-6.2" "http://ftpmirror.gnu.org/readline/readline-6.2.tar.gz#67948acb2ca081f23359d0256e9a271c" 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-2.1" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.1.tar.gz#2044725530450d0517393882dc4b7508" python
+install_package "setuptools-2.2" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.2.tar.gz#04a7664538957b832710653fd7d5b4e6" python
-install_package "pip-1.5" "https://pypi.python.org/packages/source/p/pip/pip-1.5.tar.gz#6969b8a8adc4c7f7c5eb1707118f0686" python
+install_package "pip-1.5.2" "https://pypi.python.org/packages/source/p/pip/pip-1.5.2.tar.gz#5da30919f732d68b1c666e484e7676f5" python

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

@@ -1,5 +1,5 @@
 require_cc "gcc" "clang"
 install_package "readline-6.2" "http://ftpmirror.gnu.org/readline/readline-6.2.tar.gz#67948acb2ca081f23359d0256e9a271c" 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-2.1" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.1.tar.gz#2044725530450d0517393882dc4b7508" python
+install_package "setuptools-2.2" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.2.tar.gz#04a7664538957b832710653fd7d5b4e6" python
-install_package "pip-1.5" "https://pypi.python.org/packages/source/p/pip/pip-1.5.tar.gz#6969b8a8adc4c7f7c5eb1707118f0686" python
+install_package "pip-1.5.2" "https://pypi.python.org/packages/source/p/pip/pip-1.5.2.tar.gz#5da30919f732d68b1c666e484e7676f5" python

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

@@ -1,5 +1,5 @@
 require_cc "gcc" "clang"
 install_package "readline-6.2" "http://ftpmirror.gnu.org/readline/readline-6.2.tar.gz#67948acb2ca081f23359d0256e9a271c" 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-2.1" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.1.tar.gz#2044725530450d0517393882dc4b7508" python
+install_package "setuptools-2.2" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.2.tar.gz#04a7664538957b832710653fd7d5b4e6" python
-install_package "pip-1.5" "https://pypi.python.org/packages/source/p/pip/pip-1.5.tar.gz#6969b8a8adc4c7f7c5eb1707118f0686" python
+install_package "pip-1.5.2" "https://pypi.python.org/packages/source/p/pip/pip-1.5.2.tar.gz#5da30919f732d68b1c666e484e7676f5" python

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

@@ -1,5 +1,5 @@
 require_cc "gcc" "clang"
 install_package "readline-6.2" "http://ftpmirror.gnu.org/readline/readline-6.2.tar.gz#67948acb2ca081f23359d0256e9a271c" 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-2.1" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.1.tar.gz#2044725530450d0517393882dc4b7508" python
+install_package "setuptools-2.2" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.2.tar.gz#04a7664538957b832710653fd7d5b4e6" python
-install_package "pip-1.5" "https://pypi.python.org/packages/source/p/pip/pip-1.5.tar.gz#6969b8a8adc4c7f7c5eb1707118f0686" python
+install_package "pip-1.5.2" "https://pypi.python.org/packages/source/p/pip/pip-1.5.2.tar.gz#5da30919f732d68b1c666e484e7676f5" python

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

@@ -1,5 +1,5 @@
 require_cc "gcc" "clang"
 install_package "readline-6.2" "http://ftpmirror.gnu.org/readline/readline-6.2.tar.gz#67948acb2ca081f23359d0256e9a271c" 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-2.1" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.1.tar.gz#2044725530450d0517393882dc4b7508" python
+install_package "setuptools-2.2" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.2.tar.gz#04a7664538957b832710653fd7d5b4e6" python
-install_package "pip-1.5" "https://pypi.python.org/packages/source/p/pip/pip-1.5.tar.gz#6969b8a8adc4c7f7c5eb1707118f0686" python
+install_package "pip-1.5.2" "https://pypi.python.org/packages/source/p/pip/pip-1.5.2.tar.gz#5da30919f732d68b1c666e484e7676f5" python

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

@@ -1,5 +1,5 @@
 require_cc "gcc" "clang"
 install_package "readline-6.2" "http://ftpmirror.gnu.org/readline/readline-6.2.tar.gz#67948acb2ca081f23359d0256e9a271c" 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-2.1" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.1.tar.gz#2044725530450d0517393882dc4b7508" python
+install_package "setuptools-2.2" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.2.tar.gz#04a7664538957b832710653fd7d5b4e6" python
-install_package "pip-1.5" "https://pypi.python.org/packages/source/p/pip/pip-1.5.tar.gz#6969b8a8adc4c7f7c5eb1707118f0686" python
+install_package "pip-1.5.2" "https://pypi.python.org/packages/source/p/pip/pip-1.5.2.tar.gz#5da30919f732d68b1c666e484e7676f5" python

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

@@ -1,5 +1,5 @@
 require_cc "gcc" "clang"
 install_package "readline-6.2" "http://ftpmirror.gnu.org/readline/readline-6.2.tar.gz#67948acb2ca081f23359d0256e9a271c" 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-2.1" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.1.tar.gz#2044725530450d0517393882dc4b7508" python
+install_package "setuptools-2.2" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.2.tar.gz#04a7664538957b832710653fd7d5b4e6" python
-install_package "pip-1.5" "https://pypi.python.org/packages/source/p/pip/pip-1.5.tar.gz#6969b8a8adc4c7f7c5eb1707118f0686" python
+install_package "pip-1.5.2" "https://pypi.python.org/packages/source/p/pip/pip-1.5.2.tar.gz#5da30919f732d68b1c666e484e7676f5" python

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

@@ -0,0 +1,5 @@
+require_cc "gcc" "clang"
+install_package "readline-6.2" "http://ftpmirror.gnu.org/readline/readline-6.2.tar.gz#67948acb2ca081f23359d0256e9a271c" 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-2.2" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.2.tar.gz#04a7664538957b832710653fd7d5b4e6" python
+install_package "pip-1.5.2" "https://pypi.python.org/packages/source/p/pip/pip-1.5.2.tar.gz#5da30919f732d68b1c666e484e7676f5" python

plugins/python-build/share/python-build/3.4-dev

@@ -1,5 +1,3 @@
 require_cc "gcc" "clang"
 install_package "readline-6.2" "http://ftpmirror.gnu.org/readline/readline-6.2.tar.gz#67948acb2ca081f23359d0256e9a271c" standard --if has_broken_mac_readline
-install_hg "Python-3.4-dev" "https://bitbucket.org/mirror/cpython" "default" standard verify_py34
+install_hg "Python-3.4-dev" "https://bitbucket.org/mirror/cpython" "default" standard verify_py34 ensurepip
-install_package "setuptools-2.1" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.1.tar.gz#2044725530450d0517393882dc4b7508" python
-install_package "pip-1.5" "https://pypi.python.org/packages/source/p/pip/pip-1.5.tar.gz#6969b8a8adc4c7f7c5eb1707118f0686" python

plugins/python-build/share/python-build/3.4.0a2

@@ -1,5 +1,5 @@
 require_cc "gcc" "clang"
 install_package "readline-6.2" "http://ftpmirror.gnu.org/readline/readline-6.2.tar.gz#67948acb2ca081f23359d0256e9a271c" standard --if has_broken_mac_readline
 install_package "Python-3.4.0a2" "http://python.org/ftp/python/3.4.0/Python-3.4.0a2.tgz#e6e81242a32e6f63d224254d24edbd2f" ldflags_dirs standard verify_py34
-install_package "setuptools-2.1" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.1.tar.gz#2044725530450d0517393882dc4b7508" python
+install_package "setuptools-2.2" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.2.tar.gz#04a7664538957b832710653fd7d5b4e6" python
-install_package "pip-1.5" "https://pypi.python.org/packages/source/p/pip/pip-1.5.tar.gz#6969b8a8adc4c7f7c5eb1707118f0686" python
+install_package "pip-1.5.2" "https://pypi.python.org/packages/source/p/pip/pip-1.5.2.tar.gz#5da30919f732d68b1c666e484e7676f5" python

plugins/python-build/share/python-build/3.4.0a3

@@ -1,5 +1,5 @@
 require_cc "gcc" "clang"
 install_package "readline-6.2" "http://ftpmirror.gnu.org/readline/readline-6.2.tar.gz#67948acb2ca081f23359d0256e9a271c" standard --if has_broken_mac_readline
 install_package "Python-3.4.0a3" "http://python.org/ftp/python/3.4.0/Python-3.4.0a3.tgz#3598af9717cddd4c346d731913fdfd64" ldflags_dirs standard verify_py34
-install_package "setuptools-2.1" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.1.tar.gz#2044725530450d0517393882dc4b7508" python
+install_package "setuptools-2.2" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.2.tar.gz#04a7664538957b832710653fd7d5b4e6" python
-install_package "pip-1.5" "https://pypi.python.org/packages/source/p/pip/pip-1.5.tar.gz#6969b8a8adc4c7f7c5eb1707118f0686" python
+install_package "pip-1.5.2" "https://pypi.python.org/packages/source/p/pip/pip-1.5.2.tar.gz#5da30919f732d68b1c666e484e7676f5" python

plugins/python-build/share/python-build/3.4.0a4

@@ -1,5 +1,5 @@
 require_cc "gcc" "clang"
 install_package "readline-6.2" "http://ftpmirror.gnu.org/readline/readline-6.2.tar.gz#67948acb2ca081f23359d0256e9a271c" standard --if has_broken_mac_readline
 install_package "Python-3.4.0a4" "http://python.org/ftp/python/3.4.0/Python-3.4.0a4.tgz#f874d97c90130b0249848be889b5e6e1" ldflags_dirs standard verify_py34
-install_package "setuptools-2.1" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.1.tar.gz#2044725530450d0517393882dc4b7508" python
+install_package "setuptools-2.2" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.2.tar.gz#04a7664538957b832710653fd7d5b4e6" python
-install_package "pip-1.5" "https://pypi.python.org/packages/source/p/pip/pip-1.5.tar.gz#6969b8a8adc4c7f7c5eb1707118f0686" python
+install_package "pip-1.5.2" "https://pypi.python.org/packages/source/p/pip/pip-1.5.2.tar.gz#5da30919f732d68b1c666e484e7676f5" python

plugins/python-build/share/python-build/3.4.0b1

@@ -1,5 +1,3 @@
 require_cc "gcc" "clang"
 install_package "readline-6.2" "http://ftpmirror.gnu.org/readline/readline-6.2.tar.gz#67948acb2ca081f23359d0256e9a271c" standard --if has_broken_mac_readline
-install_package "Python-3.4.0b1" "http://python.org/ftp/python/3.4.0/Python-3.4.0b1.tgz#83143a755b8a29a59026c1fdfb8d18fc" ldflags_dirs standard verify_py34
+install_package "Python-3.4.0b1" "http://python.org/ftp/python/3.4.0/Python-3.4.0b1.tgz#83143a755b8a29a59026c1fdfb8d18fc" ldflags_dirs standard verify_py34 ensurepip
-install_package "setuptools-2.1" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.1.tar.gz#2044725530450d0517393882dc4b7508" python
-install_package "pip-1.5" "https://pypi.python.org/packages/source/p/pip/pip-1.5.tar.gz#6969b8a8adc4c7f7c5eb1707118f0686" python

plugins/python-build/share/python-build/3.4.0b2

@@ -1,5 +1,3 @@
 require_cc "gcc" "clang"
 install_package "readline-6.2" "http://ftpmirror.gnu.org/readline/readline-6.2.tar.gz#67948acb2ca081f23359d0256e9a271c" standard --if has_broken_mac_readline
-install_package "Python-3.4.0b2" "http://python.org/ftp/python/3.4.0/Python-3.4.0b2.tgz#afe112d6fe595f501f1dcb3627e7b476" ldflags_dirs standard verify_py34
+install_package "Python-3.4.0b2" "http://python.org/ftp/python/3.4.0/Python-3.4.0b2.tgz#afe112d6fe595f501f1dcb3627e7b476" ldflags_dirs standard verify_py34 ensurepip
-install_package "setuptools-2.1" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.1.tar.gz#2044725530450d0517393882dc4b7508" python
-install_package "pip-1.5" "https://pypi.python.org/packages/source/p/pip/pip-1.5.tar.gz#6969b8a8adc4c7f7c5eb1707118f0686" python

plugins/python-build/share/python-build/3.4.0b3

@@ -0,0 +1,3 @@
+require_cc "gcc" "clang"
+install_package "readline-6.2" "http://ftpmirror.gnu.org/readline/readline-6.2.tar.gz#67948acb2ca081f23359d0256e9a271c" standard --if has_broken_mac_readline
+install_package "Python-3.4.0b3" "http://python.org/ftp/python/3.4.0/Python-3.4.0b3.tgz#1ea3d96a270db1c7113c560e419edc55" ldflags_dirs standard verify_py34 ensurepip

plugins/python-build/share/python-build/anaconda-1.4.0

@@ -0,0 +1,26 @@
+case "$(uname -s)" in
+"Darwin" )
+  package_name="Anaconda-1.4.0-MacOSX-x86_64"
+  package_url="http://repo.continuum.io/archive/Anaconda-1.4.0-MacOSX-x86_64.sh#db8779f0a663e025da1b19755f372a57"
+  ;;
+"Linux" )
+  case "$(uname -m)" in
+  "i386" | "i486" | "i586" | "i686" | "i786" )
+    package_name="Anaconda-1.4.0-Linux-x86"
+    package_url="http://repo.continuum.io/archive/Anaconda-1.4.0-Linux-x86.sh#d5826bb10bb25d2f03639f841ef2f65f"
+    ;;
+  "x86_64" )
+    package_name="Anaconda-1.4.0-Linux-x86_64"
+    package_url="http://repo.continuum.io/archive/Anaconda-1.4.0-Linux-x86_64.sh#9be0e7340f0cd2d2cbd5acbe8e988f45"
+    ;;
+  esac
+  ;;
+esac
+
+if [ -n "${package_name}" ] && [ -n "${package_url}" ]; then
+  install_script "${package_name}" "${package_url}" "anaconda" verify_py27
+else
+  { echo "Precompiled binary of anaconda-1.4.0 is not available for $(uname -s)-$(uname -m)."
+  } 1>&4 2>&1
+  exit 1
+fi

plugins/python-build/share/python-build/anaconda-1.5.0

@@ -0,0 +1,26 @@
+case "$(uname -s)" in
+"Darwin" )
+  package_name="Anaconda-1.5.0-MacOSX-x86_64"
+  package_url="http://repo.continuum.io/archive/Anaconda-1.5.0-MacOSX-x86_64.sh#6fe90601dbcecb29a2afcaf44aeb37f6"
+  ;;
+"Linux" )
+  case "$(uname -m)" in
+  "i386" | "i486" | "i586" | "i686" | "i786" )
+    package_name="Anaconda-1.5.0-Linux-x86"
+    package_url="http://repo.continuum.io/archive/Anaconda-1.5.0-Linux-x86.sh#2a75cab6536838635fd38ee7fd3e2411"
+    ;;
+  "x86_64" )
+    package_name="Anaconda-1.5.0-Linux-x86_64"
+    package_url="http://repo.continuum.io/archive/Anaconda-1.5.0-Linux-x86_64.sh#8319288082262fefbe322451aeae06ce"
+    ;;
+  esac
+  ;;
+esac
+
+if [ -n "${package_name}" ] && [ -n "${package_url}" ]; then
+  install_script "${package_name}" "${package_url}" "anaconda" verify_py27
+else
+  { echo "Precompiled binary of anaconda-1.5.0 is not available for $(uname -s)-$(uname -m)."
+  } 1>&4 2>&1
+  exit 1
+fi

plugins/python-build/share/python-build/anaconda-1.5.1

@@ -0,0 +1,14 @@
+case "$(uname -s)" in
+"Darwin" )
+  package_name="Anaconda-1.5.1-MacOSX-x86_64"
+  package_url="http://repo.continuum.io/archive/Anaconda-1.5.1-MacOSX-x86_64.sh#03942512daf1b39eb3ff9016fc7efa0c"
+  ;;
+esac
+
+if [ -n "${package_name}" ] && [ -n "${package_url}" ]; then
+  install_script "${package_name}" "${package_url}" "anaconda" verify_py27
+else
+  { echo "Precompiled binary of anaconda-1.5.1 is not available for $(uname -s)-$(uname -m)."
+  } 1>&4 2>&1
+  exit 1
+fi

plugins/python-build/share/python-build/anaconda-1.6.0

@@ -0,0 +1,26 @@
+case "$(uname -s)" in
+"Darwin" )
+  package_name="Anaconda-1.6.0-MacOSX-x86_64"
+  package_url="http://repo.continuum.io/archive/Anaconda-1.6.0-MacOSX-x86_64.sh#cccdd0353bfd46d3a93143fc6e47d728"
+  ;;
+"Linux" )
+  case "$(uname -m)" in
+  "i386" | "i486" | "i586" | "i686" | "i786" )
+    package_name="Anaconda-1.6.0-Linux-x86"
+    package_url="http://repo.continuum.io/archive/Anaconda-1.6.0-Linux-x86.sh#7a7f1f53684d38a7aa36935e34af30a3"
+    ;;
+  "x86_64" )
+    package_name="Anaconda-1.6.0-Linux-x86_64"
+    package_url="http://repo.continuum.io/archive/Anaconda-1.6.0-Linux-x86_64.sh#207a0b4ebde49bcde67925ac8c72fe37"
+    ;;
+  esac
+  ;;
+esac
+
+if [ -n "${package_name}" ] && [ -n "${package_url}" ]; then
+  install_script "${package_name}" "${package_url}" "anaconda" verify_py27
+else
+  { echo "Precompiled binary of anaconda-1.6.0 is not available for $(uname -s)-$(uname -m)."
+  } 1>&4 2>&1
+  exit 1
+fi

plugins/python-build/share/python-build/anaconda-1.6.1

@@ -0,0 +1,26 @@
+case "$(uname -s)" in
+"Darwin" )
+  package_name="Anaconda-1.6.1-MacOSX-x86_64"
+  package_url="http://repo.continuum.io/archive/Anaconda-1.6.1-MacOSX-x86_64.sh#4b60123e71864c447a0adc16398d5386"
+  ;;
+"Linux" )
+  case "$(uname -m)" in
+  "i386" | "i486" | "i586" | "i686" | "i786" )
+    package_name="Anaconda-1.6.1-Linux-x86"
+    package_url="http://repo.continuum.io/archive/Anaconda-1.6.1-Linux-x86.sh#06412ae8de02c87b8de7d7e6d35ed092"
+    ;;
+  "x86_64" )
+    package_name="Anaconda-1.6.1-Linux-x86_64"
+    package_url="http://repo.continuum.io/archive/Anaconda-1.6.1-Linux-x86_64.sh#70a1294c01e3ab5925fc52f2603de159"
+    ;;
+  esac
+  ;;
+esac
+
+if [ -n "${package_name}" ] && [ -n "${package_url}" ]; then
+  install_script "${package_name}" "${package_url}" "anaconda" verify_py27
+else
+  { echo "Precompiled binary of anaconda-1.6.1 is not available for $(uname -s)-$(uname -m)."
+  } 1>&4 2>&1
+  exit 1
+fi

plugins/python-build/share/python-build/anaconda-1.7.0

@@ -0,0 +1,26 @@
+case "$(uname -s)" in
+"Darwin" )
+  package_name="Anaconda-1.7.0-MacOSX-x86_64"
+  package_url="http://repo.continuum.io/archive/Anaconda-1.7.0-MacOSX-x86_64.sh#16194eb9be2301eeb135f9f01695a566"
+  ;;
+"Linux" )
+  case "$(uname -m)" in
+  "i386" | "i486" | "i586" | "i686" | "i786" )
+    package_name="Anaconda-1.7.0-Linux-x86"
+    package_url="http://repo.continuum.io/archive/Anaconda-1.7.0-Linux-x86.sh#bbde22bd0346ad9c8932b4d98c0f4000"
+    ;;
+  "x86_64" )
+    package_name="Anaconda-1.7.0-Linux-x86_64"
+    package_url="http://repo.continuum.io/archive/Anaconda-1.7.0-Linux-x86_64.sh#01dc7d6df2ed592e5401ab4fbe3aed4a"
+    ;;
+  esac
+  ;;
+esac
+
+if [ -n "${package_name}" ] && [ -n "${package_url}" ]; then
+  install_script "${package_name}" "${package_url}" "anaconda" verify_py27
+else
+  { echo "Precompiled binary of anaconda-1.7.0 is not available for $(uname -s)-$(uname -m)."
+  } 1>&4 2>&1
+  exit 1
+fi

plugins/python-build/share/python-build/anaconda-1.8.0

@@ -0,0 +1,26 @@
+case "$(uname -s)" in
+"Darwin" )
+  package_name="Anaconda-1.8.0-MacOSX-x86_64"
+  package_url="http://repo.continuum.io/archive/Anaconda-1.8.0-MacOSX-x86_64.sh#9fd7dd485c5f04fb65699a290e69671c"
+  ;;
+"Linux" )
+  case "$(uname -m)" in
+  "i386" | "i486" | "i586" | "i686" | "i786" )
+    package_name="Anaconda-1.8.0-Linux-x86"
+    package_url="http://repo.continuum.io/archive/Anaconda-1.8.0-Linux-x86.sh#5028bf0aa7ff8a071d5532b8f8ec924c"
+    ;;
+  "x86_64" )
+    package_name="Anaconda-1.8.0-Linux-x86_64"
+    package_url="http://repo.continuum.io/archive/Anaconda-1.8.0-Linux-x86_64.sh#398d4b7ddc5c0a16c556c415b2444266"
+    ;;
+  esac
+  ;;
+esac
+
+if [ -n "${package_name}" ] && [ -n "${package_url}" ]; then
+  install_script "${package_name}" "${package_url}" "anaconda" verify_py27
+else
+  { echo "Precompiled binary of anaconda-1.8.0 is not available for $(uname -s)-$(uname -m)."
+  } 1>&4 2>&1
+  exit 1
+fi

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-2.1" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.1.tar.gz#2044725530450d0517393882dc4b7508" python
+install_package "setuptools-2.2" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.2.tar.gz#04a7664538957b832710653fd7d5b4e6" 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-2.1" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.1.tar.gz#2044725530450d0517393882dc4b7508" python
+install_package "setuptools-2.2" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.2.tar.gz#04a7664538957b832710653fd7d5b4e6" 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/miniconda-2.2.2

@@ -0,0 +1,26 @@
+case "$(uname -s)" in
+"Darwin" )
+  package_name="Miniconda-2.2.2-MacOSX-x86_64"
+  package_url="http://repo.continuum.io/miniconda/Miniconda-2.2.2-MacOSX-x86_64.sh#cd0c8059fd7040a25d015c67f85bbc44"
+  ;;
+"Linux" )
+  case "$(uname -m)" in
+  "i386" | "i486" | "i586" | "i686" | "i786" )
+    package_name="Miniconda-2.2.2-Linux-x86"
+    package_url="http://repo.continuum.io/miniconda/Miniconda-2.2.2-Linux-x86.sh#26a4bdf7183aefa360f2aba8e9386a7f"
+    ;;
+  "x86_64" )
+    package_name="Miniconda-2.2.2-Linux-x86_64"
+    package_url="http://repo.continuum.io/miniconda/Miniconda-2.2.2-Linux-x86_64.sh#a24a8baa264dee7cfd9286ae3d4add60"
+    ;;
+  esac
+  ;;
+esac
+
+if [ -n "${package_name}" ] && [ -n "${package_url}" ]; then
+  install_script "${package_name}" "${package_url}" "miniconda" verify_py27
+else
+  { echo "Precompiled binary of miniconda-2.2.2 is not available for $(uname -s)-$(uname -m)."
+  } 1>&4 2>&1
+  exit 1
+fi

plugins/python-build/share/python-build/miniconda-3.0.0

@@ -0,0 +1,26 @@
+case "$(uname -s)" in
+"Darwin" )
+  package_name="Miniconda-3.0.0-MacOSX-x86_64"
+  package_url="http://repo.continuum.io/miniconda/Miniconda-3.0.0-MacOSX-x86_64.sh#4dc63992aca6ddb3d10aba902ed00a56"
+  ;;
+"Linux" )
+  case "$(uname -m)" in
+  "i386" | "i486" | "i586" | "i686" | "i786" )
+    package_name="Miniconda-3.0.0-Linux-x86"
+    package_url="http://repo.continuum.io/miniconda/Miniconda-3.0.0-Linux-x86.sh#9d1473a904a39f44d6f8e0860424d16b"
+    ;;
+  "x86_64" )
+    package_name="Miniconda-3.0.0-Linux-x86_64"
+    package_url="http://repo.continuum.io/miniconda/Miniconda-3.0.0-Linux-x86_64.sh#acf150992cf8d5c332064b31ff885858"
+    ;;
+  esac
+  ;;
+esac
+
+if [ -n "${package_name}" ] && [ -n "${package_url}" ]; then
+  install_script "${package_name}" "${package_url}" "miniconda" verify_py27
+else
+  { echo "Precompiled binary of miniconda-3.0.0 is not available for $(uname -s)-$(uname -m)."
+  } 1>&4 2>&1
+  exit 1
+fi

plugins/python-build/share/python-build/miniconda3-2.2.2

@@ -0,0 +1,26 @@
+case "$(uname -s)" in
+"Darwin" )
+  package_name="Miniconda3-2.2.2-MacOSX-x86_64"
+  package_url="http://repo.continuum.io/miniconda/Miniconda3-2.2.2-MacOSX-x86_64.sh#cc227b40bee9ea5f117114726f3b8a35"
+  ;;
+"Linux" )
+  case "$(uname -m)" in
+  "i386" | "i486" | "i586" | "i686" | "i786" )
+    package_name="Miniconda3-2.2.2-Linux-x86"
+    package_url="http://repo.continuum.io/miniconda/Miniconda3-2.2.2-Linux-x86.sh#2dac0e1abf6b0599b6c59ccf3a8cbcf2"
+    ;;
+  "x86_64" )
+    package_name="Miniconda3-2.2.2-Linux-x86_64"
+    package_url="http://repo.continuum.io/miniconda/Miniconda3-2.2.2-Linux-x86_64.sh#486bd0f9fa6a6f51e4194ce2a91a4b8e"
+    ;;
+  esac
+  ;;
+esac
+
+if [ -n "${package_name}" ] && [ -n "${package_url}" ]; then
+  install_script "${package_name}" "${package_url}" "miniconda" verify_py33
+else
+  { echo "Precompiled binary of miniconda3-2.2.2 is not available for $(uname -s)-$(uname -m)."
+  } 1>&4 2>&1
+  exit 1
+fi

plugins/python-build/share/python-build/miniconda3-3.0.0

@@ -0,0 +1,26 @@
+case "$(uname -s)" in
+"Darwin" )
+  package_name="Miniconda3-3.0.0-MacOSX-x86_64"
+  package_url="http://repo.continuum.io/miniconda/Miniconda3-3.0.0-MacOSX-x86_64.sh#2b356f05895a0694fc59f7cd809038f2"
+  ;;
+"Linux" )
+  case "$(uname -m)" in
+  "i386" | "i486" | "i586" | "i686" | "i786" )
+    package_name="Miniconda3-3.0.0-Linux-x86"
+    package_url="http://repo.continuum.io/miniconda/Miniconda3-3.0.0-Linux-x86.sh#4abe8655f5c361338fb317b018ce7c98"
+    ;;
+  "x86_64" )
+    package_name="Miniconda3-3.0.0-Linux-x86_64"
+    package_url="http://repo.continuum.io/miniconda/Miniconda3-3.0.0-Linux-x86_64.sh#f74f8e9223492ef292a9b2d87e265de9"
+    ;;
+  esac
+  ;;
+esac
+
+if [ -n "${package_name}" ] && [ -n "${package_url}" ]; then
+  install_script "${package_name}" "${package_url}" "miniconda" verify_py33
+else
+  { echo "Precompiled binary of miniconda3-3.0.0 is not available for $(uname -s)-$(uname -m)."
+  } 1>&4 2>&1
+  exit 1
+fi

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

@@ -1,28 +1,39 @@
 case "$(uname -s)" in
 "Darwin" )
-  install_package "pypy-c-jit-43780-b590cf6de419-osx64" "https://bitbucket.org/pypy/pypy/downloads/pypy-1.5-osx64.tar.bz2#b1417916bc01ebb9f95c666f5e397fb5" pypy verify_py27
+  package_name="pypy-c-jit-43780-b590cf6de419-osx64"
+  package_url="https://bitbucket.org/pypy/pypy/downloads/pypy-1.5-osx64.tar.bz2#b1417916bc01ebb9f95c666f5e397fb5"
   ;;
 "Linux" )
   case "$(uname -m)" in
   "i386" | "i486" | "i586" | "i686" | "i786" )
-    install_package "pypy-c-jit-43780-b590cf6de419-linux" "https://bitbucket.org/pypy/pypy/downloads/pypy-1.5-linux.tar.bz2#08a2c95163c95f91772abb8bf5f8b9cb" pypy verify_py27
+    package_name="pypy-c-jit-43780-b590cf6de419-linux"
+    package_url="https://bitbucket.org/pypy/pypy/downloads/pypy-1.5-linux.tar.bz2#08a2c95163c95f91772abb8bf5f8b9cb"
     ;;
   "x86_64" )
-    install_package "pypy-c-jit-43780-b590cf6de419-linux64" "https://bitbucket.org/pypy/pypy/downloads/pypy-1.5-linux64.tar.bz2#32392b7986eb34cd657d5b6c5d242cc7" pypy verify_py27
+    package_name="pypy-c-jit-43780-b590cf6de419-linux64"
+    package_url="https://bitbucket.org/pypy/pypy/downloads/pypy-1.5-linux64.tar.bz2#32392b7986eb34cd657d5b6c5d242cc7"
     ;;
   esac
   ;;
 "CYGWIN"* | "MINGW"* )
   # FIXME: never tested on Windows
-  install_zip "pypy-1.5.0a0-win32" "https://bitbucket.org/pypy/pypy/downloads/pypy-1.5-win32.zip#b6cc12bed5e7243ed44aa3430eb14885" pypy verify_py27
+  package_name="pypy-1.5.0a0-win32"
-  ;;
+  package_url="https://bitbucket.org/pypy/pypy/downloads/pypy-1.5-win32.zip#b6cc12bed5e7243ed44aa3430eb14885"
-* )
-  { echo "Precompiled binary of pypy-1.5 is not available for $(uname -s)-$(uname -m)."
-    echo "To build pypy-1.5 from soruce, use 'pypy-1.5-src'."
-  } 1>&4 2>&1
-  false
   ;;
 esac
 
-install_package "setuptools-2.1" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.1.tar.gz#2044725530450d0517393882dc4b7508" python
+if [ -n "${package_name}" ] && [ -n "${package_url}" ]; then
-install_package "pip-1.5" "https://pypi.python.org/packages/source/p/pip/pip-1.5.tar.gz#6969b8a8adc4c7f7c5eb1707118f0686" python
+  if [ "${package_url}" != "${package_url%%.zip*}" ]; then
+    install_zip "${package_name}" "${package_url}" "pypy" verify_py27
+  else
+    install_package "${package_name}" "${package_url}" "pypy" verify_py27
+  fi
+else
+  { echo "Precompiled binary of pypy-1.5 is not available for $(uname -s)-$(uname -m)."
+    echo "To build pypy-1.5 from soruce, use 'pypy-1.5-src'."
+  } 1>&4 2>&1
+  exit 1
+fi
+
+install_package "setuptools-2.2" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.2.tar.gz#04a7664538957b832710653fd7d5b4e6" python
+install_package "pip-1.5.2" "https://pypi.python.org/packages/source/p/pip/pip-1.5.2.tar.gz#5da30919f732d68b1c666e484e7676f5" 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-2.1" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.1.tar.gz#2044725530450d0517393882dc4b7508" python
+install_package "setuptools-2.2" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.2.tar.gz#04a7664538957b832710653fd7d5b4e6" python
-install_package "pip-1.5" "https://pypi.python.org/packages/source/p/pip/pip-1.5.tar.gz#6969b8a8adc4c7f7c5eb1707118f0686" python
+install_package "pip-1.5.2" "https://pypi.python.org/packages/source/p/pip/pip-1.5.2.tar.gz#5da30919f732d68b1c666e484e7676f5" python

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

@@ -1,27 +1,38 @@
 case "$(uname -s)" in
 "Darwin" )
-  install_package "pypy-1.6" "https://bitbucket.org/pypy/pypy/downloads/pypy-1.6-osx64.tar.bz2#78bbf70f55e9fec20d7ac22531a997fc" pypy verify_py27
+  package_name="pypy-1.6"
+  package_url="https://bitbucket.org/pypy/pypy/downloads/pypy-1.6-osx64.tar.bz2#78bbf70f55e9fec20d7ac22531a997fc"
   ;;
 "Linux" )
   case "$(uname -m)" in
   "i386" | "i486" | "i586" | "i686" | "i786" )
-    install_package "pypy-1.6" "https://bitbucket.org/pypy/pypy/downloads/pypy-1.6-linux.tar.bz2#ee949986fc5ec5c4a11ecbd546b87fbb" pypy verify_py27
+    package_name="pypy-1.6"
+    package_url="https://bitbucket.org/pypy/pypy/downloads/pypy-1.6-linux.tar.bz2#ee949986fc5ec5c4a11ecbd546b87fbb"
     ;;
   "x86_64" )
-    install_package "pypy-1.6" "https://bitbucket.org/pypy/pypy/downloads/pypy-1.6-linux64.tar.bz2#a34e3113508449393e874f409dd888fc" pypy verify_py27
+    package_name="pypy-1.6"
+    package_url="https://bitbucket.org/pypy/pypy/downloads/pypy-1.6-linux64.tar.bz2#a34e3113508449393e874f409dd888fc"
     ;;
   esac
   ;;
 "CYGWIN"* | "MINGW"* )
   # FIXME: never tested on Windows
-  install_zip "pypy-1.6" "https://bitbucket.org/pypy/pypy/downloads/pypy-1.6-win32-c.zip#62b9eb914954aeab32905d632d3904f1" pypy verify_py27
+  package_name="pypy-1.6"
-  ;;
+  package_url="https://bitbucket.org/pypy/pypy/downloads/pypy-1.6-win32-c.zip#62b9eb914954aeab32905d632d3904f1"
-* )
-  { echo "Precompiled binary of pypy-1.6 is not available for $(uname -s)-$(uname -m)."
-  } 1>&4 2>&1
-  false
   ;;
 esac
 
-install_package "setuptools-2.1" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.1.tar.gz#2044725530450d0517393882dc4b7508" python
+if [ -n "${package_name}" ] && [ -n "${package_url}" ]; then
-install_package "pip-1.5" "https://pypi.python.org/packages/source/p/pip/pip-1.5.tar.gz#6969b8a8adc4c7f7c5eb1707118f0686" python
+  if [ "${package_url}" != "${package_url%%.zip*}" ]; then
+    install_zip "${package_name}" "${package_url}" "pypy" verify_py27
+  else
+    install_package "${package_name}" "${package_url}" "pypy" verify_py27
+  fi
+else
+  { echo "Precompiled binary of pypy-1.6 is not available for $(uname -s)-$(uname -m)."
+  } 1>&4 2>&1
+  exit 1
+fi
+
+install_package "setuptools-2.2" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.2.tar.gz#04a7664538957b832710653fd7d5b4e6" python
+install_package "pip-1.5.2" "https://pypi.python.org/packages/source/p/pip/pip-1.5.2.tar.gz#5da30919f732d68b1c666e484e7676f5" python

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

@@ -1,28 +1,39 @@
 case "$(uname -s)" in
 "Darwin" )
-  install_package "pypy-1.7" "https://bitbucket.org/pypy/pypy/downloads/pypy-1.7-osx64.tar.bz2#ff979054fc8e17b4973ffebb9844b159" pypy verify_py27
+  package_name="pypy-1.7"
+  package_url="https://bitbucket.org/pypy/pypy/downloads/pypy-1.7-osx64.tar.bz2#ff979054fc8e17b4973ffebb9844b159"
   ;;
 "Linux" )
   case "$(uname -m)" in
   "i386" | "i486" | "i586" | "i686" | "i786" )
-    install_package "pypy-1.7" "https://bitbucket.org/pypy/pypy/downloads/pypy-1.7-linux.tar.bz2#8a6e2583902bc6f2661eb3c96b45f4e3" pypy verify_py27
+    package_name="pypy-1.7"
+    package_url="pypy-1.7" "https://bitbucket.org/pypy/pypy/downloads/pypy-1.7-linux.tar.bz2#8a6e2583902bc6f2661eb3c96b45f4e3"
     ;;
   "x86_64" )
-    install_package "pypy-1.7" "https://bitbucket.org/pypy/pypy/downloads/pypy-1.7-linux64.tar.bz2#ceb8dfe7d9d1aeb558553b91b381a1a8" pypy verify_py27
+    package_name="pypy-1.7"
+    package_url="pypy-1.7" "https://bitbucket.org/pypy/pypy/downloads/pypy-1.7-linux64.tar.bz2#ceb8dfe7d9d1aeb558553b91b381a1a8"
     ;;
   esac
   ;;
 "CYGWIN"* | "MINGW"* )
   # FIXME: never tested on Windows
-  install_zip "pypy-1.7" "https://bitbucket.org/pypy/pypy/downloads/pypy-1.7-win32.zip#08de1ed4a4382559b1c4c46650f4a8e8" pypy verify_py27
+  package_name="pypy-1.7"
-  ;;
+  package_url="pypy-1.7" "https://bitbucket.org/pypy/pypy/downloads/pypy-1.7-win32.zip#08de1ed4a4382559b1c4c46650f4a8e8"
-* )
-  { echo "Precompiled binary of pypy-1.7 is not available for $(uname -s)-$(uname -m)."
-    echo "To build pypy-1.7 from soruce, use 'pypy-1.7-dev'."
-  } 1>&4 2>&1
-  false
   ;;
 esac
 
-install_package "setuptools-2.1" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.1.tar.gz#2044725530450d0517393882dc4b7508" python
+if [ -n "${package_name}" ] && [ -n "${package_url}" ]; then
-install_package "pip-1.5" "https://pypi.python.org/packages/source/p/pip/pip-1.5.tar.gz#6969b8a8adc4c7f7c5eb1707118f0686" python
+  if [ "${package_url}" != "${package_url%%.zip*}" ]; then
+    install_zip "${package_name}" "${package_url}" "pypy" verify_py27
+  else
+    install_package "${package_name}" "${package_url}" "pypy" verify_py27
+  fi
+else
+  { echo "Precompiled binary of pypy-1.7 is not available for $(uname -s)-$(uname -m)."
+    echo "To build pypy-1.7 from soruce, use 'pypy-1.7-dev'."
+  } 1>&4 2>&1
+  exit 1
+fi
+
+install_package "setuptools-2.2" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.2.tar.gz#04a7664538957b832710653fd7d5b4e6" python
+install_package "pip-1.5.2" "https://pypi.python.org/packages/source/p/pip/pip-1.5.2.tar.gz#5da30919f732d68b1c666e484e7676f5" 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-2.1" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.1.tar.gz#2044725530450d0517393882dc4b7508" python
+install_package "setuptools-2.2" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.2.tar.gz#04a7664538957b832710653fd7d5b4e6" python
-install_package "pip-1.5" "https://pypi.python.org/packages/source/p/pip/pip-1.5.tar.gz#6969b8a8adc4c7f7c5eb1707118f0686" python
+install_package "pip-1.5.2" "https://pypi.python.org/packages/source/p/pip/pip-1.5.2.tar.gz#5da30919f732d68b1c666e484e7676f5" python

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

@@ -1,28 +1,39 @@
 case "$(uname -s)" in
 "Darwin" )
-  install_package "pypy-1.8" "https://bitbucket.org/pypy/pypy/downloads/pypy-1.8-osx64.tar.bz2#1c293253e8e4df411c3dd59dff82a663" pypy verify_py27
+  package_name="pypy-1.8"
+  package_url="https://bitbucket.org/pypy/pypy/downloads/pypy-1.8-osx64.tar.bz2#1c293253e8e4df411c3dd59dff82a663"
   ;;
 "Linux" )
   case "$(uname -m)" in
   "i386" | "i486" | "i586" | "i686" | "i786" )
-    install_package "pypy-1.8" "https://bitbucket.org/pypy/pypy/downloads/pypy-1.8-linux.tar.bz2#c4a1d11e0283a390d9e9b801a4633b9f" pypy verify_py27
+    package_name="pypy-1.8"
+    package_url="https://bitbucket.org/pypy/pypy/downloads/pypy-1.8-linux.tar.bz2#c4a1d11e0283a390d9e9b801a4633b9f"
     ;;
   "x86_64" )
-    install_package "pypy-1.8" "https://bitbucket.org/pypy/pypy/downloads/pypy-1.8-linux64.tar.bz2#3b81363ccbc042dfdda2fabbf419e788" pypy verify_py27
+    package_name="pypy-1.8"
+    package_url="https://bitbucket.org/pypy/pypy/downloads/pypy-1.8-linux64.tar.bz2#3b81363ccbc042dfdda2fabbf419e788"
     ;;
   esac
   ;;
 "CYGWIN"* | "MINGW"* )
   # FIXME: never tested on Windows
-  install_zip "pypy-1.8" "https://bitbucket.org/pypy/pypy/downloads/pypy-1.8-win32.zip#1af8ee722721e9f5fd06b61af530ecb3" pypy verify_py27
+  package_name="pypy-1.8"
-  ;;
+  package_url="https://bitbucket.org/pypy/pypy/downloads/pypy-1.8-win32.zip#1af8ee722721e9f5fd06b61af530ecb3"
-* )
-  { echo "Precompiled binary of pypy-1.8 is not available for $(uname -s)-$(uname -m)."
-    echo "To build pypy-1.8 from soruce, use 'pypy-1.8-dev'."
-  } 1>&4 2>&1
-  false
   ;;
 esac
 
-install_package "setuptools-2.1" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.1.tar.gz#2044725530450d0517393882dc4b7508" python
+if [ -n "${package_name}" ] && [ -n "${package_url}" ]; then
-install_package "pip-1.5" "https://pypi.python.org/packages/source/p/pip/pip-1.5.tar.gz#6969b8a8adc4c7f7c5eb1707118f0686" python
+  if [ "${package_url}" != "${package_url%%.zip*}" ]; then
+    install_zip "${package_name}" "${package_url}" "pypy" verify_py27
+  else
+    install_package "${package_name}" "${package_url}" "pypy" verify_py27
+  fi
+else
+  { echo "Precompiled binary of pypy-1.8 is not available for $(uname -s)-$(uname -m)."
+    echo "To build pypy-1.8 from soruce, use 'pypy-1.8-dev'."
+  } 1>&4 2>&1
+  exit 1
+fi
+
+install_package "setuptools-2.2" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.2.tar.gz#04a7664538957b832710653fd7d5b4e6" python
+install_package "pip-1.5.2" "https://pypi.python.org/packages/source/p/pip/pip-1.5.2.tar.gz#5da30919f732d68b1c666e484e7676f5" 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-2.1" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.1.tar.gz#2044725530450d0517393882dc4b7508" python
+install_package "setuptools-2.2" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.2.tar.gz#04a7664538957b832710653fd7d5b4e6" python
-install_package "pip-1.5" "https://pypi.python.org/packages/source/p/pip/pip-1.5.tar.gz#6969b8a8adc4c7f7c5eb1707118f0686" python
+install_package "pip-1.5.2" "https://pypi.python.org/packages/source/p/pip/pip-1.5.2.tar.gz#5da30919f732d68b1c666e484e7676f5" python

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

@@ -1,28 +1,39 @@
 case "$(uname -s)" in
 "Darwin" )
-  install_package "pypy-1.9" "https://bitbucket.org/pypy/pypy/downloads/pypy-1.9-osx64.tar.bz2#aad9c4b7b827583e37fe8ae0f7cfe0ff" pypy verify_py27
+  package_name="pypy-1.9"
+  package_url="https://bitbucket.org/pypy/pypy/downloads/pypy-1.9-osx64.tar.bz2#aad9c4b7b827583e37fe8ae0f7cfe0ff"
   ;;
 "Linux" )
   case "$(uname -m)" in
   "i386" | "i486" | "i586" | "i686" | "i786" )
-    install_package "pypy-1.9" "https://bitbucket.org/pypy/pypy/downloads/pypy-1.9-linux.tar.bz2#1a08c88642434fc2e0e4256d351f48db" pypy verify_py27
+    package_name="pypy-1.9"
+    package_url="https://bitbucket.org/pypy/pypy/downloads/pypy-1.9-linux.tar.bz2#1a08c88642434fc2e0e4256d351f48db"
     ;;
   "x86_64" )
-    install_package "pypy-1.9" "https://bitbucket.org/pypy/pypy/downloads/pypy-1.9-linux64.tar.bz2#201d2cce2557e40c784473b471ee1b6b" pypy verify_py27
+    package_name="pypy-1.9"
+    package_url="https://bitbucket.org/pypy/pypy/downloads/pypy-1.9-linux64.tar.bz2#201d2cce2557e40c784473b471ee1b6b"
     ;;
   esac
   ;;
 "CYGWIN"* | "MINGW"* )
   # FIXME: never tested on Windows
-  install_zip "pypy-1.9" "https://bitbucket.org/pypy/pypy/downloads/pypy-1.9-win32.zip#e7655066baed3c7bbbca7df617817dd5" pypy verify_py27
+  package_name="pypy-1.9"
-  ;;
+  package_url="https://bitbucket.org/pypy/pypy/downloads/pypy-1.9-win32.zip#e7655066baed3c7bbbca7df617817dd5"
-* )
-  { echo "Precompiled binary of pypy-1.9 is not available for $(uname -s)-$(uname -m)."
-    echo "To build pypy-1.9 from soruce, use 'pypy-1.9-dev'."
-  } 1>&4 2>&1
-  false
   ;;
 esac
 
-install_package "setuptools-2.1" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.1.tar.gz#2044725530450d0517393882dc4b7508" python
+if [ -n "${package_name}" ] && [ -n "${package_url}" ]; then
-install_package "pip-1.5" "https://pypi.python.org/packages/source/p/pip/pip-1.5.tar.gz#6969b8a8adc4c7f7c5eb1707118f0686" python
+  if [ "${package_url}" != "${package_url%%.zip*}" ]; then
+    install_zip "${package_name}" "${package_url}" "pypy" verify_py27
+  else
+    install_package "${package_name}" "${package_url}" "pypy" verify_py27
+  fi
+else
+  { echo "Precompiled binary of pypy-1.9 is not available for $(uname -s)-$(uname -m)."
+    echo "To build pypy-1.9 from soruce, use 'pypy-1.9-dev'."
+  } 1>&4 2>&1
+  exit 1
+fi
+
+install_package "setuptools-2.2" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.2.tar.gz#04a7664538957b832710653fd7d5b4e6" python
+install_package "pip-1.5.2" "https://pypi.python.org/packages/source/p/pip/pip-1.5.2.tar.gz#5da30919f732d68b1c666e484e7676f5" 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-2.1" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.1.tar.gz#2044725530450d0517393882dc4b7508" python
+install_package "setuptools-2.2" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.2.tar.gz#04a7664538957b832710653fd7d5b4e6" python
-install_package "pip-1.5" "https://pypi.python.org/packages/source/p/pip/pip-1.5.tar.gz#6969b8a8adc4c7f7c5eb1707118f0686" python
+install_package "pip-1.5.2" "https://pypi.python.org/packages/source/p/pip/pip-1.5.2.tar.gz#5da30919f732d68b1c666e484e7676f5" python

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

@@ -1,33 +1,47 @@
 case "$(uname -s)" in
 "Darwin" )
-  install_package "pypy-2.0" "https://bitbucket.org/pypy/pypy/downloads/pypy-2.0-osx64.tar.bz2#39837722da4a03ca03eda187aafa13bb" "pypy" verify_py27
+  package_name="pypy-2.0"
+  package_url="https://bitbucket.org/pypy/pypy/downloads/pypy-2.0-osx64.tar.bz2#39837722da4a03ca03eda187aafa13bb"
   ;;
 "Linux" )
   case "$(uname -m)" in
   "armel" )
-    install_package "pypy-2.0-alpha-arm" "https://bitbucket.org/pypy/pypy/downloads/pypy-2.0-alpha-arm-armel.tar.bz2#b9c36b99296c85a590c3e480b05d5a13" "pypy" verify_py27
+    package_name="pypy-2.0-alpha-arm"
+    package_url="https://bitbucket.org/pypy/pypy/downloads/pypy-2.0-alpha-arm-armel.tar.bz2#b9c36b99296c85a590c3e480b05d5a13"
     ;;
   "armhf" )
-    install_package "pypy-2.0-alpha-arm" "https://bitbucket.org/pypy/pypy/downloads/pypy-2.0-alpha-arm-armhf.tar.bz2#2565ce68b4032eb306d998e722495694" "pypy" verify_py27
+    package_name="pypy-2.0-alpha-arm"
+    package_url="https://bitbucket.org/pypy/pypy/downloads/pypy-2.0-alpha-arm-armhf.tar.bz2#2565ce68b4032eb306d998e722495694"
     ;;
   "i386" | "i486" | "i586" | "i686" | "i786" )
-    install_package "pypy-2.0" "https://bitbucket.org/pypy/pypy/downloads/pypy-2.0-linux.tar.bz2#267c46ed8c591da19b6091aa90fa9acf" "pypy" verify_py27
+    package_name="pypy-2.0"
+    package_url="https://bitbucket.org/pypy/pypy/downloads/pypy-2.0-linux.tar.bz2#267c46ed8c591da19b6091aa90fa9acf"
     ;;
   "x86_64" )
-    install_package "pypy-2.0" "https://bitbucket.org/pypy/pypy/downloads/pypy-2.0-linux64.tar.bz2#2fe3298ac9354fbdb57a38472936b823" "pypy" verify_py27
+    package_name="pypy-2.0"
+    package_url="https://bitbucket.org/pypy/pypy/downloads/pypy-2.0-linux64.tar.bz2#2fe3298ac9354fbdb57a38472936b823"
+    ;;
   esac
   ;;
 "CYGWIN"* | "MINGW"* )
   # FIXME: never tested on Windows
-  install_zip "pypy-2.0" "https://bitbucket.org/pypy/pypy/downloads/pypy-2.0-win32.zip#f0d051c2b612b64dff496a6c0f3654fb" "pypy" verify_py27
+  package_name="pypy-2.0"
-  ;;
+  package_url="https://bitbucket.org/pypy/pypy/downloads/pypy-2.0-win32.zip#f0d051c2b612b64dff496a6c0f3654fb"
-* )
-  { echo "Precompiled binary of pypy-2.0 is not available for $(uname -s)-$(uname -m)."
-    echo "To build pypy-2.0 from soruce, use 'pypy-2.0-src'."
-  } 1>&4 2>&1
-  false
   ;;
 esac
 
-install_package "setuptools-2.1" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.1.tar.gz#2044725530450d0517393882dc4b7508" python
+if [ -n "${package_name}" ] && [ -n "${package_url}" ]; then
-install_package "pip-1.5" "https://pypi.python.org/packages/source/p/pip/pip-1.5.tar.gz#6969b8a8adc4c7f7c5eb1707118f0686" python
+  if [ "${package_url}" != "${package_url%%.zip*}" ]; then
+    install_zip "${package_name}" "${package_url}" "pypy" verify_py27
+  else
+    install_package "${package_name}" "${package_url}" "pypy" verify_py27
+  fi
+else
+  { echo "Precompiled binary of pypy-2.0 is not available for $(uname -s)-$(uname -m)."
+    echo "To build pypy-2.0 from soruce, use 'pypy-2.0-src'."
+  } 1>&4 2>&1
+  exit 1
+fi
+
+install_package "setuptools-2.2" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.2.tar.gz#04a7664538957b832710653fd7d5b4e6" python
+install_package "pip-1.5.2" "https://pypi.python.org/packages/source/p/pip/pip-1.5.2.tar.gz#5da30919f732d68b1c666e484e7676f5" 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-2.1" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.1.tar.gz#2044725530450d0517393882dc4b7508" python
+install_package "setuptools-2.2" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.2.tar.gz#04a7664538957b832710653fd7d5b4e6" python
-install_package "pip-1.5" "https://pypi.python.org/packages/source/p/pip/pip-1.5.tar.gz#6969b8a8adc4c7f7c5eb1707118f0686" python
+install_package "pip-1.5.2" "https://pypi.python.org/packages/source/p/pip/pip-1.5.2.tar.gz#5da30919f732d68b1c666e484e7676f5" 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-2.1" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.1.tar.gz#2044725530450d0517393882dc4b7508" python
+install_package "setuptools-2.2" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.2.tar.gz#04a7664538957b832710653fd7d5b4e6" python
-install_package "pip-1.5" "https://pypi.python.org/packages/source/p/pip/pip-1.5.tar.gz#6969b8a8adc4c7f7c5eb1707118f0686" python
+install_package "pip-1.5.2" "https://pypi.python.org/packages/source/p/pip/pip-1.5.2.tar.gz#5da30919f732d68b1c666e484e7676f5" python

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

@@ -1,27 +1,39 @@
 case "$(uname -s)" in
 "Darwin" )
-  install_package "pypy-2.0.1" "https://bitbucket.org/pypy/pypy/downloads/pypy-2.0.1-linux.tar.bz2#e666450bcfbd936b016a2dd7312f9853" "pypy" verify_py27
+  package_name="pypy-2.0.1"
+  package_url="https://bitbucket.org/pypy/pypy/downloads/pypy-2.0.1-linux.tar.bz2#e666450bcfbd936b016a2dd7312f9853"
   ;;
 "Linux" )
   case "$(uname -m)" in
   "i386" | "i486" | "i586" | "i686" | "i786" )
-    install_package "pypy-2.0.1" "https://bitbucket.org/pypy/pypy/downloads/pypy-2.0.1-linux.tar.bz2#8d11952e0356ea751321e7d2a1d4f17a" "pypy" verify_py27
+    package_name="pypy-2.0.1"
+    package_url="https://bitbucket.org/pypy/pypy/downloads/pypy-2.0.1-linux.tar.bz2#8d11952e0356ea751321e7d2a1d4f17a"
     ;;
   "x86_64" )
-    install_package "pypy-2.0.1" "https://bitbucket.org/pypy/pypy/downloads/pypy-2.0.1-linux64.tar.bz2#5c11d727579443d0834caadb4dfe53e3" "pypy" verify_py27
+    package_name="pypy-2.0.1"
+    package_url="https://bitbucket.org/pypy/pypy/downloads/pypy-2.0.1-linux64.tar.bz2#5c11d727579443d0834caadb4dfe53e3"
+    ;;
   esac
   ;;
 "CYGWIN"* | "MINGW"* )
   # FIXME: never tested on Windows
-  install_zip "pypy-2.0.1" "https://bitbucket.org/pypy/pypy/downloads/pypy-2.0.1-win32.zip#4c40b19ea1ec5c8c8c2a1f94f59bdf02" "pypy" verify_py27
+  package_name="pypy-2.0.1"
-  ;;
+  package_url="https://bitbucket.org/pypy/pypy/downloads/pypy-2.0.1-win32.zip#4c40b19ea1ec5c8c8c2a1f94f59bdf02"
-* )
-  { echo "Precompiled binary of pypy-2.0.1 is not available for $(uname -s)-$(uname -m)."
-    echo "To build pypy-2.0.1 from soruce, use 'pypy-2.0.1-src'."
-  } 1>&4 2>&1
-  false
   ;;
 esac
 
-install_package "setuptools-2.1" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.1.tar.gz#2044725530450d0517393882dc4b7508" python
+if [ -n "${package_name}" ] && [ -n "${package_url}" ]; then
-install_package "pip-1.5" "https://pypi.python.org/packages/source/p/pip/pip-1.5.tar.gz#6969b8a8adc4c7f7c5eb1707118f0686" python
+  if [ "${package_url}" != "${package_url%%.zip*}" ]; then
+    install_zip "${package_name}" "${package_url}" "pypy" verify_py27
+  else
+    install_package "${package_name}" "${package_url}" "pypy" verify_py27
+  fi
+else
+  { echo "Precompiled binary of pypy-2.0.1 is not available for $(uname -s)-$(uname -m)."
+    echo "To build pypy-2.0.1 from soruce, use 'pypy-2.0.1-src'."
+  } 1>&4 2>&1
+  exit 1
+fi
+
+install_package "setuptools-2.2" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.2.tar.gz#04a7664538957b832710653fd7d5b4e6" python
+install_package "pip-1.5.2" "https://pypi.python.org/packages/source/p/pip/pip-1.5.2.tar.gz#5da30919f732d68b1c666e484e7676f5" 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-2.1" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.1.tar.gz#2044725530450d0517393882dc4b7508" python
+install_package "setuptools-2.2" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.2.tar.gz#04a7664538957b832710653fd7d5b4e6" python
-install_package "pip-1.5" "https://pypi.python.org/packages/source/p/pip/pip-1.5.tar.gz#6969b8a8adc4c7f7c5eb1707118f0686" python
+install_package "pip-1.5.2" "https://pypi.python.org/packages/source/p/pip/pip-1.5.2.tar.gz#5da30919f732d68b1c666e484e7676f5" python

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

@@ -1,27 +1,39 @@
 case "$(uname -s)" in
 "Darwin" )
-  install_package "pypy-2.0.2" "https://bitbucket.org/pypy/pypy/downloads/pypy-2.0.2-osx64.tar.bz2#a7da45a3161c198de6f662e3c40629ff" "pypy" verify_py27
+  package_name="pypy-2.0.2"
+  package_url="https://bitbucket.org/pypy/pypy/downloads/pypy-2.0.2-osx64.tar.bz2#a7da45a3161c198de6f662e3c40629ff"
   ;;
 "Linux" )
   case "$(uname -m)" in
   "i386" | "i486" | "i586" | "i686" | "i786" )
-    install_package "pypy-2.0.2" "https://bitbucket.org/pypy/pypy/downloads/pypy-2.0.2-linux.tar.bz2#51ac0aa37a8255acbc71eca23ea29609" "pypy" verify_py27
+    package_name="pypy-2.0.2"
+    package_url="https://bitbucket.org/pypy/pypy/downloads/pypy-2.0.2-linux.tar.bz2#51ac0aa37a8255acbc71eca23ea29609"
     ;;
   "x86_64" )
-    install_package "pypy-2.0.2" "https://bitbucket.org/pypy/pypy/downloads/pypy-2.0.2-linux64.tar.bz2#9d9f512ab2f114bfb4f165c71181a511" "pypy" verify_py27
+    package_name="pypy-2.0.2"
+    package_url="https://bitbucket.org/pypy/pypy/downloads/pypy-2.0.2-linux64.tar.bz2#9d9f512ab2f114bfb4f165c71181a511"
+    ;;
   esac
   ;;
 "CYGWIN"* | "MINGW"* )
   # FIXME: never tested on Windows
-  install_zip "pypy-2.0.2" "https://bitbucket.org/pypy/pypy/downloads/pypy-2.0.2-win32.zip#3e51dce7ecfc8fb069d65d95e8de6fb2" "pypy" verify_py27
+  package_name="pypy-2.0.2"
-  ;;
+  package_url="https://bitbucket.org/pypy/pypy/downloads/pypy-2.0.2-win32.zip#3e51dce7ecfc8fb069d65d95e8de6fb2"
-* )
-  { echo "Precompiled binary of pypy-2.0.2 is not available for $(uname -s)-$(uname -m)."
-    echo "To build pypy-2.0.2 from soruce, use 'pypy-2.0.2-src'."
-  } 1>&4 2>&1
-  false
   ;;
 esac
 
-install_package "setuptools-2.1" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.1.tar.gz#2044725530450d0517393882dc4b7508" python
+if [ -n "${package_name}" ] && [ -n "${package_url}" ]; then
-install_package "pip-1.5" "https://pypi.python.org/packages/source/p/pip/pip-1.5.tar.gz#6969b8a8adc4c7f7c5eb1707118f0686" python
+  if [ "${package_url}" != "${package_url%%.zip*}" ]; then
+    install_zip "${package_name}" "${package_url}" "pypy" verify_py27
+  else
+    install_package "${package_name}" "${package_url}" "pypy" verify_py27
+  fi
+else
+  { echo "Precompiled binary of pypy-2.0.2 is not available for $(uname -s)-$(uname -m)."
+    echo "To build pypy-2.0.2 from soruce, use 'pypy-2.0.2-src'."
+  } 1>&4 2>&1
+  exit 1
+fi
+
+install_package "setuptools-2.2" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.2.tar.gz#04a7664538957b832710653fd7d5b4e6" python
+install_package "pip-1.5.2" "https://pypi.python.org/packages/source/p/pip/pip-1.5.2.tar.gz#5da30919f732d68b1c666e484e7676f5" 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-2.1" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.1.tar.gz#2044725530450d0517393882dc4b7508" python
+install_package "setuptools-2.2" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.2.tar.gz#04a7664538957b832710653fd7d5b4e6" python
-install_package "pip-1.5" "https://pypi.python.org/packages/source/p/pip/pip-1.5.tar.gz#6969b8a8adc4c7f7c5eb1707118f0686" python
+install_package "pip-1.5.2" "https://pypi.python.org/packages/source/p/pip/pip-1.5.2.tar.gz#5da30919f732d68b1c666e484e7676f5" python

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

@@ -1,33 +1,55 @@
 case "$(uname -s)" in
 "Darwin" )
-  install_package "pypy-2.1" "https://bitbucket.org/pypy/pypy/downloads/pypy-2.1-osx64.tar.bz2#2a9b66d1511335183108428436fe4184" "pypy" verify_py27
+  package_name="pypy-2.1"
+  package_url="https://bitbucket.org/pypy/pypy/downloads/pypy-2.1-osx64.tar.bz2#2a9b66d1511335183108428436fe4184"
   ;;
 "Linux" )
   case "$(uname -m)" in
   "armel" )
-    install_package "pypy-2.1" "https://bitbucket.org/pypy/pypy/downloads/pypy-2.1-linux-armel.tar.bz2#48cdb54c54153d219670a8a56364e9cb" "pypy" verify_py27
+    package_name="pypy-2.1"
+    package_url="https://bitbucket.org/pypy/pypy/downloads/pypy-2.1-linux-armel.tar.bz2#48cdb54c54153d219670a8a56364e9cb"
     ;;
-  "armhf" )
+  "armhf" | "armv6l" | "armv7l" )
-    install_package "pypy-2.1" "https://bitbucket.org/pypy/pypy/downloads/pypy-2.1-linux-armhf-raring.tar.bz2#563a97875c342459c277cdd567c83af8" "pypy" verify_py27
+    case "$(cat /etc/issue 2>/dev/null || true)" in
+    "Raspbian"* )
+      package_name="pypy-2.1"
+      package_url="https://bitbucket.org/pypy/pypy/downloads/pypy-2.1-linux-armhf-raspbian.tar.bz2#56de3739f73072dfd53c7249dd04603a"
+      ;;
+    "Ubuntu"* )
+      package_name="pypy-2.1"
+      package_url="https://bitbucket.org/pypy/pypy/downloads/pypy-2.1-linux-armhf-raring.tar.bz2#563a97875c342459c277cdd567c83af8"
+      ;;
+    esac
     ;;
   "i386" | "i486" | "i586" | "i686" | "i786" )
-    install_package "pypy-2.1" "https://bitbucket.org/pypy/pypy/downloads/pypy-2.1-linux.tar.bz2#dd6b4f4f52ab1bebe30b32dc4085757a" "pypy" verify_py27
+    package_name="pypy-2.1"
+    package_url="https://bitbucket.org/pypy/pypy/downloads/pypy-2.1-linux.tar.bz2#dd6b4f4f52ab1bebe30b32dc4085757a"
     ;;
   "x86_64" )
-    install_package "pypy-2.1" "https://bitbucket.org/pypy/pypy/downloads/pypy-2.1-linux64.tar.bz2#80ef61f3b1b15fd0bd94fa5cdf8a005f" "pypy" verify_py27
+    package_name="pypy-2.1"
+    package_url="https://bitbucket.org/pypy/pypy/downloads/pypy-2.1-linux64.tar.bz2#80ef61f3b1b15fd0bd94fa5cdf8a005f"
+    ;;
   esac
   ;;
 "CYGWIN"* | "MINGW"* )
   # FIXME: never tested on Windows
-  install_zip "pypy-2.1" "https://bitbucket.org/pypy/pypy/downloads/pypy-2.1-win32.zip#9943c7a008535c99fed6bbe1c5a22797" "pypy" verify_py27
+  package_name="pypy-2.1"
-  ;;
+  package_url="https://bitbucket.org/pypy/pypy/downloads/pypy-2.1-win32.zip#9943c7a008535c99fed6bbe1c5a22797"
-* )
-  { echo "Precompiled binary of pypy-2.1 is not available for $(uname -s)-$(uname -m)."
-    echo "To build pypy-2.1 from soruce, use 'pypy-2.1-src'."
-  } 1>&4 2>&1
-  false
   ;;
 esac
 
-install_package "setuptools-2.1" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.1.tar.gz#2044725530450d0517393882dc4b7508" python
+if [ -n "${package_name}" ] && [ -n "${package_url}" ]; then
-install_package "pip-1.5" "https://pypi.python.org/packages/source/p/pip/pip-1.5.tar.gz#6969b8a8adc4c7f7c5eb1707118f0686" python
+  if [ "${package_url}" != "${package_url%%.zip*}" ]; then
+    install_zip "${package_name}" "${package_url}" "pypy" verify_py27
+  else
+    install_package "${package_name}" "${package_url}" "pypy" verify_py27
+  fi
+else
+  { echo "Precompiled binary of pypy-2.1 is not available for $(uname -s)-$(uname -m)."
+    echo "To build pypy-2.1 from soruce, use 'pypy-2.1-src'."
+  } 1>&4 2>&1
+  exit 1
+fi
+
+install_package "setuptools-2.2" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.2.tar.gz#04a7664538957b832710653fd7d5b4e6" python
+install_package "pip-1.5.2" "https://pypi.python.org/packages/source/p/pip/pip-1.5.2.tar.gz#5da30919f732d68b1c666e484e7676f5" 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-2.1" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.1.tar.gz#2044725530450d0517393882dc4b7508" python
+install_package "setuptools-2.2" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.2.tar.gz#04a7664538957b832710653fd7d5b4e6" python
-install_package "pip-1.5" "https://pypi.python.org/packages/source/p/pip/pip-1.5.tar.gz#6969b8a8adc4c7f7c5eb1707118f0686" python
+install_package "pip-1.5.2" "https://pypi.python.org/packages/source/p/pip/pip-1.5.2.tar.gz#5da30919f732d68b1c666e484e7676f5" python

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

@@ -1,33 +1,55 @@
 case "$(uname -s)" in
 "Darwin" )
-  install_package "pypy-2.2-osx64" "https://bitbucket.org/pypy/pypy/downloads/pypy-2.2-osx64.tar.bz2#690783f07340888a0fa180789de789da" "pypy" verify_py27
+  package_name="pypy-2.2-osx64"
+  package_url="https://bitbucket.org/pypy/pypy/downloads/pypy-2.2-osx64.tar.bz2#690783f07340888a0fa180789de789da"
   ;;
 "Linux" )
   case "$(uname -m)" in
   "armel" )
-    install_package "pypy-2.2-linux-armel" "https://bitbucket.org/pypy/pypy/downloads/pypy-2.2-linux-armel.tar.bz2#c50373a6c2517b43c65fd84ac2cd3a6f" "pypy" verify_py27
+    package_name="pypy-2.2-linux-armel"
+    package_url="https://bitbucket.org/pypy/pypy/downloads/pypy-2.2-linux-armel.tar.bz2#c50373a6c2517b43c65fd84ac2cd3a6f"
     ;;
-  "armhf" )
+  "armhf" | "armv6l" | "armv7l" )
-    install_package "pypy-2.2-linux-armhf-raring" "https://bitbucket.org/pypy/pypy/downloads/pypy-2.2-linux-armhf-raring.tar.bz2#830fdcfafae461d8e72daa94a1ab4499" "pypy" verify_py27
+    case "$(cat /etc/issue 2>/dev/null || true)" in
+    "Raspbian"* )
+      package_name="pypy-2.2-linux-armhf-raspbian"
+      package_url="https://bitbucket.org/pypy/pypy/downloads/pypy-2.2-linux-armhf-raspbian.tar.bz2#e9c9f28cba22d07445e9195c1d2fede6"
+      ;;
+    "Ubuntu"* )
+      package_name="pypy-2.2-linux-armhf-raring"
+      package_url="https://bitbucket.org/pypy/pypy/downloads/pypy-2.2-linux-armhf-raring.tar.bz2#830fdcfafae461d8e72daa94a1ab4499"
+      ;;
+    esac
     ;;
   "i386" | "i486" | "i586" | "i686" | "i786" )
-    install_package "pypy-2.2-linux" "https://bitbucket.org/pypy/pypy/downloads/pypy-2.2-linux.tar.bz2#28b38b2417c3cad4c32db120f718bcd9" "pypy" verify_py27
+    package_name="pypy-2.2-linux"
+    package_url="https://bitbucket.org/pypy/pypy/downloads/pypy-2.2-linux.tar.bz2#28b38b2417c3cad4c32db120f718bcd9"
     ;;
   "x86_64" )
-    install_package "pypy-2.2-linux64" "https://bitbucket.org/pypy/pypy/downloads/pypy-2.2-linux64.tar.bz2#2ce3be921d063eff8286be2e82649638" "pypy" verify_py27
+    package_name="pypy-2.2-linux64"
+    package_url="https://bitbucket.org/pypy/pypy/downloads/pypy-2.2-linux64.tar.bz2#2ce3be921d063eff8286be2e82649638"
+    ;;
   esac
   ;;
 "CYGWIN"* | "MINGW"* )
   # FIXME: never tested on Windows
-  install_zip "pypy-2.2-win32" "https://bitbucket.org/pypy/pypy/downloads/pypy-2.2-win32.zip#b44e65f0a7951c0f7eb4338f89120120" "pypy" verify_py27
+  package_name="pypy-2.2-win32"
-  ;;
+  package_url="https://bitbucket.org/pypy/pypy/downloads/pypy-2.2-win32.zip#b44e65f0a7951c0f7eb4338f89120120"
-* )
-  { echo "Precompiled binary of pypy-2.2 is not available for $(uname -s)-$(uname -m)."
-    echo "To build pypy-2.2 from soruce, use 'pypy-2.2-src'."
-  } 1>&4 2>&1
-  false
   ;;
 esac
 
-install_package "setuptools-2.1" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.1.tar.gz#2044725530450d0517393882dc4b7508" python
+if [ -n "${package_name}" ] && [ -n "${package_url}" ]; then
-install_package "pip-1.5" "https://pypi.python.org/packages/source/p/pip/pip-1.5.tar.gz#6969b8a8adc4c7f7c5eb1707118f0686" python
+  if [ "${package_url}" != "${package_url%%.zip*}" ]; then
+    install_zip "${package_name}" "${package_url}" "pypy" verify_py27
+  else
+    install_package "${package_name}" "${package_url}" "pypy" verify_py27
+  fi
+else
+  { echo "Precompiled binary of pypy-2.2 is not available for $(uname -s)-$(uname -m)."
+    echo "To build pypy-2.2 from soruce, use 'pypy-2.2-src'."
+  } 1>&4 2>&1
+  exit 1
+fi
+
+install_package "setuptools-2.2" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.2.tar.gz#04a7664538957b832710653fd7d5b4e6" python
+install_package "pip-1.5.2" "https://pypi.python.org/packages/source/p/pip/pip-1.5.2.tar.gz#5da30919f732d68b1c666e484e7676f5" 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-2.1" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.1.tar.gz#2044725530450d0517393882dc4b7508" python
+install_package "setuptools-2.2" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.2.tar.gz#04a7664538957b832710653fd7d5b4e6" python
-install_package "pip-1.5" "https://pypi.python.org/packages/source/p/pip/pip-1.5.tar.gz#6969b8a8adc4c7f7c5eb1707118f0686" python
+install_package "pip-1.5.2" "https://pypi.python.org/packages/source/p/pip/pip-1.5.2.tar.gz#5da30919f732d68b1c666e484e7676f5" python

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

@@ -1,33 +1,55 @@
 case "$(uname -s)" in
 "Darwin" )
-  install_package "pypy-2.2.1-osx64" "https://bitbucket.org/pypy/pypy/downloads/pypy-2.2.1-osx64.tar.bz2#040cd25e95f62242c41e9d4e1e1c1166" "pypy" verify_py27
+  package_name="pypy-2.2.1-osx64"
+  package_url="https://bitbucket.org/pypy/pypy/downloads/pypy-2.2.1-osx64.tar.bz2#040cd25e95f62242c41e9d4e1e1c1166"
   ;;
 "Linux" )
   case "$(uname -m)" in
   "armel" )
-    install_package "pypy-2.2.1-linux-armel" "https://bitbucket.org/pypy/pypy/downloads/pypy-2.2.1-linux-armel.tar.bz2#0127094c36f985f6c2b4ed82be3fb6c8" "pypy" verify_py27
+    package_name="pypy-2.2.1-linux-armel"
+    package_url="https://bitbucket.org/pypy/pypy/downloads/pypy-2.2.1-linux-armel.tar.bz2#0127094c36f985f6c2b4ed82be3fb6c8"
     ;;
-  "armhf" )
+  "armhf" | "armv6l" | "armv7l" )
-    install_package "pypy-2.2.1-linux-armhf-raring" "https://bitbucket.org/pypy/pypy/downloads/pypy-2.2.1-linux-armhf-raring.tar.bz2#278e0ceb961bd0f49af53a01301601d4" "pypy" verify_py27
+    case "$(cat /etc/issue 2>/dev/null || true)" in
+    "Raspbian"* )
+      package_name="pypy-2.2.1-linux-armhf-raspbian"
+      package_url="https://bitbucket.org/pypy/pypy/downloads/pypy-2.2.1-linux-armhf-raspbian.tar.bz2#dcb1803b109a43b3a5b166bb1f7c4736"
+      ;;
+    "Ubuntu"* )
+      package_name="pypy-2.2.1-linux-armhf-raring"
+      package_url="https://bitbucket.org/pypy/pypy/downloads/pypy-2.2.1-linux-armhf-raring.tar.bz2#278e0ceb961bd0f49af53a01301601d4"
+      ;;
+    esac
     ;;
   "i386" | "i486" | "i586" | "i686" | "i786" )
-    install_package "pypy-2.2.1-linux" "https://bitbucket.org/pypy/pypy/downloads/pypy-2.2.1-linux.tar.bz2#86ef92a13faf309f4f413e35c01afcab" "pypy" verify_py27
+    package_name="pypy-2.2.1-linux"
+    package_url="https://bitbucket.org/pypy/pypy/downloads/pypy-2.2.1-linux.tar.bz2#86ef92a13faf309f4f413e35c01afcab"
     ;;
   "x86_64" )
-    install_package "pypy-2.2.1-linux64" "https://bitbucket.org/pypy/pypy/downloads/pypy-2.2.1-linux64.tar.bz2#96732d12957fa3c8e58ded2939631e5f" "pypy" verify_py27
+    package_name="pypy-2.2.1-linux64"
+    package_url="https://bitbucket.org/pypy/pypy/downloads/pypy-2.2.1-linux64.tar.bz2#96732d12957fa3c8e58ded2939631e5f"
+    ;;
   esac
   ;;
 "CYGWIN"* | "MINGW"* )
   # FIXME: never tested on Windows
-  install_zip "pypy-2.2.1-win32" "https://bitbucket.org/pypy/pypy/downloads/pypy-2.2.1-win32.zip#213aacf7a06cd531c3457f1c5a73059c" "pypy" verify_py27
+  package_name="pypy-2.2.1-win32"
-  ;;
+  package_url="https://bitbucket.org/pypy/pypy/downloads/pypy-2.2.1-win32.zip#213aacf7a06cd531c3457f1c5a73059c"
-* )
-  { echo "Precompiled binary of pypy-2.2.1 is not available for $(uname -s)-$(uname -m)."
-    echo "To build pypy-2.2.1 from soruce, use 'pypy-2.2.1-src'."
-  } 1>&4 2>&1
-  false
   ;;
 esac
 
-install_package "setuptools-2.1" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.1.tar.gz#2044725530450d0517393882dc4b7508" python
+if [ -n "${package_name}" ] && [ -n "${package_url}" ]; then
-install_package "pip-1.5" "https://pypi.python.org/packages/source/p/pip/pip-1.5.tar.gz#6969b8a8adc4c7f7c5eb1707118f0686" python
+  if [ "${package_url}" != "${package_url%%.zip*}" ]; then
+    install_zip "${package_name}" "${package_url}" "pypy" verify_py27
+  else
+    install_package "${package_name}" "${package_url}" "pypy" verify_py27
+  fi
+else
+  { echo "Precompiled binary of pypy-2.2.1 is not available for $(uname -s)-$(uname -m)."
+    echo "To build pypy-2.2.1 from soruce, use 'pypy-2.2.1-src'."
+  } 1>&4 2>&1
+  exit 1
+fi
+
+install_package "setuptools-2.2" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.2.tar.gz#04a7664538957b832710653fd7d5b4e6" python
+install_package "pip-1.5.2" "https://pypi.python.org/packages/source/p/pip/pip-1.5.2.tar.gz#5da30919f732d68b1c666e484e7676f5" 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-2.1" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.1.tar.gz#2044725530450d0517393882dc4b7508" python
+install_package "setuptools-2.2" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.2.tar.gz#04a7664538957b832710653fd7d5b4e6" python
-install_package "pip-1.5" "https://pypi.python.org/packages/source/p/pip/pip-1.5.tar.gz#6969b8a8adc4c7f7c5eb1707118f0686" python
+install_package "pip-1.5.2" "https://pypi.python.org/packages/source/p/pip/pip-1.5.2.tar.gz#5da30919f732d68b1c666e484e7676f5" 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-2.1" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.1.tar.gz#2044725530450d0517393882dc4b7508" python
+install_package "setuptools-2.2" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.2.tar.gz#04a7664538957b832710653fd7d5b4e6" python
-install_package "pip-1.5" "https://pypi.python.org/packages/source/p/pip/pip-1.5.tar.gz#6969b8a8adc4c7f7c5eb1707118f0686" python
+install_package "pip-1.5.2" "https://pypi.python.org/packages/source/p/pip/pip-1.5.2.tar.gz#5da30919f732d68b1c666e484e7676f5" python

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

@@ -1,33 +1,55 @@
 case "$(uname -s)" in
 "Darwin" )
-  install_package "pypy3-2.1-beta1-osx64" "https://bitbucket.org/pypy/pypy/downloads/pypy3-2.1-beta1-osx64.tar.bz2#36634bf17f0e9852fda7cc6745f2df28" "pypy" verify_py32
+  package_name="pypy3-2.1-beta1-osx64"
+  package_url="https://bitbucket.org/pypy/pypy/downloads/pypy3-2.1-beta1-osx64.tar.bz2#36634bf17f0e9852fda7cc6745f2df28"
   ;;
 "Linux" )
   case "$(uname -m)" in
   "armel" )
-    install_package "pypy3-2.1-beta1-linux-armel" "https://bitbucket.org/pypy/pypy/downloads/pypy3-2.1-beta1-linux-armel.tar.bz2#d57d0d0d3c49c7cce75440924d8f66b7" "pypy" verify_py32
+    package_name="pypy3-2.1-beta1-linux-armel"
+    package_url="https://bitbucket.org/pypy/pypy/downloads/pypy3-2.1-beta1-linux-armel.tar.bz2#d57d0d0d3c49c7cce75440924d8f66b7"
     ;;
-  "armhf" )
+  "armhf" | "armv6l" | "armv7l" )
-    install_package "pypy3-2.1-beta1-linux-armhf-raring" "https://bitbucket.org/pypy/pypy/downloads/pypy3-2.1-beta1-linux-armhf-raring.tar.bz2#55b82b199ccf537c7ea5e2f31df78dfe" "pypy" verify_py32
+    case "$(cat /etc/issue 2>/dev/null || true)" in
+    "Raspbian"* )
+      package_name="pypy3-2.1-beta1-linux-armhf-raspbian"
+      package_url="https://bitbucket.org/pypy/pypy/downloads/pypy3-2.1-beta1-linux-armhf-raspbian.tar.bz2#a43e64557fe27b979a8546a89c05652f"
+      ;;
+    "Ubuntu"* )
+      package_name="pypy3-2.1-beta1-linux-armhf-raring"
+      package_url="https://bitbucket.org/pypy/pypy/downloads/pypy3-2.1-beta1-linux-armhf-raring.tar.bz2#55b82b199ccf537c7ea5e2f31df78dfe"
+      ;;
+    esac
     ;;
   "i386" | "i486" | "i586" | "i686" | "i786" )
-    install_package "pypy3-2.1-beta1-linux" "https://bitbucket.org/pypy/pypy/downloads/pypy3-2.1-beta1-linux.tar.bz2#9ae9d0b67279c557fb4b7f57c3072d0f" "pypy" verify_py32
+    package_name="pypy3-2.1-beta1-linux"
+    package_url="https://bitbucket.org/pypy/pypy/downloads/pypy3-2.1-beta1-linux.tar.bz2#9ae9d0b67279c557fb4b7f57c3072d0f"
     ;;
   "x86_64" )
-    install_package "pypy3-2.1-beta1-linux64" "https://bitbucket.org/pypy/pypy/downloads/pypy3-2.1-beta1-linux64.tar.bz2#f6adca4d26f34bef9903cc5347c7d688" "pypy" verify_py32
+    package_name="pypy3-2.1-beta1-linux64"
+    package_url="https://bitbucket.org/pypy/pypy/downloads/pypy3-2.1-beta1-linux64.tar.bz2#f6adca4d26f34bef9903cc5347c7d688"
+    ;;
   esac
   ;;
 "CYGWIN"* | "MINGW"* )
   # FIXME: never tested on Windows
-  install_zip "pypy3-2.1-beta1-win32" "https://bitbucket.org/pypy/pypy/downloads/pypy3-2.1-beta1-win32.zip#026c8be208bf2ef742ddfa3f8ca41a05" "pypy" verify_py32
+  package_name="pypy3-2.1-beta1-win32"
-  ;;
+  package_url="https://bitbucket.org/pypy/pypy/downloads/pypy3-2.1-beta1-win32.zip#026c8be208bf2ef742ddfa3f8ca41a05"
-* )
-  { echo "Precompiled binary of pypy3-2.1-beta1 is not available for $(uname -s)-$(uname -m)."
-    echo "To build pypy3-2.1-beta1 from soruce, use 'pypy3-2.1-beta1-src'."
-  } 1>&4 2>&1
-  false
   ;;
 esac
 
-install_package "setuptools-2.1" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.1.tar.gz#2044725530450d0517393882dc4b7508" python
+if [ -n "${package_name}" ] && [ -n "${package_url}" ]; then
-install_package "pip-1.5" "https://pypi.python.org/packages/source/p/pip/pip-1.5.tar.gz#6969b8a8adc4c7f7c5eb1707118f0686" python
+  if [ "${package_url}" != "${package_url%%.zip*}" ]; then
+    install_zip "${package_name}" "${package_url}" "pypy" verify_py32
+  else
+    install_package "${package_name}" "${package_url}" "pypy" verify_py32
+  fi
+else
+  { echo "Precompiled binary of pypy3-2.1-beta1 is not available for $(uname -s)-$(uname -m)."
+    echo "To build pypy3-2.1-beta1 from soruce, use 'pypy3-2.1-beta1-src'."
+  } 1>&4 2>&1
+  exit 1
+fi
+
+install_package "setuptools-2.2" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.2.tar.gz#04a7664538957b832710653fd7d5b4e6" python
+install_package "pip-1.5.2" "https://pypi.python.org/packages/source/p/pip/pip-1.5.2.tar.gz#5da30919f732d68b1c666e484e7676f5" 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-2.1" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.1.tar.gz#2044725530450d0517393882dc4b7508" python
+install_package "setuptools-2.2" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.2.tar.gz#04a7664538957b832710653fd7d5b4e6" python
-install_package "pip-1.5" "https://pypi.python.org/packages/source/p/pip/pip-1.5.tar.gz#6969b8a8adc4c7f7c5eb1707118f0686" python
+install_package "pip-1.5.2" "https://pypi.python.org/packages/source/p/pip/pip-1.5.2.tar.gz#5da30919f732d68b1c666e484e7676f5" 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-2.1" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.1.tar.gz#2044725530450d0517393882dc4b7508" python
+install_package "setuptools-2.2" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.2.tar.gz#04a7664538957b832710653fd7d5b4e6" python
-install_package "pip-1.5" "https://pypi.python.org/packages/source/p/pip/pip-1.5.tar.gz#6969b8a8adc4c7f7c5eb1707118f0686" python
+install_package "pip-1.5.2" "https://pypi.python.org/packages/source/p/pip/pip-1.5.2.tar.gz#5da30919f732d68b1c666e484e7676f5" python

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

@@ -1,5 +1,5 @@
 require_cc "gcc" "clang"
 install_package "readline-6.2" "http://ftpmirror.gnu.org/readline/readline-6.2.tar.gz#67948acb2ca081f23359d0256e9a271c" 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-2.1" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.1.tar.gz#2044725530450d0517393882dc4b7508" python
+install_package "setuptools-2.2" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.2.tar.gz#04a7664538957b832710653fd7d5b4e6" python
-install_package "pip-1.5" "https://pypi.python.org/packages/source/p/pip/pip-1.5.tar.gz#6969b8a8adc4c7f7c5eb1707118f0686" python
+install_package "pip-1.5.2" "https://pypi.python.org/packages/source/p/pip/pip-1.5.2.tar.gz#5da30919f732d68b1c666e484e7676f5" python

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

@@ -1,5 +1,5 @@
 require_cc "gcc" "clang"
 install_package "readline-6.2" "http://ftpmirror.gnu.org/readline/readline-6.2.tar.gz#67948acb2ca081f23359d0256e9a271c" 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-2.1" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.1.tar.gz#2044725530450d0517393882dc4b7508" python
+install_package "setuptools-2.2" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.2.tar.gz#04a7664538957b832710653fd7d5b4e6" python
-install_package "pip-1.5" "https://pypi.python.org/packages/source/p/pip/pip-1.5.tar.gz#6969b8a8adc4c7f7c5eb1707118f0686" python
+install_package "pip-1.5.2" "https://pypi.python.org/packages/source/p/pip/pip-1.5.2.tar.gz#5da30919f732d68b1c666e484e7676f5" python

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

@@ -1,5 +1,5 @@
 require_cc "gcc" "clang"
 install_package "readline-6.2" "http://ftpmirror.gnu.org/readline/readline-6.2.tar.gz#67948acb2ca081f23359d0256e9a271c" 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-2.1" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.1.tar.gz#2044725530450d0517393882dc4b7508" python
+install_package "setuptools-2.2" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.2.tar.gz#04a7664538957b832710653fd7d5b4e6" python
-install_package "pip-1.5" "https://pypi.python.org/packages/source/p/pip/pip-1.5.tar.gz#6969b8a8adc4c7f7c5eb1707118f0686" python
+install_package "pip-1.5.2" "https://pypi.python.org/packages/source/p/pip/pip-1.5.2.tar.gz#5da30919f732d68b1c666e484e7676f5" python

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

@@ -1,5 +1,5 @@
 require_cc "gcc" "clang"
 install_package "readline-6.2" "http://ftpmirror.gnu.org/readline/readline-6.2.tar.gz#67948acb2ca081f23359d0256e9a271c" 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-2.1" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.1.tar.gz#2044725530450d0517393882dc4b7508" python
+install_package "setuptools-2.2" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.2.tar.gz#04a7664538957b832710653fd7d5b4e6" python
-install_package "pip-1.5" "https://pypi.python.org/packages/source/p/pip/pip-1.5.tar.gz#6969b8a8adc4c7f7c5eb1707118f0686" python
+install_package "pip-1.5.2" "https://pypi.python.org/packages/source/p/pip/pip-1.5.2.tar.gz#5da30919f732d68b1c666e484e7676f5" python

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

@@ -1,5 +1,5 @@
 require_cc "gcc" "clang"
 install_package "readline-6.2" "http://ftpmirror.gnu.org/readline/readline-6.2.tar.gz#67948acb2ca081f23359d0256e9a271c" 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-2.1" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.1.tar.gz#2044725530450d0517393882dc4b7508" python
+install_package "setuptools-2.2" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.2.tar.gz#04a7664538957b832710653fd7d5b4e6" python
-install_package "pip-1.5" "https://pypi.python.org/packages/source/p/pip/pip-1.5.tar.gz#6969b8a8adc4c7f7c5eb1707118f0686" python
+install_package "pip-1.5.2" "https://pypi.python.org/packages/source/p/pip/pip-1.5.2.tar.gz#5da30919f732d68b1c666e484e7676f5" python

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

@@ -1,5 +1,5 @@
 require_cc "gcc" "clang"
 install_package "readline-6.2" "http://ftpmirror.gnu.org/readline/readline-6.2.tar.gz#67948acb2ca081f23359d0256e9a271c" standard --if has_broken_mac_readline
 install_hg "stackless-dev" "http://hg.python.org/stackless" "default" standard verify_py33
-install_package "setuptools-2.1" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.1.tar.gz#2044725530450d0517393882dc4b7508" python
+install_package "setuptools-2.2" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.2.tar.gz#04a7664538957b832710653fd7d5b4e6" python
-install_package "pip-1.5" "https://pypi.python.org/packages/source/p/pip/pip-1.5.tar.gz#6969b8a8adc4c7f7c5eb1707118f0686" python
+install_package "pip-1.5.2" "https://pypi.python.org/packages/source/p/pip/pip-1.5.2.tar.gz#5da30919f732d68b1c666e484e7676f5" python

plugins/python-build/test/build.bats

@@ -0,0 +1,349 @@
+#!/usr/bin/env bats
+
+load test_helper
+export PYTHON_BUILD_CACHE_PATH="$TMP/cache"
+export MAKE=make
+export MAKE_OPTS="-j 2"
+
+setup() {
+  mkdir -p "$INSTALL_ROOT"
+  stub md5 false
+  stub curl false
+}
+
+executable() {
+  local file="$1"
+  mkdir -p "${file%/*}"
+  cat > "$file"
+  chmod +x "$file"
+}
+
+cached_tarball() {
+  mkdir -p "$PYTHON_BUILD_CACHE_PATH"
+  pushd "$PYTHON_BUILD_CACHE_PATH" >/dev/null
+  tarball "$@"
+  popd >/dev/null
+}
+
+tarball() {
+  local name="$1"
+  local path="$PWD/$name"
+  local configure="$path/configure"
+  shift 1
+
+  executable "$configure" <<OUT
+#!$BASH
+echo "$name: \$@" \${PYTHONOPT:+PYTHONOPT=\$PYTHONOPT} >> build.log
+OUT
+
+  for file; do
+    mkdir -p "$(dirname "${path}/${file}")"
+    touch "${path}/${file}"
+  done
+
+  tar czf "${path}.tar.gz" -C "${path%/*}" "$name"
+}
+
+stub_make_install() {
+  stub "$MAKE" \
+    " : echo \"$MAKE \$@\" >> build.log" \
+    "install : echo \"$MAKE \$@\" >> build.log && cat build.log >> '$INSTALL_ROOT/build.log'"
+}
+
+assert_build_log() {
+  run cat "$INSTALL_ROOT/build.log"
+  assert_output
+}
+
+@test "yaml is installed for python" {
+  cached_tarball "yaml-0.1.5"
+  cached_tarball "Python-3.2.1"
+
+  stub brew false
+  stub_make_install
+  stub_make_install
+
+  install_fixture definitions/needs-yaml
+  assert_success
+
+  unstub make
+
+  assert_build_log <<OUT
+yaml-0.1.5: --prefix=$INSTALL_ROOT --libdir=$INSTALL_ROOT/lib
+make -j 2
+make install
+Python-3.2.1: --prefix=$INSTALL_ROOT --libdir=$INSTALL_ROOT/lib
+make -j 2
+make install
+OUT
+}
+
+@test "apply python patch before building" {
+  cached_tarball "yaml-0.1.5"
+  cached_tarball "Python-3.2.1"
+
+  stub brew false
+  stub_make_install
+  stub_make_install
+  stub patch ' : echo patch "$@" >> build.log'
+
+  install_fixture --patch definitions/needs-yaml
+  assert_success
+
+  unstub make
+  unstub patch
+
+  assert_build_log <<OUT
+yaml-0.1.5: --prefix=$INSTALL_ROOT --libdir=$INSTALL_ROOT/lib
+make -j 2
+make install
+patch -p0 -i -
+Python-3.2.1: --prefix=$INSTALL_ROOT --libdir=$INSTALL_ROOT/lib
+make -j 2
+make install
+OUT
+}
+
+@test "yaml is linked from Homebrew" {
+  cached_tarball "Python-3.2.1"
+
+  brew_libdir="$TMP/homebrew-yaml"
+  mkdir -p "$brew_libdir"
+
+  stub brew "--prefix libyaml : echo '$brew_libdir'" false
+  stub_make_install
+
+  install_fixture definitions/needs-yaml
+  assert_success
+
+  unstub brew
+  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
+make -j 2
+make install
+OUT
+}
+
+@test "readline is linked from Homebrew" {
+  cached_tarball "Python-3.2.1"
+
+  readline_libdir="$TMP/homebrew-readline"
+  mkdir -p "$readline_libdir"
+
+  stub brew "--prefix readline : echo '$readline_libdir'"
+  stub_make_install
+
+  run_inline_definition <<DEF
+install_package "Python-3.2.1" "http://python.org/ftp/python/3.2.1/Python-3.2.1.tar.gz"
+DEF
+  assert_success
+
+  unstub brew
+  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
+make -j 2
+make install
+OUT
+}
+
+@test "readline is not linked from Homebrew when explicitly defined" {
+  cached_tarball "Python-3.2.1"
+
+  readline_libdir="$TMP/custom"
+  mkdir -p "$readline_libdir/include/readline"
+  touch "$readline_libdir/include/readline/rlconf.h"
+
+  stub brew
+  stub_make_install
+
+  export PYTHON_CONFIGURE_OPTS="CPPFLAGS=-I$readline_libdir/include LDFLAGS=-L$readline_libdir/lib"
+  run_inline_definition <<DEF
+install_package "Python-3.2.1" "http://python.org/ftp/python/3.2.1/Python-3.2.1.tar.gz"
+DEF
+  assert_success
+
+  unstub brew
+  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
+make -j 2
+make install
+OUT
+}
+
+@test "number of CPU cores defaults to 2" {
+  cached_tarball "Python-3.2.1"
+
+  stub uname '-s : echo Darwin'
+  stub sysctl false
+  stub_make_install
+
+  export -n MAKE_OPTS
+  run_inline_definition <<DEF
+install_package "Python-3.2.1" "http://python.org/ftp/python/3.2.1/Python-3.2.1.tar.gz"
+DEF
+  assert_success
+
+  unstub uname
+  unstub make
+
+  assert_build_log <<OUT
+Python-3.2.1: --prefix=$INSTALL_ROOT --libdir=$INSTALL_ROOT/lib
+make -j 2
+make install
+OUT
+}
+
+@test "number of CPU cores is detected on Mac" {
+  cached_tarball "Python-3.2.1"
+
+  stub uname '-s : echo Darwin'
+  stub sysctl '-n hw.ncpu : echo 4'
+  stub_make_install
+
+  export -n MAKE_OPTS
+  run_inline_definition <<DEF
+install_package "Python-3.2.1" "http://python.org/ftp/python/3.2.1/Python-3.2.1.tar.gz"
+DEF
+  assert_success
+
+  unstub uname
+  unstub sysctl
+  unstub make
+
+  assert_build_log <<OUT
+Python-3.2.1: --prefix=$INSTALL_ROOT --libdir=$INSTALL_ROOT/lib
+make -j 4
+make install
+OUT
+}
+
+@test "setting PYTHON_MAKE_INSTALL_OPTS to a multi-word string" {
+  cached_tarball "Python-3.2.1"
+
+  stub_make_install
+
+  export PYTHON_MAKE_INSTALL_OPTS="DOGE=\"such wow\""
+  run_inline_definition <<DEF
+install_package "Python-3.2.1" "http://python.org/ftp/python/3.2.1/Python-3.2.1.tar.gz"
+DEF
+  assert_success
+
+  unstub make
+
+  assert_build_log <<OUT
+Python-3.2.1: --prefix=$INSTALL_ROOT --libdir=$INSTALL_ROOT/lib
+make -j 2
+make install DOGE="such wow"
+OUT
+}
+
+@test "setting MAKE_INSTALL_OPTS to a multi-word string" {
+  cached_tarball "Python-3.2.1"
+
+  stub_make_install
+
+  export MAKE_INSTALL_OPTS="DOGE=\"such wow\""
+  run_inline_definition <<DEF
+install_package "Python-3.2.1" "http://python.org/ftp/python/3.2.1/Python-3.2.1.tar.gz"
+DEF
+  assert_success
+
+  unstub make
+
+  assert_build_log <<OUT
+Python-3.2.1: --prefix=$INSTALL_ROOT --libdir=$INSTALL_ROOT/lib
+make -j 2
+make install DOGE="such wow"
+OUT
+}
+
+@test "custom relative install destination" {
+  export PYTHON_BUILD_CACHE_PATH="$FIXTURE_ROOT"
+
+  cd "$TMP"
+  install_fixture definitions/without-checksum ./here
+  assert_success
+  assert [ -x ./here/bin/package ]
+}
+
+@test "make on FreeBSD defaults to gmake" {
+  cached_tarball "Python-3.2.1"
+
+  stub uname "-s : echo FreeBSD"
+  MAKE=gmake stub_make_install
+
+  MAKE= install_fixture definitions/vanilla-python
+  assert_success
+
+  unstub gmake
+  unstub uname
+}
+
+@test "can use PYTHON_CONFIGURE to apply a patch" {
+  cached_tarball "Python-3.2.1"
+
+  executable "${TMP}/custom-configure" <<CONF
+#!$BASH
+apply -p1 -i /my/patch.diff
+exec ./configure "\$@"
+CONF
+
+  stub apply 'echo apply "$@" >> build.log'
+  stub_make_install
+
+  export PYTHON_CONFIGURE="${TMP}/custom-configure"
+  run_inline_definition <<DEF
+install_package "Python-3.2.1" "http://python.org/ftp/python/3.2.1/Python-3.2.1.tar.gz"
+DEF
+  assert_success
+
+  unstub make
+  unstub apply
+
+  assert_build_log <<OUT
+apply -p1 -i /my/patch.diff
+Python-3.2.1: --prefix=$INSTALL_ROOT --libdir=$INSTALL_ROOT/lib
+make -j 2
+make install
+OUT
+}
+
+@test "copy strategy forces overwrite" {
+  export PYTHON_BUILD_CACHE_PATH="$FIXTURE_ROOT"
+
+  mkdir -p "$INSTALL_ROOT/bin"
+  touch "$INSTALL_ROOT/bin/package"
+  chmod -w "$INSTALL_ROOT/bin/package"
+
+  install_fixture definitions/without-checksum
+  assert_success
+
+  run "$INSTALL_ROOT/bin/package" "world"
+  assert_success "hello world"
+}
+
+@test "non-writable TMPDIR aborts build" {
+  export TMPDIR="${TMP}/build"
+  mkdir -p "$TMPDIR"
+  chmod -w "$TMPDIR"
+
+  touch "${TMP}/build-definition"
+  run python-build "${TMP}/build-definition" "$INSTALL_ROOT"
+  assert_failure "python-build: TMPDIR=$TMPDIR is set to a non-accessible location"
+}
+
+@test "non-executable TMPDIR aborts build" {
+  export TMPDIR="${TMP}/build"
+  mkdir -p "$TMPDIR"
+  chmod -x "$TMPDIR"
+
+  touch "${TMP}/build-definition"
+  run python-build "${TMP}/build-definition" "$INSTALL_ROOT"
+  assert_failure "python-build: TMPDIR=$TMPDIR is set to a non-accessible location"
+}

plugins/python-build/test/cache.bats

@@ -0,0 +1,90 @@
+#!/usr/bin/env bats
+
+load test_helper
+export PYTHON_BUILD_SKIP_MIRROR=1
+export PYTHON_BUILD_CACHE_PATH="$TMP/cache"
+
+setup() {
+  mkdir "$PYTHON_BUILD_CACHE_PATH"
+}
+
+
+@test "packages are saved to download cache" {
+  stub md5 true
+  stub curl "-C - -o * -*S* http://example.com/* : cp $FIXTURE_ROOT/\${6##*/} \$4"
+
+  install_fixture definitions/without-checksum
+  [ "$status" -eq 0 ]
+  [ -e "${PYTHON_BUILD_CACHE_PATH}/package-1.0.0.tar.gz" ]
+
+  unstub curl
+  unstub md5
+}
+
+
+@test "cached package without checksum" {
+  stub md5 true
+  stub curl
+
+  cp "${FIXTURE_ROOT}/package-1.0.0.tar.gz" "$PYTHON_BUILD_CACHE_PATH"
+
+  install_fixture definitions/without-checksum
+  [ "$status" -eq 0 ]
+  [ -e "${PYTHON_BUILD_CACHE_PATH}/package-1.0.0.tar.gz" ]
+
+  unstub curl
+  unstub md5
+}
+
+
+@test "cached package with valid checksum" {
+  stub md5 true "echo 83e6d7725e20166024a1eb74cde80677"
+  stub curl
+
+  cp "${FIXTURE_ROOT}/package-1.0.0.tar.gz" "$PYTHON_BUILD_CACHE_PATH"
+
+  install_fixture definitions/with-checksum
+  [ "$status" -eq 0 ]
+  [ -x "${INSTALL_ROOT}/bin/package" ]
+  [ -e "${PYTHON_BUILD_CACHE_PATH}/package-1.0.0.tar.gz" ]
+
+  unstub curl
+  unstub md5
+}
+
+
+@test "cached package with invalid checksum falls back to mirror and updates cache" {
+  export PYTHON_BUILD_SKIP_MIRROR=
+  local checksum="83e6d7725e20166024a1eb74cde80677"
+
+  stub md5 true "echo invalid" "echo $checksum"
+  stub curl "-*I* : true" \
+    "-C - -o * -*S* http://?*/$checksum : cp $FIXTURE_ROOT/package-1.0.0.tar.gz \$4"
+
+  touch "${PYTHON_BUILD_CACHE_PATH}/package-1.0.0.tar.gz"
+
+  install_fixture definitions/with-checksum
+  [ "$status" -eq 0 ]
+  [ -x "${INSTALL_ROOT}/bin/package" ]
+  [ -e "${PYTHON_BUILD_CACHE_PATH}/package-1.0.0.tar.gz" ]
+  diff -q "${PYTHON_BUILD_CACHE_PATH}/package-1.0.0.tar.gz" "${FIXTURE_ROOT}/package-1.0.0.tar.gz"
+
+  unstub curl
+  unstub md5
+}
+
+
+@test "nonexistent cache directory is ignored" {
+  stub md5 true
+  stub curl "-C - -o * -*S* http://example.com/* : cp $FIXTURE_ROOT/\${6##*/} \$4"
+
+  export PYTHON_BUILD_CACHE_PATH="${TMP}/nonexistent"
+
+  install_fixture definitions/without-checksum
+  [ "$status" -eq 0 ]
+  [ -x "${INSTALL_ROOT}/bin/package" ]
+  [ ! -d "$PYTHON_BUILD_CACHE_PATH" ]
+
+  unstub curl
+  unstub md5
+}

plugins/python-build/test/checksum.bats

@@ -0,0 +1,70 @@
+#!/usr/bin/env bats
+
+load test_helper
+export PYTHON_BUILD_SKIP_MIRROR=1
+export PYTHON_BUILD_CACHE_PATH=
+
+
+@test "package URL without checksum" {
+  stub md5 true
+  stub curl "-C - -o * -*S* http://example.com/* : cp $FIXTURE_ROOT/\${6##*/} \$4"
+
+  install_fixture definitions/without-checksum
+  [ "$status" -eq 0 ]
+  [ -x "${INSTALL_ROOT}/bin/package" ]
+
+  unstub curl
+  unstub md5
+}
+
+
+@test "package URL with valid checksum" {
+  stub md5 true "echo 83e6d7725e20166024a1eb74cde80677"
+  stub curl "-C - -o * -*S* http://example.com/* : cp $FIXTURE_ROOT/\${6##*/} \$4"
+
+  install_fixture definitions/with-checksum
+  [ "$status" -eq 0 ]
+  [ -x "${INSTALL_ROOT}/bin/package" ]
+
+  unstub curl
+  unstub md5
+}
+
+
+@test "package URL with invalid checksum" {
+  stub md5 true "echo 83e6d7725e20166024a1eb74cde80677"
+  stub curl "-C - -o * -*S* http://example.com/* : cp $FIXTURE_ROOT/\${6##*/} \$4"
+
+  install_fixture definitions/with-invalid-checksum
+  [ "$status" -eq 1 ]
+  [ ! -f "${INSTALL_ROOT}/bin/package" ]
+
+  unstub curl
+  unstub md5
+}
+
+
+@test "package URL with checksum but no MD5 support" {
+  stub md5 false
+  stub curl "-C - -o * -*S* http://example.com/* : cp $FIXTURE_ROOT/\${6##*/} \$4"
+
+  install_fixture definitions/with-checksum
+  [ "$status" -eq 0 ]
+  [ -x "${INSTALL_ROOT}/bin/package" ]
+
+  unstub curl
+  unstub md5
+}
+
+
+@test "package with invalid checksum" {
+  stub md5 true "echo invalid"
+  stub curl "-C - -o * -*S* http://example.com/* : cp $FIXTURE_ROOT/\${6##*/} \$4"
+
+  install_fixture definitions/with-checksum
+  [ "$status" -eq 1 ]
+  [ ! -f "${INSTALL_ROOT}/bin/package" ]
+
+  unstub curl
+  unstub md5
+}

plugins/python-build/test/fetch.bats

@@ -0,0 +1,14 @@
+#!/usr/bin/env bats
+
+load test_helper
+export PYTHON_BUILD_SKIP_MIRROR=1
+export PYTHON_BUILD_CACHE_PATH=
+
+@test "failed download displays error message" {
+  stub curl false
+
+  install_fixture definitions/without-checksum
+  assert_failure
+  assert_output_contains "> http://example.com/packages/package-1.0.0.tar.gz"
+  assert_output_contains "error: failed to download package-1.0.0.tar.gz"
+}

plugins/python-build/test/fixtures/definitions/needs-yaml

@@ -0,0 +1,2 @@
+install_package "yaml-0.1.5" "http://pyyaml.org/download/libyaml/yaml-0.1.5.tar.gz" --if needs_yaml
+install_package "Python-3.2.1" "http://python.org/ftp/python/3.2.1/Python-3.2.1.tar.gz"

plugins/python-build/test/fixtures/definitions/vanilla-python

@@ -0,0 +1 @@
+install_package "Python-3.2.1" "http://python.org/ftp/python/3.2.1/Python-3.2.1.tar.gz"

plugins/python-build/test/fixtures/definitions/with-checksum

@@ -0,0 +1 @@
+install_package "package-1.0.0" "http://example.com/packages/package-1.0.0.tar.gz#83e6d7725e20166024a1eb74cde80677" copy