v20141211 (fixes #288 )

Fix building _dev_ versions
Add 3.5-dev (#287 )
2025-11-12 05:23:47 -05:00 · 2014-12-11 22:39:38 +09:00 · 2014-12-11 22:35:12 +09:00 · 2014-12-11 21:46:22 +09:00 · 2014-12-11 21:45:37 +09:00 · 2014-12-11 12:50:24 +09:00
138 changed files with 2254 additions and 513 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,9 @@
-/cache
 /shims
 /version
 /versions
 /sources
+/cache
+/libexec/*.dylib
+/src/Makefile
+/src/*.o
+bats/
--- a/.travis.yml
+++ b/.travis.yml
@@ -1,6 +1,6 @@
 install: git clone https://github.com/sstephenson/bats.git
-script: bats/bin/bats --tap test plugins/python-build/test
+script: make test
 language: c
-notifications:
-  email:
-    on_success: never
+env:
+  - PYENV_NATIVE_EXT=
+  - PYENV_NATIVE_EXT=1
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,32 @@
 ## Version History

+#### 20141127
+
+* python-build: Add new CPython release candidates; 2.7.9rc1 (#276)
+
+#### 20141118
+
+* python-build: Fix broken `setup_builtin_patches` (#270)
+* python-build: Add a patch to allow building 2.6.9 on OS X 10.9 with `--enable-framework` (#269, #271)
+
+#### 20141106
+
+* pyenv: Optimize pyenv-which. Thanks to @blueyed (#129)
+* python-build: Add Miniconda/Miniconda3 3.7.0 and Anaconda/Anaconda3 2.1.0 (#260)
+* python-build: Use HTTPS for mirror download URLs (#262)
+* python-build: Set `rpath` for `--shared` build of PyPy (#244)
+* python-build: Support `make altinstall` when building CPython/Stackless (#255)
+* python-build: Import recent changes from ruby-build v20141028 (#265)
+
+#### 20141012
+
+* python-build: Add new CPython releases; 3.2.6, 3.3.6 (#253)
+
+#### 20141011
+
+* python-build: Fix build error of Stackless 3.3.5 on OS X (#250)
+* python-build: Add new Stackless releases; stackless-2.7.7, stackless-2.7.8, stackless-3.4.1 (#252)
+
 #### 20141008

 * python-build: Add new CPython release; 3.4.2 (#251)
@@ -7,7 +34,7 @@

 #### 20140924

-* pyenv: Fix an unintended behavior when user does not have write permission on $PYENV_ROOT (#230)
+* pyenv: Fix an unintended behavior when user does not have write permission on `$PYENV_ROOT` (#230)
 * pyenv: Fix a zsh completion issue (#232)
 * python-build: Add new PyPy release; pypy-2.4.0, pypy-2.4.0-src (#241)

@@ -16,7 +43,7 @@
 * pyenv: Fix zsh completion with multiple words (#215)
 * python-build: Display the package name of `hg` as `mercurial` in message (#212)
 * python-build: Unset `PIP_REQUIRE_VENV` during build (#216)
-* python-build: Set MACOSX_DEPLOYMENT_TARGET from the product version of OS X (#219, #220)
+* python-build: Set `MACOSX_DEPLOYMENT_TARGET` from the product version of OS X (#219, #220)
 * python-build: Add new Jython release; jython2.7-beta3 (#223)

 #### 20140705
--- a/8
+++ b/8
@@ -0,0 +1,8 @@
+.PHONY: test
+
+test: bats
+	PATH="./bats/bin:$$PATH" test/run
+	cd plugins/python-build && $(PWD)/bats/bin/bats $${CI:+--tap} test
+
+bats:
+	git clone https://github.com/sstephenson/bats.git
--- a/README.md
+++ b/README.md
@@ -127,7 +127,7 @@ reading it from the following sources, in this order:
   `PATH`.)

 **NOTE:** You can activate multiple versions at the same time, e.g. `pyenv
-global 3.4.1 2.7.8`.  This allows for parallel usage of python2 and python3,
+global 3.4.2 2.7.8`.  This allows for parallel usage of python2 and python3,
 and is required with tools like `tox`.

 ### Locating the Python Installation
@@ -141,9 +141,9 @@ Each Python version is installed into its own directory under

 For example, you might have these versions installed:

-* `~/.pyenv/versions/2.7.6/`
-* `~/.pyenv/versions/3.3.3/`
-* `~/.pyenv/versions/pypy-2.2.1/`
+* `~/.pyenv/versions/2.7.8/`
+* `~/.pyenv/versions/3.4.2/`
+* `~/.pyenv/versions/pypy-2.4.0/`

 As far as pyenv is concerned, version names are simply the directories in
 `~/.pyenv/versions`.
@@ -191,6 +191,12 @@ easy to fork and contribute any changes back upstream.

    **Zsh note**: Modify your `~/.zshenv` file instead of `~/.bash_profile`.
    **Ubuntu note**: Modify your `~/.bashrc` file instead of `~/.bash_profile`.
+    
+    **General warning**: There are some systems, where the `BASH_ENV` variable is configured
+    to point to `.bashrc`. On such systems you should almost certainly put the abovementioned line
+    `eval "$(pyenv init -)` into `.bash_profile`, and **not** into `.bashrc`. Otherwise you
+    may observe strange behaviour, such as `pyenv` getting into an infinite loop.
+    See [#264](https://github.com/yyuu/pyenv/issues/264) for details.

 4. **Restart your shell so the path changes take effect.**
   You can now begin using pyenv.
@@ -198,9 +204,9 @@ easy to fork and contribute any changes back upstream.
        $ exec $SHELL

 5. **Install Python versions into `$PYENV_ROOT/versions`.**
-   For example, to install Python 2.7.6, download and unpack the source, then run:
+   For example, to install Python 2.7.8, download and unpack the source, then run:

-        $ pyenv install 2.7.6
+        $ pyenv install 2.7.8

   **NOTE:** If you need to pass configure option to build, please use
   ```CONFIGURE_OPTS``` environment variable.
@@ -215,6 +221,10 @@ easy to fork and contribute any changes back upstream.

        $ pyenv rehash

+   This can be automated for pip using
+   [pyenv-pip-rehash](https://github.com/yyuu/pyenv-pip-rehash), which invokes
+   `pyenv rehash` after (un)installing packages using pip.
+

 #### Upgrading

--- a/libexec/pyenv
+++ b/libexec/pyenv
@@ -12,14 +12,22 @@ if [ -n "$PYENV_DEBUG" ]; then
  set -x
 fi

+if enable -f "${0%/*}"/../libexec/pyenv-realpath.dylib realpath 2>/dev/null; then
+  abs_dirname() {
+    local path="$(realpath "$1")"
+    echo "${path%/*}"
+  }
+else
+  if [ -n "$PYENV_NATIVE_EXT" ]; then
+    echo "pyenv: failed to load \`realpath' builtin" >&2
+    exit 1
+  fi
 READLINK=$(type -p greadlink readlink | head -1)
 if [ -z "$READLINK" ]; then
  echo "pyenv: cannot find readlink - are you missing GNU coreutils?" >&2
  exit 1
 fi

-unset GREP_OPTIONS
-
 resolve_link() {
  $READLINK "$1"
 }
@@ -37,6 +45,7 @@ abs_dirname() {
  pwd
  cd "$cwd"
 }
+fi

 if [ -z "${PYENV_ROOT}" ]; then
  PYENV_ROOT="${HOME}/.pyenv"
@@ -62,15 +71,20 @@ shopt -s nullglob

 bin_path="$(abs_dirname "$0")"
 for plugin_bin in "${PYENV_ROOT}/plugins/"*/bin; do
-  bin_path="${bin_path}:${plugin_bin}"
+  PATH="${plugin_bin}:${PATH}"
 done
 export PATH="${bin_path}:${PATH}"

-hook_path="${PYENV_HOOK_PATH}:${PYENV_ROOT}/pyenv.d:/usr/local/etc/pyenv.d:/etc/pyenv.d:/usr/lib/pyenv/hooks"
+PYENV_HOOK_PATH="${PYENV_HOOK_PATH}:${PYENV_ROOT}/pyenv.d"
+if [ "${bin_path%/*}" != "$PYENV_ROOT" ]; then
+  # Add pyenv's own `pyenv.d` unless pyenv was cloned to PYENV_ROOT
+  PYENV_HOOK_PATH="${PYENV_HOOK_PATH}:${bin_path%/*}/pyenv.d"
+fi
+PYENV_HOOK_PATH="${PYENV_HOOK_PATH}:/usr/local/etc/pyenv.d:/etc/pyenv.d:/usr/lib/pyenv/hooks"
 for plugin_hook in "${PYENV_ROOT}/plugins/"*/etc/pyenv.d; do
-  hook_path="${hook_path}:${plugin_hook}"
+  PYENV_HOOK_PATH="${PYENV_HOOK_PATH}:${plugin_hook}"
 done
-export PYENV_HOOK_PATH="$hook_path"
+export PYENV_HOOK_PATH

 shopt -u nullglob

--- a/libexec/pyenv---version
+++ b/libexec/pyenv---version
@@ -12,7 +12,7 @@
 set -e
 [ -n "$PYENV_DEBUG" ] && set -x

-version="20141008"
+version="20141211"

 if cd "$PYENV_ROOT" 2>/dev/null; then
  git_revision="$(git describe --tags HEAD 2>/dev/null || true)"
--- a/libexec/pyenv-exec
+++ b/libexec/pyenv-exec
@@ -18,7 +18,7 @@ set -e

 # Provide pyenv completions
 if [ "$1" = "--complete" ]; then
-  exec pyenv shims --short
+  exec pyenv-shims --short
 fi

 PYENV_VERSION="$(pyenv-version-name)"
--- a/libexec/pyenv-hooks
+++ b/libexec/pyenv-hooks
@@ -19,6 +19,11 @@ if [ -z "$PYENV_COMMAND" ]; then
  exit 1
 fi

+if ! enable -f "${BASH_SOURCE%/*}"/pyenv-realpath.dylib realpath 2>/dev/null; then
+  if [ -n "$PYENV_NATIVE_EXT" ]; then
+    echo "pyenv: failed to load \`realpath' builtin" >&2
+    exit 1
+  fi
 READLINK=$(type -p greadlink readlink | head -1)
 if [ -z "$READLINK" ]; then
  echo "pyenv: cannot find readlink - are you missing GNU coreutils?" >&2
@@ -42,13 +47,14 @@ realpath() {
  echo "$(pwd)/$name"
  cd "$cwd"
 }
+fi

 IFS=: hook_paths=($PYENV_HOOK_PATH)

 shopt -s nullglob
 for path in "${hook_paths[@]}"; do
  for script in "$path/$PYENV_COMMAND"/*.bash; do
-    echo $(realpath $script)
+    realpath "$script"
  done
 done
 shopt -u nullglob
--- a/libexec/pyenv-init
+++ b/libexec/pyenv-init
@@ -28,31 +28,7 @@ if [ -z "$shell" ]; then
  shell="$(basename "${shell:-$SHELL}")"
 fi

-READLINK=$(type -p greadlink readlink | head -1)
-if [ -z "$READLINK" ]; then
-  echo "pyenv: cannot find readlink - are you missing GNU coreutils?" >&2
-  exit 1
-fi
-
-resolve_link() {
-  $READLINK "$1"
-}
-
-abs_dirname() {
-  local cwd="$(pwd)"
-  local path="$1"
-
-  while [ -n "$path" ]; do
-    cd "${path%/*}"
-    local name="${path##*/}"
-    path="$(resolve_link "$name" || true)"
-  done
-
-  pwd
-  cd "$cwd"
-}
-
-root="$(abs_dirname "$0")/.."
+root="${0%/*}/.."

 if [ -z "$print" ]; then
  case "$shell" in
@@ -92,22 +68,13 @@ fi

 mkdir -p "${PYENV_ROOT}/"{shims,versions}

-if [[ ":${PATH}:" != *:"${PYENV_ROOT}/shims":* ]]; then
-  case "$shell" in
-  fish )
-    echo "setenv PATH '${PYENV_ROOT}/shims' \$PATH"
-  ;;
-  * )
-    echo 'export PATH="'${PYENV_ROOT}'/shims:${PATH}"'
-  ;;
-  esac
-fi
-
 case "$shell" in
 fish )
+  echo "setenv PATH '${PYENV_ROOT}/shims' \$PATH"
  echo "setenv PYENV_SHELL $shell"
 ;;
 * )
+  echo 'export PATH="'${PYENV_ROOT}'/shims:${PATH}"'
  echo "export PYENV_SHELL=$shell"
 ;;
 esac
--- a/libexec/pyenv-rehash
+++ b/libexec/pyenv-rehash
@@ -70,49 +70,47 @@ SH
 # of the first shim in the shims directory, assume pyenv has been
 # upgraded and the existing shims need to be removed.
 remove_outdated_shims() {
-  for shim in *; do
+  local shim
+  for shim in "$SHIM_PATH"/*; do
    if ! diff "$PROTOTYPE_SHIM_PATH" "$shim" >/dev/null 2>&1; then
-      for shim in *; do rm -f "$shim"; done
+      rm -f "$SHIM_PATH"/*
    fi
    break
  done
 }

+# List basenames of executables for every Python version
+list_executable_names() {
+  local file
+  for file in "$PYENV_ROOT"/versions/*/bin/*; do
+    echo "${file##*/}"
+  done
+}
+
 # The basename of each argument passed to `make_shims` will be
 # registered for installation as a shim. In this way, plugins may call
 # `make_shims` with a glob to register many shims at once.
 make_shims() {
-  local shims=("$@")
-
-  for file in "${shims[@]}"; do
-    local shim="${file##*/}"
+  local file shim
+  for file; do
+    shim="${file##*/}"
    register_shim "$shim"
  done
 }

-# Create an empty array for the list of registered shims and an empty
-# string to use as a search index.
-registered_shims=()
-registered_shims_index=""
+registered_shims=" "

-# We will keep track of shims registered for installation with the
-# global `registered_shims` array and with a global search index
-# string. The array will let us iterate over all registered shims. The
-# index string will let us quickly check whether a shim with the given
-# name has been registered or not.
+# Registers the name of a shim to be generated.
 register_shim() {
-  local shim="$@"
-  registered_shims["${#registered_shims[@]}"]="$shim"
-  registered_shims_index="$registered_shims_index/$shim/"
+  registered_shims="${registered_shims}${1} "
 }

-# To install all the registered shims, we iterate over the
-# `registered_shims` array and create a link if one does not already
-# exist.
+# Install all the shims registered via `make_shims` or `register_shim` directly.
 install_registered_shims() {
-  local shim
-  for shim in "${registered_shims[@]}"; do
-    [ -e "$shim" ] || ln -f "$PROTOTYPE_SHIM_PATH" "$shim"
+  local shim file
+  for shim in $registered_shims; do
+    file="${SHIM_PATH}/${shim}"
+    [ -e "$file" ] || ln -f "$PROTOTYPE_SHIM_PATH" "$file"
  done
 }

@@ -122,26 +120,21 @@ install_registered_shims() {
 # removed.
 remove_stale_shims() {
  local shim
-  for shim in *; do
-    if [[ "$registered_shims_index" != *"/$shim/"* ]]; then
+  for shim in "$SHIM_PATH"/*; do
+    if [[ "$registered_shims" != *" ${shim##*/} "* ]]; then
      rm -f "$shim"
    fi
  done
 }

-
-# Change to the shims directory.
-cd "$SHIM_PATH"
 shopt -s nullglob

 # Create the prototype shim, then register shims for all known
 # executables.
 create_prototype_shim
 remove_outdated_shims
-make_shims ../versions/*/bin/*
+make_shims $(list_executable_names | sort -u)

-# Restore the previous working directory.
-cd "$OLDPWD"

 # Allow plugins to register shims.
 OLDIFS="$IFS"
@@ -152,8 +145,5 @@ for script in "${scripts[@]}"; do
  source "$script"
 done

-# Change back to the shims directory to install the registered shims
-# and remove stale shims.
-cd "$SHIM_PATH"
 install_registered_shims
 remove_stale_shims
--- a/libexec/pyenv-versions
+++ b/libexec/pyenv-versions
@@ -11,7 +11,6 @@ if [ "$1" = "--bare" ]; then
  hit_prefix=""
  miss_prefix=""
  current_versions=()
-  version_origin=""
  include_system=""
 else
  hit_prefix="* "
@@ -19,25 +18,30 @@ else
  OLDIFS="$IFS"
  IFS=: current_versions=($(pyenv-version-name || true))
  IFS="$OLDIFS"
-  version_origin=" (set by $(pyenv-version-origin))"
  include_system="1"
 fi

-array_exists() {
-  local x car="$1"
+num_versions=0
+
+exists() {
+  local car="$1"
+  local cdar
  shift
-  for x in "$@"; do
-    [ "${x}" = "${car}" ] && return 0
+  for cdar in "$@"; do
+    if [ "${car}" == "${cdar}" ]; then
+      return 0
+    fi
  done
  return 1
 }

 print_version() {
-  if array_exists "$1" "${current_versions[@]}"; then
-    echo "${hit_prefix}$1${version_origin}"
+  if exists "$1" "${current_versions[@]}"; then
+    echo "${hit_prefix}$1 (set by $(pyenv-version-origin))"
  else
    echo "${miss_prefix}$1"
  fi
+  num_versions=$((num_versions + 1))
 }

 # Include "system" in the non-bare output, if it exists
@@ -45,8 +49,15 @@ if [ -n "$include_system" ] && PYENV_VERSION=system pyenv-which python >/dev/nul
  print_version system
 fi

+shopt -s nullglob
 for path in "${PYENV_ROOT}/versions/"*; do
  if [ -d "$path" ]; then
    print_version "${path##*/}"
  fi
 done
+shopt -u nullglob
+
+if [ "$num_versions" -eq 0 ] && [ -n "$include_system" ]; then
+  echo "Warning: no Python detected on the system" >&2
+  exit 1
+fi
--- a/libexec/pyenv-whence
+++ b/libexec/pyenv-whence
@@ -8,7 +8,7 @@ set -e
 # Provide pyenv completions
 if [ "$1" = "--complete" ]; then
  echo --path
-  exec pyenv shims --short
+  exec pyenv-shims --short
 fi

 if [ "$1" = "--path" ]; then
--- a/libexec/pyenv-which
+++ b/libexec/pyenv-which
@@ -12,46 +12,20 @@ set -e

 # Provide pyenv completions
 if [ "$1" = "--complete" ]; then
-  exec pyenv shims --short
+  exec pyenv-shims --short
 fi

-expand_path() {
-  if [ ! -d "$1" ]; then
-    return 1
-  fi
-
-  local cwd="$(pwd)"
-  cd "$1"
-  pwd
-  cd "$cwd"
-}
-
 remove_from_path() {
-  local path_to_remove="$(expand_path "$1")"
-  local result=""
-
-  if [ -z "$path_to_remove" ]; then
-    echo "${PATH}"
-    return
-  fi
-
-  local paths
-  IFS=: paths=($PATH)
-
-  for path in "${paths[@]}"; do
-    path="$(expand_path "$path" || true)"
-    if [ -n "$path" ] && [ "$path" != "$path_to_remove" ]; then
-      result="${result}${path}:"
-    fi
+  local path_to_remove="$1"
+  local path_before
+  local result=":$PATH:"
+  while [ "$path_before" != "$result" ]; do
+    path_before="$result"
+    result="${result//:$path_to_remove:/:}"
  done
-
  echo "${result%:}"
 }

-OLDIFS="$IFS"
-IFS=: versions=($(pyenv-version-name))
-IFS=: PYENV_VERSION="${versions[*]}"
-IFS="$OLDIFS"
 PYENV_COMMAND="$1"

 if [ -z "$PYENV_COMMAND" ]; then
@@ -59,6 +33,10 @@ if [ -z "$PYENV_COMMAND" ]; then
  exit 1
 fi

+OLDIFS="$IFS"
+IFS=: versions=(${PYENV_VERSION:-$(pyenv-version-name)})
+IFS="$OLDIFS"
+
 for version in "${versions[@]}"; do
  if [ "$version" = "system" ]; then
    PATH="$(remove_from_path "${PYENV_ROOT}/shims")"
@@ -81,6 +59,20 @@ done
 if [ -x "$PYENV_COMMAND_PATH" ]; then
  echo "$PYENV_COMMAND_PATH"
 else
+  any_not_installed=0
+  for version in "${versions[@]}"; do
+    if [ "$version" = "system" ]; then
+      continue
+    fi
+    if ! [ -d "${PYENV_ROOT}/versions/${version}" ]; then
+      echo "pyenv: version \`$version' is not installed" >&2
+      any_not_installed=1
+    fi
+  done
+  if [ "$any_not_installed" = 1 ]; then
+    exit 1
+  fi
+
  echo "pyenv: $PYENV_COMMAND: command not found" >&2

  versions="$(pyenv-whence "$PYENV_COMMAND" || true)"
--- a/plugins/python-build/bin/pyenv-install
+++ b/plugins/python-build/bin/pyenv-install
@@ -25,15 +25,24 @@
 set -e
 [ -n "$PYENV_DEBUG" ] && set -x

+if [ -z "$PYENV_ROOT" ]; then
+  PYENV_ROOT="${HOME}/.pyenv"
+fi
+
+# Add `share/python-build/` directory from each pyenv plugin to the list of
+# paths where build definitions are looked up.
+shopt -s nullglob
+for plugin_path in "$PYENV_ROOT"/plugins/*/share/python-build; do
+  PYTHON_BUILD_DEFINITIONS="${PYTHON_BUILD_DEFINITIONS}:${plugin_path}"
+done
+export PYTHON_BUILD_DEFINITIONS
+shopt -u nullglob
+
 # Provide pyenv completions
 if [ "$1" = "--complete" ]; then
  exec python-build --definitions
 fi

-if [ -z "$PYENV_ROOT" ]; then
-  PYENV_ROOT="${HOME}/.pyenv"
-fi
-
 # Load shared library functions
 eval "$(python-build --lib)"

@@ -182,6 +191,27 @@ if [[ "${VERSION_NAME}" == [23]"."* ]]; then
  done
 fi

+# PyPy/PyPy3 requires existing Python 2.7 to build
+if [[ "${VERSION_NAME}" == "pypy-"*"-src" ]] || [[ "${VERSION_NAME}" == "pypy3-"*"-src" ]]; then
+  if [ -z "$PYENV_RPYTHON_VERSION" ]; then
+    for version in $(pyenv-versions --bare | sort -r); do
+      if [[ "$version" == "2.7"* ]]; then
+        PYENV_RPYTHON_VERSION="$version"
+      fi
+    done
+  fi
+  if [ -n "$PYENV_RPYTHON_VERSION" ]; then
+    if PYENV_VERSION="$PYENV_RPYTHON_VERSION" pyenv-exec python -c 'import curses' 1>/dev/null 2>&1; then
+      export PYENV_VERSION="$PYENV_RPYTHON_VERSION"
+    else
+      echo "pyenv-install: $VERSION_NAME: PyPy requires \`curses' in $PYENV_RPYTHON_VERSION to build from source." >&2
+      exit 1
+    fi
+  else
+    echo "pyenv-install: $VERSION_NAME: PyPy requires Python 2.5, 2.6 or 2.7 to build from source." >&2
+    exit 1
+  fi
+fi

 # Execute `before_install` hooks.
 for hook in "${before_hooks[@]}"; do eval "$hook"; done
@@ -200,17 +230,25 @@ python-build $KEEP $VERBOSE $HAS_PATCH $DEBUG "$DEFINITION" "$PREFIX" || STATUS=
 # Display a more helpful message if the definition wasn't found.
 if [ "$STATUS" == "2" ]; then
  { candidates="$(definitions "$DEFINITION")"
+    here="$(dirname "${0%/*}")/../.."
    if [ -n "$candidates" ]; then
      echo
      echo "The following versions contain \`$DEFINITION' in the name:"
      echo "$candidates" | indent
    fi
    echo
-    echo "You can list all available versions with \`pyenv install --list'."
+    echo "See all available versions with \`pyenv install --list'."
    echo
-    echo "If the version you're looking for is not present, first try upgrading"
-    echo "pyenv. If it's still missing, open a request on the pyenv"
-    echo "issue tracker: https://github.com/yyuu/pyenv/issues"
+    echo -n "If the version you need is missing, try upgrading pyenv"
+    if [ "$here" != "${here#$(brew --prefix 2>/dev/null)}" ]; then
+      printf ":\n\n"
+      echo "  brew update && brew upgrade pyenv"
+    elif [ -d "${here}/.git" ]; then
+      printf ":\n\n"
+      echo "  cd ${here} && git pull"
+    else
+      printf ".\n"
+    fi
  } >&2
 fi

--- a/plugins/python-build/bin/python-build
+++ b/plugins/python-build/bin/python-build
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash

-PYTHON_BUILD_VERSION="20140524"
+PYTHON_BUILD_VERSION="20141028"

 set -E
 exec 3<&2 # preserve original stderr at fd 3
@@ -71,17 +71,41 @@ colorize() {
  fi
 }

+os_information() {
+  if type -p lsb_release >/dev/null; then
+    lsb_release -sir | xargs echo
+  elif type -p sw_vers >/dev/null; then
+    echo "OS X $(sw_vers -productVersion)"
+  elif [ -r /etc/os-release ]; then
+    source /etc/os-release
+    echo "$NAME" $VERSION_ID
+  else
+    local os="$(cat /etc/{centos,redhat,fedora,system}-release /etc/debian_version 2>/dev/null | head -1)"
+    echo "${os:-$(uname -sr)}"
+  fi
+}
+
+#  9.1  -> 901
+# 10.9  -> 1009
+# 10.10 -> 1010
+osx_version() {
+  local -a ver
+  IFS=. ver=( `sw_vers -productVersion` )
+  echo $(( ${ver[0]}*100 + ${ver[1]} ))
+}
+
 build_failed() {
  { echo
-    echo "BUILD FAILED"
+    colorize 1 "BUILD FAILED"
+    echo " ($(os_information) using $(version))"
    echo

    if ! rmdir "${BUILD_PATH}" 2>/dev/null; then
      echo "Inspect or clean up the working tree at ${BUILD_PATH}"

      if file_is_not_empty "$LOG_PATH"; then
-        echo "Results logged to ${LOG_PATH}"
-        echo
+        colorize 33 "Results logged to ${LOG_PATH}"
+        printf "\n\n"
        echo "Last 10 log lines:"
        tail -n 10 "$LOG_PATH"
      fi
@@ -103,13 +127,16 @@ file_is_not_empty() {
 }

 num_cpu_cores() {
-  local num=""
-  if [ "Darwin" = "$(uname -s)" ]; then
+  local num
+  case "$(uname -s)" in
+  Darwin | *BSD )
    num="$(sysctl -n hw.ncpu 2>/dev/null || true)"
-  elif [ -r /proc/cpuinfo ]; then
-    num="$(grep ^processor /proc/cpuinfo | wc -l)"
-    [ "$num" -gt 0 ] || num=""
-  fi
+    ;;
+  * )
+    num="$(grep ^processor /proc/cpuinfo 2>/dev/null | wc -l | xargs)"
+    num="${num#0}"
+    ;;
+  esac
  echo "${num:-2}"
 }

@@ -117,6 +144,10 @@ install_package() {
  install_package_using "tarball" 1 "$@"
 }

+install_nightly_package() {
+  install_package_using "nightly_tarball" 2 "$@"
+}
+
 install_git() {
  install_package_using "git" 2 "$@"
 }
@@ -190,7 +221,8 @@ compute_sha2() {
    output="$(shasum -a 256 -b)" || return 1
    echo "${output% *}"
  elif type openssl &>/dev/null; then
-    output="$(openssl dgst -sha256)" || return 1
+    local openssl="$(command -v "$(brew --prefix openssl 2>/dev/null)"/bin/openssl openssl | head -1)"
+    output="$("$openssl" dgst -sha256 2>/dev/null)" || return 1
    echo "${output##* }"
  elif type sha256sum &>/dev/null; then
    output="$(sha256sum --quiet)" || return 1
@@ -295,7 +327,7 @@ fetch_tarball() {
    fi
  fi

-  local tar_args="xzvf"
+  local tar_args="xzf"
  local package_filename="${package_name}.tar.gz"

  if [ "$package_url" != "${package_url%tgz}" ]; then
@@ -330,6 +362,19 @@ fetch_tarball() {
  } >&4 2>&1
 }

+fetch_nightly_tarball() {
+  local package_name="$1"
+  local package_url="$2"
+  local package_pattern="$3"
+  fetch_tarball "$1" "$2"
+  if [ ! -e "${package_name}" ]; then
+    local nightly_package_name="$(echo ${package_pattern})"
+    if [ -e "${nightly_package_name}" ]; then
+      ln -fs "${nightly_package_name}" "${package_name}"
+    fi
+  fi
+}
+
 reuse_existing_tarball() {
  local package_filename="$1"
  local checksum="$2"
@@ -599,6 +644,7 @@ build_package_standard() {
  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_MAKE_INSTALL_TARGET="${package_var_name}_MAKE_INSTALL_TARGET"
  local PACKAGE_CFLAGS="${package_var_name}_CFLAGS"

  [ "$package_var_name" = "PYTHON" ] && use_homebrew_readline || true
@@ -606,13 +652,16 @@ build_package_standard() {
  ( if [ "${CFLAGS+defined}" ] || [ "${!PACKAGE_CFLAGS+defined}" ]; then
      export CFLAGS="$CFLAGS ${!PACKAGE_CFLAGS}"
    fi
+    if [ -z "$CC" ] && [ "$(uname -s)" = "Darwin" ] && [ "$(osx_version)" -ge 1010 ]; then
+      export CC=clang
+    fi
    ${!PACKAGE_CONFIGURE:-./configure} --prefix="${!PACKAGE_PREFIX_PATH:-$PREFIX_PATH}" \
                                       --libdir="${!PACKAGE_PREFIX_PATH:-$PREFIX_PATH}/lib" \
                                       $CONFIGURE_OPTS ${!PACKAGE_CONFIGURE_OPTS} "${!PACKAGE_CONFIGURE_OPTS_ARRAY}"
  ) >&4 2>&1

  { "$MAKE" $MAKE_OPTS ${!PACKAGE_MAKE_OPTS} "${!PACKAGE_MAKE_OPTS_ARRAY}"
-    "$MAKE" install $MAKE_INSTALL_OPTS ${!PACKAGE_MAKE_INSTALL_OPTS} "${!PACKAGE_MAKE_INSTALL_OPTS_ARRAY}"
+    "$MAKE" "${!PACKAGE_MAKE_INSTALL_TARGET:-install}" $MAKE_INSTALL_OPTS ${!PACKAGE_MAKE_INSTALL_OPTS} "${!PACKAGE_MAKE_INSTALL_OPTS_ARRAY}"
  } >&4 2>&1
 }

@@ -658,8 +707,12 @@ build_package_ree_installer() {
 build_package_rbx() {
  local package_name="$1"

-  { bundle --path=vendor/bundle
-    RUBYOPT="-rubygems $RUBYOPT" ./configure --prefix="$PREFIX_PATH" $RUBY_CONFIGURE_OPTS
+  { [ ! -e "Gemfile" ] || bundle --path=vendor/bundle
+    if [ -n "$RUBY_BUILD_CACHE_PATH" ]; then
+      mkdir -p vendor
+      ln -s "$RUBY_BUILD_CACHE_PATH" vendor/prebuilt
+    fi
+    RUBYOPT="-rubygems $RUBYOPT" ./configure --prefix="$PREFIX_PATH" $RUBY_CONFIGURE_OPTS "${RUBY_CONFIGURE_OPTS_ARRAY[@]}"
    rake install
    fix_rbx_gem_binstubs "$PREFIX_PATH"
    fix_rbx_irb "$PREFIX_PATH"
@@ -798,16 +851,28 @@ pypy_architecture() {
    esac
    ;;
  "CYGWIN"* | "MINGW"* ) echo "win32" ;;
+  "FreeBSD" )
+    case "$(uname -m)" in
+    "x86_64" ) echo "freebsd64" ;;
+    * ) return 1 ;;
+    esac
+    ;;
  * ) return 1 ;;
  esac
 }

 build_package_pypy() {
  build_package_copy
-  { if [ -x "${PREFIX_PATH}/bin/pypy" ] && [ ! -x "${PREFIX_PATH}/bin/python" ]; then
-      ( cd "${PREFIX_PATH}/bin" && ln -fs pypy python )
-    fi
-  } >&4 2>&1
+  mkdir -p "${PREFIX_PATH}/bin" "${PREFIX_PATH}/lib"
+  local pypy libpypy
+  shopt -s nullglob
+  for pypy in "bin/pypy"*; do
+    ( cd "${PREFIX_PATH}/bin" && ln -fs "$(basename "${pypy}")" "$(basename "${pypy}" | sed -e 's/pypy/python/')" )
+  done
+  for libpypy in "bin/libpypy-c."*; do
+    ( cd "${PREFIX_PATH}/lib" && ln -fs "../bin/$(basename "${libpypy}")" "$(basename "${libpypy}")" )
+  done
+  shopt -u nullglob
 }

 build_package_pypy_builder() {
@@ -819,10 +884,14 @@ build_package_pypy_builder() {
    echo "not a pypy source tree" 1>&3
    return 1
  fi
-  if [ -x "pypy-c" ] && [ ! -x "bin/pypy" ]; then
-    mkdir -p "bin"
-    mv -f "pypy-c" "bin/pypy"
-  fi
+  { mkdir -p "bin" "lib"
+    if [ -x "pypy-c" ]; then
+      mv -f "pypy-c" "bin/pypy"
+    fi
+    for libpypy in "libpypy-c."*; do
+      mv -f "${libpypy}" "bin/"
+    done
+  } >&4 2>&1
  build_package_pypy
 }

@@ -866,15 +935,12 @@ after_install_package() {

 setup_builtin_patches() {
  local package_name="$1"
-  local package_patch_path="${PYTHON_BUILD_ROOT}/share/python-build/patches/${DEFINITION_PATH##*/}/${package_name}"
+  local package_patch_path="${DEFINITION_PATH%/*}/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
-    local patch
-    { for patch in "${package_patch_path}"/*; do
-        [ -f "${patch}" ] && echo "${patch}"
-      done
+    { find "${package_patch_path}" -maxdepth 1 -type f
    } 2>/dev/null | sort | xargs cat 1>"${package_name}.patch"
    exec <&-
    exec <"${package_name}.patch"
@@ -899,7 +965,7 @@ fix_rbx_gem_binstubs() {
  local bindir="${prefix}/bin"
  local file binstub
  # Symlink Rubinius' `gems/bin/` into `bin/`
-  if [ -d "$gemdir" ]; then
+  if [ -d "$gemdir" ] && [ ! -L "$gemdir" ]; then
    for file in "$gemdir"/*; do
      binstub="${bindir}/${file##*/}"
      rm -f "$binstub"
@@ -975,6 +1041,9 @@ require_gcc() {
  fi

  export CC="$gcc"
+  if [ "$(uname -s)" = "Darwin" ] && [ "$(osx_version)" -ge 1010 ]; then
+    export MACOSX_DEPLOYMENT_TARGET=10.9
+  fi
 }

 locate_gcc() {
@@ -1013,7 +1082,7 @@ verify_gcc() {
    return 1
  fi

-  local version="$("$gcc" --version || true)"
+  local version="$("$gcc" --version 2>/dev/null || true)"
  if [ -z "$version" ]; then
    return 1
  fi
@@ -1025,38 +1094,13 @@ verify_gcc() {
  echo "$gcc"
 }

-require_cc() {
-  local cc="$(command -v "$CC" || command -v "cc" || true)"
-
-  if [ -z "$cc" ]; then
-    { echo
-      colorize 1 "ERROR"
-      echo ": This package must be compiled with cc, but python-build couldn't"
-      echo "find a suitable \`cc\` executable on your system. Please install cc"
-      echo "and try again."
-      echo
-    } >&3
-    return 1
+require_llvm() {
+  local llvm_version="$1"
+  if [ "$(uname -s)" = "Darwin" ] && [ "$(osx_version)" -ge 1010 ]; then
+    if [[ "$PYTHON_CONFIGURE_OPTS" != *--llvm-* ]]; then
+      package_option python configure --prebuilt-name="llvm-3.2-x86_64-apple-darwin13.tar.bz2"
+    fi
  fi
-
-  export CC
-}
-
-require_clang() {
-  local clang="$(command -v "$CC" || command -v "clang" || true)"
-
-  if [ -z "$clang" ]; then
-    { echo
-      colorize 1 "ERROR"
-      echo ": This package must be compiled with clang, but python-build couldn't"
-      echo "find a suitable \`clang\` executable on your system. Please install clang"
-      echo "and try again."
-      echo
-    } >&3
-    return 1
-  fi
- 
-  export CC="$clang"
 }

 require_java() {
@@ -1076,7 +1120,23 @@ require_java() {
  export JAVA="$java"
 }

+require_distro() {
+  for arg; do
+    if [[ "$(cat /etc/issue 2>/dev/null || true)" == "$1"* ]]; then
+      return 0
+    fi
+  done
+  { echo
+    colorize 1 "WARNING"
+    echo ": This binary distribution is built for $1."
+    echo "installed binary may not run expectedly on other platforms."
+    echo
+  } >&2
+  return 1
+}
+
 needs_yaml() {
+  [[ "$RUBY_CONFIGURE_OPTS" != *--with-libyaml-dir=* ]] &&
  ! use_homebrew_yaml
 }

@@ -1126,7 +1186,8 @@ use_homebrew_readline() {

 has_broken_mac_openssl() {
  [ "$(uname -s)" = "Darwin" ] &&
-  [[ "$(openssl version 2>/dev/null || true)" = "OpenSSL 0.9.8"?* ]] &&
+  [[ "$(/usr/bin/openssl version 2>/dev/null || true)" = "OpenSSL 0.9.8"?* ]] &&
+  [[ "$RUBY_CONFIGURE_OPTS" != *--with-openssl-dir=* ]] &&
  ! use_homebrew_openssl
 }

@@ -1156,7 +1217,7 @@ build_package_mac_openssl() {
  OPENSSL_CONFIGURE="${OPENSSL_CONFIGURE:-./config}"

  # Compile a shared lib with zlib dynamically linked, no kerberos.
-  package_option openssl configure --openssldir="$OPENSSLDIR" zlib-dynamic no-krb5 shared
+  package_option openssl configure --openssldir="$OPENSSLDIR" zlib-dynamic no-ssl2 no-ssl3 no-krb5 shared

  # Default MAKE_OPTS are -j 2 which can confuse the build. Thankfully, make
  # gives precedence to the last -j option, so we can override that.
@@ -1175,7 +1236,11 @@ build_package_verify_openssl() {
  "$RUBY_BIN" -e 'begin
    require "openssl"
  rescue LoadError
-    abort "The Ruby openssl extension was not compiled. Missing the OpenSSL lib?"
+    $stderr.puts "The Ruby openssl extension was not compiled. Missing the OpenSSL lib?"
+    $stderr.puts "Configure options used:"
+    require "rbconfig"; require "shellwords"
+    RbConfig::CONFIG.fetch("configure_args").shellsplit.each { |arg| $stderr.puts "  #{arg}" }
+    exit 1
  end' >&4 2>&1
 }

@@ -1245,26 +1310,6 @@ apply_python_patch() {
  esac
 }

-create_symlinks() {
-  local suffix="$1"
-
-  local file link
-  shopt -s nullglob
-  for file in "${PREFIX_PATH}/bin"/*; do
-    if [[ "${file##*/}" == *"${suffix}" ]]; then
-      if [[ "${file}" == *"-${suffix}" ]]; then
-        link="${file%%-${suffix}}"
-      else
-        link="${file%%${suffix}}"
-      fi
-      if [ ! -e "${link}" ]; then
-        ( cd "${file%/*}" && ln -fs "${file##*/}" "${link##*/}" )
-      fi
-    fi
-  done
-  shopt -u nullglob
-}
-
 verify_python() {
  if [[ "$PYTHON_CONFIGURE_OPTS" == *"--enable-framework"* ]]; then
    # Only symlinks are installed in ${PREFIX_PATH}/bin
@@ -1272,7 +1317,23 @@ verify_python() {
    ln -fs "${PREFIX_PATH}/Python.framework/Versions/Current/bin" "${PREFIX_PATH}/bin"
  fi

-  create_symlinks "$1"
+  # Not create symlinks on `altinstall` (#255)
+  if [[ "$PYTHON_MAKE_INSTALL_TARGET" != *"altinstall"* ]]; then
+    local suffix="${1#python}"
+    local file
+    shopt -s nullglob
+    for file in "${PREFIX_PATH}/bin"/*; do
+      local link
+      case "${file}" in
+      *"-${suffix}" ) link="${file%%-${suffix}}" ;;
+      *"${suffix}" )  link="${file%%${suffix}}"  ;;
+      esac
+      if [ -n "$link" ] && [ ! -e "$link" ]; then
+        ( cd "${file%/*}" && ln -fs "${file##*/}" "${link##*/}" )
+      fi
+    done
+    shopt -u nullglob
+  fi

  if [ ! -x "${PYTHON_BIN}" ]; then
    { colorize 1 "ERROR"
@@ -1396,6 +1457,11 @@ build_package_verify_py34() {
  build_package_verify_py33 "$1" "${2:-3.4}"
 }

+# Post-install check for Python 3.5.x
+build_package_verify_py35() {
+  build_package_verify_py34 "$1" "${2:-3.5}"
+}
+
 build_package_ez_setup() {
  local ez_setup="${BUILD_PATH}/ez_setup.py"
  rm -f "${ez_setup}"
@@ -1433,15 +1499,23 @@ build_package_get_pip() {
 }

 build_package_ensurepip() {
-  "$PYTHON_BIN" -m ensurepip 1>/dev/null 2>&1 || {
+  local ensurepip_opts
+  if [[ "$PYTHON_MAKE_INSTALL_TARGET" != *"altinstall"* ]]; then
+    ensurepip_opts="--altinstall"
+  fi
+  "$PYTHON_BIN" -m ensurepip $ensurepip_opts 1>/dev/null 2>&1 || {
    build_package_ez_setup "$@" && build_package_get_pip "$@"
  } || return 1
-
-  create_symlinks "$("$PYTHON_BIN" -c 'import sys;v=sys.version_info;sys.stdout.write("python%d.%d"%(v[0],v[1]))')"
 }

 version() {
-  echo "python-build ${PYTHON_BUILD_VERSION}"
+  local git_revision
+  # Read the revision from git if the remote points to "python-build" repository
+  if GIT_DIR="$PYTHON_BUILD_INSTALL_PREFIX/../../.git" git remote -v 2>/dev/null | grep -q /pyenv; then
+    git_revision="$(GIT_DIR="$PYTHON_BUILD_INSTALL_PREFIX/../../.git" git describe --tags HEAD 2>/dev/null || true)"
+    git_revision="${git_revision#v}"
+  fi
+  echo "python-build ${git_revision:-$PYTHON_BUILD_VERSION}"
 }

 usage() {
@@ -1456,20 +1530,29 @@ usage() {
 }

 list_definitions() {
-  { for definition in "${PYTHON_BUILD_ROOT}/share/python-build/"*; do
-      [ -f "${definition}" ] && echo "${definition##*/}"
+  { for DEFINITION_DIR in "${PYTHON_BUILD_DEFINITIONS[@]}"; do
+      [ -d "$DEFINITION_DIR" ] && find "$DEFINITION_DIR" -maxdepth 1 -type f -print0 | xargs -0 -n 1 basename 2>/dev/null
    done
-  } | sort
+  } | sort_versions | uniq
 }

+sort_versions() {
+  sed 'h; s/[+-]/./g; s/.p\([[:digit:]]\)/.z\1/; s/$/.z/; G; s/\n/ /' | \
+    LC_ALL=C sort -t. -k 1,1 -k 2,2n -k 3,3n -k 4,4n -k 5,5n | awk '{print $2}'
+}


 unset VERBOSE
 unset KEEP_BUILD_PATH
 unset HAS_PATCH
-PYTHON_BUILD_ROOT="$(abs_dirname "$0")/.."
 unset DEBUG

+PYTHON_BUILD_INSTALL_PREFIX="$(abs_dirname "$0")/.."
+
+OLDIFS="$IFS"
+IFS=: PYTHON_BUILD_DEFINITIONS=($PYTHON_BUILD_DEFINITIONS ${PYTHON_BUILD_ROOT:-$PYTHON_BUILD_INSTALL_PREFIX}/share/python-build)
+IFS="$OLDIFS"
+
 parse_options "$@"

 for option in "${OPTIONS[@]}"; do
@@ -1513,10 +1596,14 @@ DEFINITION_PATH="${ARGUMENTS[0]}"
 if [ -z "$DEFINITION_PATH" ]; then
  usage
 elif [ ! -f "$DEFINITION_PATH" ]; then
-  BUILTIN_DEFINITION_PATH="${PYTHON_BUILD_ROOT}/share/python-build/${DEFINITION_PATH}"
-  if [ -e "$BUILTIN_DEFINITION_PATH" ]; then
-    DEFINITION_PATH="$BUILTIN_DEFINITION_PATH"
-  else
+  for DEFINITION_DIR in "${PYTHON_BUILD_DEFINITIONS[@]}"; do
+    if [ -f "${DEFINITION_DIR}/${DEFINITION_PATH}" ]; then
+      DEFINITION_PATH="${DEFINITION_DIR}/${DEFINITION_PATH}"
+      break
+    fi
+  done
+
+  if [ ! -f "$DEFINITION_PATH" ]; then
    echo "python-build: definition not found: ${DEFINITION_PATH}" >&2
    exit 2
  fi
@@ -1535,10 +1622,25 @@ else
  TMP="${TMPDIR%/}"
 fi

-if [ ! -w "$TMP" ] || [ ! -x "$TMP" ]; then
+# Check if TMPDIR is accessible and can hold executables.
+tmp_executable="${TMP}/python-build-test.$$"
+noexec=""
+if mkdir -p "$TMP" && touch "$tmp_executable" 2>/dev/null; then
+  cat > "$tmp_executable" <<-EOF
+	#!${BASH}
+	exit 0
+	EOF
+  chmod +x "$tmp_executable"
+else
  echo "python-build: TMPDIR=$TMP is set to a non-accessible location" >&2
  exit 1
 fi
+"$tmp_executable" 2>/dev/null || noexec=1
+rm -f "$tmp_executable"
+if [ -n "$noexec" ]; then
+  echo "python-build: TMPDIR=$TMP cannot hold executables (partition possibly mounted with \`noexec\`)" >&2
+  exit 1
+fi

 # Work around warnings building Ruby 2.0 on Clang 2.x:
 # pass -Wno-error=shorten-64-to-32 if the compiler accepts it.
@@ -1551,7 +1653,7 @@ fi
 #fi

 if [ -z "$MAKE" ]; then
-  if [[ "FreeBSD" = "$(uname -s)" ]]; then
+  if [ "FreeBSD" = "$(uname -s)" ] && [ "$(uname -r | sed 's/[^[:digit:]].*//')" -lt 10 ]; then
    export MAKE="gmake"
  else
    export MAKE="make"
@@ -1565,7 +1667,7 @@ else
 fi

 if [ -z "$PYTHON_BUILD_MIRROR_URL" ]; then
-  PYTHON_BUILD_MIRROR_URL="http://yyuu.github.io/pythons"
+  PYTHON_BUILD_MIRROR_URL="https://yyuu.github.io/pythons"
 else
  PYTHON_BUILD_MIRROR_URL="${PYTHON_BUILD_MIRROR_URL%/}"
 fi
@@ -1585,7 +1687,6 @@ if echo test | compute_md5 >/dev/null; then
  HAS_MD5_SUPPORT=1
 else
  unset HAS_MD5_SUPPORT
-  unset PYTHON_BUILD_MIRROR_URL
 fi

 # Add an option to build a debug version of Python (#11)
@@ -1593,7 +1694,7 @@ if [ -n "$DEBUG" ]; then
  package_option python configure --with-pydebug
 fi

-# python-build: Set `RPATH` if `--enable-shared` was given (#65, #66, 82)
+# python-build: Set `RPATH` if `--enable-shared` was given (#65, #66, #82)
 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 [[ "$LDFLAGS" != *"-rpath="* ]] && [[ "Darwin" != "$(uname -s)" ]]; then
@@ -1601,6 +1702,11 @@ if [[ "$CONFIGURE_OPTS" == *"--enable-shared"* ]] || [[ "$PYTHON_CONFIGURE_OPTS"
  fi
 fi

+# python-build: Set `RPATH` if --shared` was given for PyPy (#244)
+if [[ "$PYPY_OPTS" == *"--shared"* ]]; then
+  export LDFLAGS="-Wl,-rpath=${PREFIX_PATH}/lib ${LDFLAGS}"
+fi
+
 # Add support for framework installation (`--enable-framework`) of CPython (#55, #99)
 if [[ "$PYTHON_CONFIGURE_OPTS" == *"--enable-framework"* ]]; then
  if [[ "Darwin" != "$(uname -s)" ]]; then
@@ -1661,16 +1767,34 @@ if [[ "Darwin" == "$(uname -s)" ]]; then
  MACOS_VERSION_ARRAY=(${MACOS_VERSION//\./ })
  if [ "${#MACOS_VERSION_ARRAY[@]}" -ge 2 ]; then
    export MACOSX_DEPLOYMENT_TARGET="${MACOS_VERSION_ARRAY[0]}.${MACOS_VERSION_ARRAY[1]}"
-  else
-    { colorize 1 "WARNING"
-      echo ": Could not detect the product version of OS X for MACOSX_DEPLOYMENT_TARGET. Use default setting."
-    } >&2
  fi
 fi

+python_bin_suffix() {
+  local version_name version_info
+  case "$1" in
+  2.* | 3.* )
+    version_name="$1"
+    version_name="${version_name%-dev}"
+    version_name="${version_name%-rc*}"
+    version_name="${version_name%rc*}"
+    version_info=(${version_name//./ })
+    echo "${version_info[0]}.${version_info[1]}"
+    ;;
+  stackless-2.* | stackless-3.* )
+    version_name="${1#stackless-}"
+    version_name="${version_name%-dev}"
+    version_name="${version_name%-rc*}"
+    version_name="${version_name%rc*}"
+    version_info=(${version_name//./ })
+    echo "${version_info[0]}.${version_info[1]}"
+    ;;
+  esac
+}
+
 SEED="$(date "+%Y%m%d%H%M%S").$$"
 LOG_PATH="${TMP}/python-build.${SEED}.log"
-PYTHON_BIN="${PREFIX_PATH}/bin/python"
+PYTHON_BIN="${PREFIX_PATH}/bin/python$(python_bin_suffix "${DEFINITION_PATH##*/}")"
 CWD="$(pwd)"

 if [ -z "$PYTHON_BUILD_BUILD_PATH" ]; then
--- a/plugins/python-build/share/python-build/2.1.3
+++ b/plugins/python-build/share/python-build/2.1.3
@@ -1,4 +1,4 @@
-require_cc
+#require_gcc
 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.1.3" "http://www.python.org/ftp/python/2.1.3/Python-2.1.3.tgz#1bcb5bb587948bc38f36db60e15c376009c56c66570e563a08a82bf7f227afb9" ldflags_dirs standard verify_py21
 #install_package "setuptools-1.4.2" "https://pypi.python.org/packages/source/s/setuptools/setuptools-1.4.2.tar.gz#13951be6711438073fbe50843e7f141f" python
--- a/plugins/python-build/share/python-build/2.2.3
+++ b/plugins/python-build/share/python-build/2.2.3
@@ -1,4 +1,4 @@
-require_cc
+#require_gcc
 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.2.3" "http://www.python.org/ftp/python/2.2.3/Python-2.2.3.tgz#a8f92e6b89d47359fff0d1fbfe47f104afc77fd1cd5143e7332758b7bc100188" ldflags_dirs standard verify_py22
 #install_package "setuptools-1.4.2" "https://pypi.python.org/packages/source/s/setuptools/setuptools-1.4.2.tar.gz#13951be6711438073fbe50843e7f141f" python
--- a/plugins/python-build/share/python-build/2.3.7
+++ b/plugins/python-build/share/python-build/2.3.7
@@ -1,4 +1,4 @@
-require_cc
+#require_gcc
 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.3.7" "http://python.org/ftp/python/2.3.7/Python-2.3.7.tgz#969a9891dce9f50b13e54f9890acaf2be66715a5895bf9b11111f320c205b90e" ldflags_dirs standard verify_py23
 #install_package "setuptools-1.4.2" "https://pypi.python.org/packages/source/s/setuptools/setuptools-1.4.2.tar.gz#13951be6711438073fbe50843e7f141f" python
--- a/plugins/python-build/share/python-build/2.4
+++ b/plugins/python-build/share/python-build/2.4
@@ -1,4 +1,4 @@
-require_cc
+#require_gcc
 install_package "readline-6.3" "http://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43" standard --if has_broken_mac_readline
 install_package "Python-2.4" "http://python.org/ftp/python/2.4/Python-2.4.tgz#ff746de0fae8691c082414b42a2bb172da8797e6e8ff66c9a39d2e452f7034e9" ldflags_dirs standard verify_py24
 install_package "setuptools-1.4.2" "https://pypi.python.org/packages/source/s/setuptools/setuptools-1.4.2.tar.gz#263986a60a83aba790a5bffc7d009ac88114ba4e908e5c90e453b3bf2155dbbd" python
--- a/plugins/python-build/share/python-build/2.4.1
+++ b/plugins/python-build/share/python-build/2.4.1
@@ -1,4 +1,4 @@
-require_cc
+#require_gcc
 install_package "readline-6.3" "http://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43" standard --if has_broken_mac_readline
 install_package "Python-2.4.1" "http://python.org/ftp/python/2.4.1/Python-2.4.1.tgz#f449c3b167389324c525ad99d02376c518ac11e163dbbbc13bc88a5c7101fd00" ldflags_dirs standard verify_py24
 install_package "setuptools-1.4.2" "https://pypi.python.org/packages/source/s/setuptools/setuptools-1.4.2.tar.gz#263986a60a83aba790a5bffc7d009ac88114ba4e908e5c90e453b3bf2155dbbd" python
--- a/plugins/python-build/share/python-build/2.4.2
+++ b/plugins/python-build/share/python-build/2.4.2
@@ -1,4 +1,4 @@
-require_cc
+#require_gcc
 install_package "readline-6.3" "http://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43" standard --if has_broken_mac_readline
 install_package "Python-2.4.2" "http://python.org/ftp/python/2.4.2/Python-2.4.2.tgz#2653e1846e87fd9b3ee287fefc965c80c54646548b4913a22265b0dd54493adf" ldflags_dirs standard verify_py24
 install_package "setuptools-1.4.2" "https://pypi.python.org/packages/source/s/setuptools/setuptools-1.4.2.tar.gz#263986a60a83aba790a5bffc7d009ac88114ba4e908e5c90e453b3bf2155dbbd" python
--- a/plugins/python-build/share/python-build/2.4.3
+++ b/plugins/python-build/share/python-build/2.4.3
@@ -1,4 +1,4 @@
-require_cc
+#require_gcc
 install_package "readline-6.3" "http://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43" standard --if has_broken_mac_readline
 install_package "Python-2.4.3" "http://python.org/ftp/python/2.4.3/Python-2.4.3.tgz#985a413932f5e31e6280b37da6b285a3a0b2748c6786643989ed9b23de97e2d5" ldflags_dirs standard verify_py24
 install_package "setuptools-1.4.2" "https://pypi.python.org/packages/source/s/setuptools/setuptools-1.4.2.tar.gz#263986a60a83aba790a5bffc7d009ac88114ba4e908e5c90e453b3bf2155dbbd" python
--- a/plugins/python-build/share/python-build/2.4.4
+++ b/plugins/python-build/share/python-build/2.4.4
@@ -1,4 +1,4 @@
-require_cc
+#require_gcc
 install_package "readline-6.3" "http://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43" standard --if has_broken_mac_readline
 install_package "Python-2.4.4" "http://python.org/ftp/python/2.4.4/Python-2.4.4.tgz#92be6e20cbc3111d9dd0c016d72ef7914c23b879dc52df7ba28df97afbf12e2e" ldflags_dirs standard verify_py24
 install_package "setuptools-1.4.2" "https://pypi.python.org/packages/source/s/setuptools/setuptools-1.4.2.tar.gz#263986a60a83aba790a5bffc7d009ac88114ba4e908e5c90e453b3bf2155dbbd" python
--- a/plugins/python-build/share/python-build/2.4.5
+++ b/plugins/python-build/share/python-build/2.4.5
@@ -1,4 +1,4 @@
-require_cc
+#require_gcc
 install_package "readline-6.3" "http://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43" standard --if has_broken_mac_readline
 install_package "Python-2.4.5" "http://python.org/ftp/python/2.4.5/Python-2.4.5.tgz#6ae6f67a388a7f70ed3a20eebab5aae995ee433089d1f1724095c62f4b7389a1" ldflags_dirs standard verify_py24
 install_package "setuptools-1.4.2" "https://pypi.python.org/packages/source/s/setuptools/setuptools-1.4.2.tar.gz#263986a60a83aba790a5bffc7d009ac88114ba4e908e5c90e453b3bf2155dbbd" python
--- a/plugins/python-build/share/python-build/2.4.6
+++ b/plugins/python-build/share/python-build/2.4.6
@@ -1,4 +1,4 @@
-require_cc
+#require_gcc
 install_package "readline-6.3" "http://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43" standard --if has_broken_mac_readline
 install_package "Python-2.4.6" "http://python.org/ftp/python/2.4.6/Python-2.4.6.tgz#b03f269e826927f05c966cf4f4414f3c93ee2314960859e7f8375e24e82f8b02" ldflags_dirs standard verify_py24
 install_package "setuptools-1.4.2" "https://pypi.python.org/packages/source/s/setuptools/setuptools-1.4.2.tar.gz#263986a60a83aba790a5bffc7d009ac88114ba4e908e5c90e453b3bf2155dbbd" python
--- a/plugins/python-build/share/python-build/2.5
+++ b/plugins/python-build/share/python-build/2.5
@@ -1,4 +1,4 @@
-require_cc
+#require_gcc
 install_package "readline-6.3" "http://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43" standard --if has_broken_mac_readline
 install_package "Python-2.5" "http://python.org/ftp/python/2.5/Python-2.5.tgz#d7bbf42e36003c6065cd19f3e67d283521858515ee923220f654131cebe1d8f2" ldflags_dirs standard verify_py25
 install_package "setuptools-1.4.2" "https://pypi.python.org/packages/source/s/setuptools/setuptools-1.4.2.tar.gz#263986a60a83aba790a5bffc7d009ac88114ba4e908e5c90e453b3bf2155dbbd" python
--- a/plugins/python-build/share/python-build/2.5.1
+++ b/plugins/python-build/share/python-build/2.5.1
@@ -1,4 +1,4 @@
-require_cc
+#require_gcc
 install_package "readline-6.3" "http://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43" standard --if has_broken_mac_readline
 install_package "Python-2.5.1" "http://python.org/ftp/python/2.5.1/Python-2.5.1.tgz#1f5caee846049ca30d996f9403eefdb996295c4af664867e35dcc5eb36e4e7e8" ldflags_dirs standard verify_py25
 install_package "setuptools-1.4.2" "https://pypi.python.org/packages/source/s/setuptools/setuptools-1.4.2.tar.gz#263986a60a83aba790a5bffc7d009ac88114ba4e908e5c90e453b3bf2155dbbd" python
--- a/plugins/python-build/share/python-build/2.5.2
+++ b/plugins/python-build/share/python-build/2.5.2
@@ -1,4 +1,4 @@
-require_cc
+#require_gcc
 install_package "readline-6.3" "http://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43" standard --if has_broken_mac_readline
 install_package "Python-2.5.2" "http://python.org/ftp/python/2.5.2/Python-2.5.2.tgz#834afe8a88adaf623b05ac5dd6700dd5bb5d0d5553fc74ad529359a3496e4ae3" ldflags_dirs standard verify_py25
 install_package "setuptools-1.4.2" "https://pypi.python.org/packages/source/s/setuptools/setuptools-1.4.2.tar.gz#263986a60a83aba790a5bffc7d009ac88114ba4e908e5c90e453b3bf2155dbbd" python
--- a/plugins/python-build/share/python-build/2.5.3
+++ b/plugins/python-build/share/python-build/2.5.3
@@ -1,4 +1,4 @@
-require_cc
+#require_gcc
 install_package "readline-6.3" "http://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43" standard --if has_broken_mac_readline
 install_package "Python-2.5.3" "http://python.org/ftp/python/2.5.3/Python-2.5.3.tgz#c3fee607d20a77dfb72ea2e627eb4d95d25c735603435abde62c57015a0445bd" ldflags_dirs standard verify_py25
 install_package "setuptools-1.4.2" "https://pypi.python.org/packages/source/s/setuptools/setuptools-1.4.2.tar.gz#263986a60a83aba790a5bffc7d009ac88114ba4e908e5c90e453b3bf2155dbbd" python
--- a/plugins/python-build/share/python-build/2.5.4
+++ b/plugins/python-build/share/python-build/2.5.4
@@ -1,4 +1,4 @@
-require_cc
+#require_gcc
 install_package "readline-6.3" "http://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43" standard --if has_broken_mac_readline
 install_package "Python-2.5.4" "http://python.org/ftp/python/2.5.4/Python-2.5.4.tgz#3d3b205611ee503a38a9433d5645a571668420bb219242c7f51af85f05664da6" ldflags_dirs standard verify_py25
 install_package "setuptools-1.4.2" "https://pypi.python.org/packages/source/s/setuptools/setuptools-1.4.2.tar.gz#263986a60a83aba790a5bffc7d009ac88114ba4e908e5c90e453b3bf2155dbbd" python
--- a/plugins/python-build/share/python-build/2.5.5
+++ b/plugins/python-build/share/python-build/2.5.5
@@ -1,4 +1,4 @@
-require_cc
+#require_gcc
 install_package "readline-6.3" "http://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43" standard --if has_broken_mac_readline
 install_package "Python-2.5.5" "http://python.org/ftp/python/2.5.5/Python-2.5.5.tgz#03be1019c4fe93daeb53ba9e4294bf22a8ed4cb854cbd57e24e16f6bf63e2392" ldflags_dirs standard verify_py25
 install_package "setuptools-1.4.2" "https://pypi.python.org/packages/source/s/setuptools/setuptools-1.4.2.tar.gz#263986a60a83aba790a5bffc7d009ac88114ba4e908e5c90e453b3bf2155dbbd" python
--- a/plugins/python-build/share/python-build/2.5.6
+++ b/plugins/python-build/share/python-build/2.5.6
@@ -1,4 +1,4 @@
-require_cc
+#require_gcc
 install_package "readline-6.3" "http://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43" standard --if has_broken_mac_readline
 install_package "Python-2.5.6" "http://python.org/ftp/python/2.5.6/Python-2.5.6.tgz#c2e4377597241b1065677d23327c04d0f41945d370c61a491cc88be367234c5d" ldflags_dirs standard verify_py25
 install_package "setuptools-1.4.2" "https://pypi.python.org/packages/source/s/setuptools/setuptools-1.4.2.tar.gz#263986a60a83aba790a5bffc7d009ac88114ba4e908e5c90e453b3bf2155dbbd" python
--- a/plugins/python-build/share/python-build/2.6.6
+++ b/plugins/python-build/share/python-build/2.6.6
@@ -1,3 +1,3 @@
-require_cc
+#require_gcc
 install_package "readline-6.3" "http://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43" 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#372f66db46d773214e4619df1794a26449158f626138d4d2141a64c2f017fae1" ldflags_dirs standard verify_py26 ensurepip
--- a/plugins/python-build/share/python-build/2.6.7
+++ b/plugins/python-build/share/python-build/2.6.7
@@ -1,3 +1,3 @@
-require_cc
+#require_gcc
 install_package "readline-6.3" "http://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43" 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#a8093eace4cfd3e06b05f0deb5d765e3c6cec65908048640a8cadd7a948b3826" ldflags_dirs standard verify_py26 ensurepip
--- a/plugins/python-build/share/python-build/2.6.8
+++ b/plugins/python-build/share/python-build/2.6.8
@@ -1,3 +1,3 @@
-require_cc
+#require_gcc
 install_package "readline-6.3" "http://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43" 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#5bf02a75ffa2fcaa5a3cabb8201998519b045541975622316888ea468d9512f7" ldflags_dirs standard verify_py26 ensurepip
--- a/plugins/python-build/share/python-build/2.6.9
+++ b/plugins/python-build/share/python-build/2.6.9
@@ -1,3 +1,3 @@
-require_cc
+#require_gcc
 install_package "readline-6.3" "http://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43" 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#7277b1285d8a82f374ef6ebaac85b003266f7939b3f2a24a3af52f9523ac94db" ldflags_dirs standard verify_py26 ensurepip
--- a/plugins/python-build/share/python-build/2.7
+++ b/plugins/python-build/share/python-build/2.7
@@ -1,3 +1,3 @@
-require_cc
+#require_gcc
 install_package "readline-6.3" "http://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43" standard --if has_broken_mac_readline
 install_package "Python-2.7" "http://python.org/ftp/python/2.7/Python-2.7.tgz#5670dd6c0c93b0b529781d070852f7b51ce6855615b16afcd318341af2910fb5" ldflags_dirs standard verify_py27 ensurepip
--- a/plugins/python-build/share/python-build/2.7-dev
+++ b/plugins/python-build/share/python-build/2.7-dev
@@ -1,3 +1,3 @@
-require_cc
+#require_gcc
 install_package "readline-6.3" "http://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43" standard --if has_broken_mac_readline
 install_hg "Python-2.7-dev" "https://bitbucket.org/mirror/cpython" "2.7" standard verify_py27 ensurepip
--- a/plugins/python-build/share/python-build/2.7.1
+++ b/plugins/python-build/share/python-build/2.7.1
@@ -1,3 +1,3 @@
-require_cc
+#require_gcc
 install_package "readline-6.3" "http://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43" 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#ca13e7b1860821494f70de017202283ad73b1fb7bd88586401c54ef958226ec8" ldflags_dirs standard verify_py27 ensurepip
--- a/plugins/python-build/share/python-build/2.7.2
+++ b/plugins/python-build/share/python-build/2.7.2
@@ -1,3 +1,3 @@
-require_cc
+#require_gcc
 install_package "readline-6.3" "http://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43" 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#1d54b7096c17902c3f40ffce7e5b84e0072d0144024184fff184a84d563abbb3" ldflags_dirs standard verify_py27 ensurepip
--- a/plugins/python-build/share/python-build/2.7.3
+++ b/plugins/python-build/share/python-build/2.7.3
@@ -1,3 +1,3 @@
-require_cc
+#require_gcc
 install_package "readline-6.3" "http://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43" 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#d4c20f2b5faf95999fd5fecb3f7d32071b0820516224a6d2b72932ab47a1cb8e" ldflags_dirs standard verify_py27 ensurepip
--- a/plugins/python-build/share/python-build/2.7.4
+++ b/plugins/python-build/share/python-build/2.7.4
@@ -1,3 +1,3 @@
-require_cc
+#require_gcc
 install_package "readline-6.3" "http://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43" 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#98c5eb9c8e65effcc0122112ba17a0bce880aa23ecb560af56b55eb55632b81a" ldflags_dirs standard verify_py27 ensurepip
--- a/plugins/python-build/share/python-build/2.7.5
+++ b/plugins/python-build/share/python-build/2.7.5
@@ -1,3 +1,3 @@
-require_cc
+#require_gcc
 install_package "readline-6.3" "http://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43" 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#8e1b5fa87b91835afb376a9c0d319d41feca07ffebc0288d97ab08d64f48afbf" ldflags_dirs standard verify_py27 ensurepip
--- a/plugins/python-build/share/python-build/2.7.6
+++ b/plugins/python-build/share/python-build/2.7.6
@@ -1,3 +1,3 @@
-require_cc
+#require_gcc
 install_package "readline-6.3" "http://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43" 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#99c6860b70977befa1590029fae092ddb18db1d69ae67e8b9385b66ed104ba58" ldflags_dirs standard verify_py27 ensurepip
--- a/plugins/python-build/share/python-build/2.7.7
+++ b/plugins/python-build/share/python-build/2.7.7
@@ -1,3 +1,3 @@
-require_cc
+#require_gcc
 install_package "readline-6.3" "http://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43" standard --if has_broken_mac_readline
 install_package "Python-2.7.7" "https://www.python.org/ftp/python/2.7.7/Python-2.7.7.tgz#7f49c0a6705ad89d925181e27d0aaa025ee4731ce0de64776c722216c3e66c42" ldflags_dirs standard verify_py27 ensurepip
--- a/plugins/python-build/share/python-build/2.7.8
+++ b/plugins/python-build/share/python-build/2.7.8
@@ -1,3 +1,3 @@
-require_cc
+#require_gcc
 install_package "readline-6.3" "http://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43" standard --if has_broken_mac_readline
 install_package "Python-2.7.8" "https://www.python.org/ftp/python/2.7.8/Python-2.7.8.tgz#74d70b914da4487aa1d97222b29e9554d042f825f26cb2b93abd20fdda56b557" ldflags_dirs standard verify_py27 ensurepip
--- a/plugins/python-build/share/python-build/2.7.9
+++ b/plugins/python-build/share/python-build/2.7.9
@@ -0,0 +1,3 @@
+#require_gcc
+install_package "readline-6.3" "http://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43" standard --if has_broken_mac_readline
+install_package "Python-2.7.9" "https://www.python.org/ftp/python/2.7.9/Python-2.7.9.tgz#c8bba33e66ac3201dabdc556f0ea7cfe6ac11946ec32d357c4c6f9b018c12c5b" ldflags_dirs standard verify_py27 ensurepip
--- a/plugins/python-build/share/python-build/3.0.1
+++ b/plugins/python-build/share/python-build/3.0.1
@@ -1,3 +1,3 @@
-require_cc
+#require_gcc
 install_package "readline-6.3" "http://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43" 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#7d5f2feae9035f1d3d9e6bb7f092dbf374d6bb4b25abd0d2d11f13bba1cb04de" ldflags_dirs standard verify_py30 ensurepip
--- a/plugins/python-build/share/python-build/3.1-dev
+++ b/plugins/python-build/share/python-build/3.1-dev
@@ -1,3 +1,3 @@
-require_cc
+#require_gcc
 install_package "readline-6.3" "http://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43" standard --if has_broken_mac_readline
 install_hg "Python-3.1-dev" "https://bitbucket.org/mirror/cpython" "3.1" standard verify_py31 ensurepip
--- a/plugins/python-build/share/python-build/3.1.3
+++ b/plugins/python-build/share/python-build/3.1.3
@@ -1,3 +1,3 @@
-require_cc
+#require_gcc
 install_package "readline-6.3" "http://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43" 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#6311823aeda8be6a7a2b67caaeff48abce6626c9940ba7ed81f9c978666a36bd" ldflags_dirs standard verify_py31 ensurepip
--- a/plugins/python-build/share/python-build/3.1.4
+++ b/plugins/python-build/share/python-build/3.1.4
@@ -1,3 +1,3 @@
-require_cc
+#require_gcc
 install_package "readline-6.3" "http://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43" 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#fadc05ea6d05360cff189944a85ecd2180bbc308784d168b350450e70bbdd846" ldflags_dirs standard verify_py31 ensurepip
--- a/plugins/python-build/share/python-build/3.1.5
+++ b/plugins/python-build/share/python-build/3.1.5
@@ -1,3 +1,3 @@
-require_cc
+#require_gcc
 install_package "readline-6.3" "http://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43" 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#d12dae6d06f52ef6bf1271db4d5b4d14b5dd39813e324314e72b648ef1bc0103" ldflags_dirs standard verify_py31 ensurepip
--- a/plugins/python-build/share/python-build/3.2
+++ b/plugins/python-build/share/python-build/3.2
@@ -1,3 +1,3 @@
-require_cc
+#require_gcc
 install_package "readline-6.3" "http://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43" standard --if has_broken_mac_readline
 install_package "Python-3.2" "http://python.org/ftp/python/3.2/Python-3.2.tgz#27b35bfcbbf01de9564c0265d72b58ba3ff3d56df0615765372f2aa09dc20da9" ldflags_dirs standard verify_py32 ensurepip
--- a/plugins/python-build/share/python-build/3.2-dev
+++ b/plugins/python-build/share/python-build/3.2-dev
@@ -1,3 +1,3 @@
-require_cc
+#require_gcc
 install_package "readline-6.3" "http://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43" standard --if has_broken_mac_readline
 install_hg "Python-3.2-dev" "https://bitbucket.org/mirror/cpython" "3.2" standard verify_py32 ensurepip
--- a/plugins/python-build/share/python-build/3.2.1
+++ b/plugins/python-build/share/python-build/3.2.1
@@ -1,3 +1,3 @@
-require_cc
+#require_gcc
 install_package "readline-6.3" "http://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43" 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#7cff29d984696d9fe8c7bea54da5b9ad36acef33ff5cf0d3e37e4d12fb21c572" ldflags_dirs standard verify_py32 ensurepip
--- a/plugins/python-build/share/python-build/3.2.2
+++ b/plugins/python-build/share/python-build/3.2.2
@@ -1,3 +1,3 @@
-require_cc
+#require_gcc
 install_package "readline-6.3" "http://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43" 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#acc6a13cb4fed0b7e86716324a8437e326645b8076177eede5a0cad99ec0313c" ldflags_dirs standard verify_py32 ensurepip
--- a/plugins/python-build/share/python-build/3.2.3
+++ b/plugins/python-build/share/python-build/3.2.3
@@ -1,3 +1,3 @@
-require_cc
+#require_gcc
 install_package "readline-6.3" "http://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43" 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#74c33e165edef7532cef95fd9a325a06878b5bfc8a5d038161573f283eaf9809" ldflags_dirs standard verify_py32 ensurepip
--- a/plugins/python-build/share/python-build/3.2.4
+++ b/plugins/python-build/share/python-build/3.2.4
@@ -1,3 +1,3 @@
-require_cc
+#require_gcc
 install_package "readline-6.3" "http://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43" 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#71c3139908ccc1c544ba1e331a3c22b3f1c09f562438a054fd6f4e2628de8b9a" ldflags_dirs standard verify_py32 ensurepip
--- a/plugins/python-build/share/python-build/3.2.5
+++ b/plugins/python-build/share/python-build/3.2.5
@@ -1,3 +1,3 @@
-require_cc
+#require_gcc
 install_package "readline-6.3" "http://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43" 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#5eae0ab92a0bb9e3a1bf9c7cd046bc3de58996b049bd894d095978b6b085099f" ldflags_dirs standard verify_py32 ensurepip
--- a/plugins/python-build/share/python-build/3.2.6
+++ b/plugins/python-build/share/python-build/3.2.6
@@ -0,0 +1,3 @@
+#require_gcc
+install_package "readline-6.3" "http://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43" standard --if has_broken_mac_readline
+install_package "Python-3.2.6" "https://www.python.org/ftp/python/3.2.6/Python-3.2.6.tgz#fc1e41296e29d476f696303acae293ae7a2310f0f9d0d637905e722a3f16163e" ldflags_dirs standard verify_py32 ensurepip
--- a/plugins/python-build/share/python-build/3.2.6rc1
+++ b/plugins/python-build/share/python-build/3.2.6rc1
@@ -1,3 +0,0 @@
-require_cc
-install_package "readline-6.3" "http://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43" standard --if has_broken_mac_readline
-install_package "Python-3.2.6rc1" "https://www.python.org/ftp/python/3.2.6/Python-3.2.6rc1.tgz#b10c473f205793319e41e2855abcf7f46f0f845e6e8e5077183dbc1271c19743" ldflags_dirs standard verify_py32 ensurepip
--- a/plugins/python-build/share/python-build/3.3-dev
+++ b/plugins/python-build/share/python-build/3.3-dev
@@ -1,3 +1,3 @@
-require_cc
+#require_gcc
 install_package "readline-6.3" "http://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43" standard --if has_broken_mac_readline
 install_hg "Python-3.3-dev" "https://bitbucket.org/mirror/cpython" "3.3" standard verify_py33 ensurepip
--- a/plugins/python-build/share/python-build/3.3.0
+++ b/plugins/python-build/share/python-build/3.3.0
@@ -1,3 +1,3 @@
-require_cc
+#require_gcc
 install_package "readline-6.3" "http://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43" 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#cfe531eaace2503e13a74addc7f4a89482e99f8b8fca51b469ae5c83f450604e" ldflags_dirs standard verify_py33 ensurepip
--- a/plugins/python-build/share/python-build/3.3.1
+++ b/plugins/python-build/share/python-build/3.3.1
@@ -1,3 +1,3 @@
-require_cc
+#require_gcc
 install_package "readline-6.3" "http://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43" 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#671dc3632f311e63c6733703aa0a1ad90c99277ddc8299d39e487718a50319bd" ldflags_dirs standard verify_py33 ensurepip
--- a/plugins/python-build/share/python-build/3.3.2
+++ b/plugins/python-build/share/python-build/3.3.2
@@ -1,3 +1,3 @@
-require_cc
+#require_gcc
 install_package "readline-6.3" "http://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43" 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#de664fca3b8e0ab20fb42bfed1a36e26f116f1853e88ada12dbc938761036172" ldflags_dirs standard verify_py33 ensurepip
--- a/plugins/python-build/share/python-build/3.3.3
+++ b/plugins/python-build/share/python-build/3.3.3
@@ -1,3 +1,3 @@
-require_cc
+#require_gcc
 install_package "readline-6.3" "http://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43" 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#30b60839bfe0ae8a2dba11e909328459bb8ee4a258afe7494b06b2ceda080efc" ldflags_dirs standard verify_py33 ensurepip
--- a/plugins/python-build/share/python-build/3.3.4
+++ b/plugins/python-build/share/python-build/3.3.4
@@ -1,3 +1,3 @@
-require_cc
+#require_gcc
 install_package "readline-6.3" "http://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43" 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#ea055db9dd004a6ecd7690abc9734573763686dd768122316bae2dfd026412af" ldflags_dirs standard verify_py33 ensurepip
--- a/plugins/python-build/share/python-build/3.3.5
+++ b/plugins/python-build/share/python-build/3.3.5
@@ -1,3 +1,3 @@
-require_cc
+#require_gcc
 install_package "readline-6.3" "http://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43" standard --if has_broken_mac_readline
 install_package "Python-3.3.5" "http://python.org/ftp/python/3.3.5/Python-3.3.5.tgz#916bc57dd8524dc27429bebae7b39d6942742cf9699b875b2b496a3d960c7168" ldflags_dirs standard verify_py33 ensurepip
--- a/plugins/python-build/share/python-build/3.3.6
+++ b/plugins/python-build/share/python-build/3.3.6
@@ -0,0 +1,3 @@
+#require_gcc
+install_package "readline-6.3" "http://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43" standard --if has_broken_mac_readline
+install_package "Python-3.3.6" "https://www.python.org/ftp/python/3.3.6/Python-3.3.6.tgz#0a58ad1f1def4ecc90b18b0c410a3a0e1a48cf7692c75d1f83d0af080e5d2034" ldflags_dirs standard verify_py33 ensurepip
--- a/plugins/python-build/share/python-build/3.3.6rc1
+++ b/plugins/python-build/share/python-build/3.3.6rc1
@@ -1,3 +0,0 @@
-require_cc
-install_package "readline-6.3" "http://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43" standard --if has_broken_mac_readline
-install_package "Python-3.3.6rc1" "https://www.python.org/ftp/python/3.3.6/Python-3.3.6rc1.tgz#1729a43107be4e13b8b4407926557242f2a28a93b97d2d861f8b002257467169" ldflags_dirs standard verify_py33 ensurepip
--- a/plugins/python-build/share/python-build/3.4-dev
+++ b/plugins/python-build/share/python-build/3.4-dev
@@ -1,3 +1,3 @@
-require_cc
+#require_gcc
 install_package "readline-6.3" "http://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43" standard --if has_broken_mac_readline
-install_hg "Python-3.4-dev" "https://bitbucket.org/mirror/cpython" "default" standard verify_py34 ensurepip
+install_hg "Python-3.4-dev" "https://bitbucket.org/mirror/cpython" "3.4" standard verify_py34 ensurepip
--- a/plugins/python-build/share/python-build/3.4.0
+++ b/plugins/python-build/share/python-build/3.4.0
@@ -1,3 +1,3 @@
-require_cc
+#require_gcc
 install_package "readline-6.3" "http://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43" standard --if has_broken_mac_readline
 install_package "Python-3.4.0" "https://www.python.org/ftp/python/3.4.0/Python-3.4.0.tgz#d2c83ea0217769a73e8b1ee33ffbca814903f8568e30f8d13e68e3d1f743449c" ldflags_dirs standard verify_py34 ensurepip
--- a/plugins/python-build/share/python-build/3.4.1
+++ b/plugins/python-build/share/python-build/3.4.1
@@ -1,3 +1,3 @@
-require_cc
+#require_gcc
 install_package "readline-6.3" "http://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43" standard --if has_broken_mac_readline
 install_package "Python-3.4.1" "https://www.python.org/ftp/python/3.4.1/Python-3.4.1.tgz#8d007e3ef80b128a292be101201e75dec5480e5632e994771e7c231d17720b66" ldflags_dirs standard verify_py34 ensurepip
--- a/plugins/python-build/share/python-build/3.4.2
+++ b/plugins/python-build/share/python-build/3.4.2
@@ -1,3 +1,3 @@
-require_cc
+#require_gcc
 install_package "readline-6.3" "http://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43" standard --if has_broken_mac_readline
 install_package "Python-3.4.2" "https://www.python.org/ftp/python/3.4.2/Python-3.4.2.tgz#44a3c1ef1c7ca3e4fd25242af80ed72da941203cb4ed1a8c1b724d9078965dd8" ldflags_dirs standard verify_py34 ensurepip
--- a/plugins/python-build/share/python-build/3.5-dev
+++ b/plugins/python-build/share/python-build/3.5-dev
@@ -0,0 +1,3 @@
+#require_gcc
+install_package "readline-6.3" "http://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43" standard --if has_broken_mac_readline
+install_hg "Python-3.5-dev" "https://bitbucket.org/mirror/cpython" "default" standard verify_py35 ensurepip
--- a/plugins/python-build/share/python-build/anaconda-2.1.0
+++ b/plugins/python-build/share/python-build/anaconda-2.1.0
@@ -0,0 +1,19 @@
+case "$(anaconda_architecture 2>/dev/null || true)" in
+"Linux-x86" )
+  install_script "Anaconda-2.1.0-Linux-x86" "http://repo.continuum.io/archive/Anaconda-2.1.0-Linux-x86.sh#fd70c08719e6b5caae45b7c8402c6975a8cbc0e3e2a9c4c977554d1784f28b72" "anaconda" verify_py27
+  ;;
+"Linux-x86_64" )
+  install_script "Anaconda-2.1.0-Linux-x86_64" "http://repo.continuum.io/archive/Anaconda-2.1.0-Linux-x86_64.sh#191fbf290747614929d0bdd576e330c944b22a67585d1c185e0d2b3a3e65e1c0" "anaconda" verify_py27
+  ;;
+"MacOSX-x86_64" )
+  install_script "Anaconda-2.1.0-MacOSX-x86_64" "http://repo.continuum.io/archive/Anaconda-2.1.0-MacOSX-x86_64.sh#128fd4f53e0895e0d23f33e924ae32e01171c2914b044d2b157a9497108109cf" "anaconda" verify_py27
+  ;;
+* )
+  { echo
+    colorize 1 "ERROR"
+    echo ": The binary distribution of Anaconda is not available for $(anaconda_architecture 2>/dev/null || true)."
+    echo
+  } >&2
+  exit 1
+  ;;
+esac
--- a/plugins/python-build/share/python-build/anaconda3-2.1.0
+++ b/plugins/python-build/share/python-build/anaconda3-2.1.0
@@ -0,0 +1,19 @@
+case "$(anaconda_architecture 2>/dev/null || true)" in
+"Linux-x86" )
+  install_script "Anaconda3-2.1.0-Linux-x86" "http://repo.continuum.io/anaconda3/Anaconda3-2.1.0-Linux-x86.sh#657cb599004c21e37ce693515ea33922e0084fd7c159ef1b96b57c86eed8385f" "anaconda" verify_py34
+  ;;
+"Linux-x86_64" )
+  install_script "Anaconda3-2.1.0-Linux-x86_64" "http://repo.continuum.io/anaconda3/Anaconda3-2.1.0-Linux-x86_64.sh#af3225ccbe8df0ffb918939e009aa57740e35058ebf9dfcf5fec794a77556c3c" "anaconda" verify_py34
+  ;;
+"MacOSX-x86_64" )
+  install_script "Anaconda3-2.1.0-MacOSX-x86_64" "http://repo.continuum.io/anaconda3/Anaconda3-2.1.0-MacOSX-x86_64.sh#efdb7e9d1e539cbed62dc3874b0de6a141f36684e6fbc05018e072b217e24077" "anaconda" verify_py34
+  ;;
+* )
+  { echo
+    colorize 1 "ERROR"
+    echo ": The binary distribution of Anaconda3 is not available for $(anaconda_architecture 2>/dev/null || true)."
+    echo
+  } >&2
+  exit 1
+  ;;
+esac
--- a/plugins/python-build/share/python-build/miniconda-3.7.0
+++ b/plugins/python-build/share/python-build/miniconda-3.7.0
@@ -0,0 +1,19 @@
+case "$(anaconda_architecture 2>/dev/null || true)" in
+"Linux-x86" )
+  install_script "Miniconda-3.7.0-Linux-x86" "http://repo.continuum.io/miniconda/Miniconda-3.7.0-Linux-x86.sh#cada23bbaab6f21053d45f6d76cf311dffb2f234659fcef0b6a33a6d769317cb" "miniconda" verify_py27 
+;;
+"Linux-x86_64" )
+  install_script "Miniconda-3.7.0-Linux-x86_64" "http://repo.continuum.io/miniconda/Miniconda-3.7.0-Linux-x86_64.sh#ed6fd3f85dc43ca10e41355bf3efc40bffd64f2364aecad24ac68a9f1009a469" "miniconda" verify_py27
+;;
+"MacOSX-x86_64" )
+  install_script "Miniconda-3.7.0-MacOSX-x86_64" "http://repo.continuum.io/miniconda/Miniconda-3.7.0-MacOSX-x86_64.sh#9a8e731a2a3bd6ab3d5b7304c3c783c04582386142fe39ceb7d5bfabdd74d8eb" "miniconda" verify_py27
+;;
+* )
+  { echo
+    colorize 1 "ERROR"
+    echo ": The binary distribution of Miniconda is not available for $(anaconda_architecture 2>/dev/null || true)."
+    echo
+  } >&2
+  exit 1
+  ;;
+esac
--- a/plugins/python-build/share/python-build/miniconda3-3.7.0
+++ b/plugins/python-build/share/python-build/miniconda3-3.7.0
@@ -0,0 +1,19 @@
+case "$(anaconda_architecture 2>/dev/null || true)" in
+"Linux-x86" )
+  install_script "Miniconda3-3.7.0-Linux-x86" "http://repo.continuum.io/miniconda/Miniconda3-3.7.0-Linux-x86.sh#d5143303a8159a5b7388cc1d09aa6d9bc029c2c5f8cb53230a5fcf07d9ee149c" "miniconda" verify_py34
+  ;;
+"Linux-x86_64" )
+  install_script "Miniconda3-3.7.0-Linux-x86_64" "http://repo.continuum.io/miniconda/Miniconda3-3.7.0-Linux-x86_64.sh#dba631db9938216af83ca9793605a73fae8b8e5ef966c15b9e89c09bf405de26" "miniconda" verify_py34
+  ;;
+"MacOSX-x86_64" )
+  install_script "Miniconda3-3.7.0-MacOSX-x86_64" "http://repo.continuum.io/miniconda/Miniconda3-3.7.0-MacOSX-x86_64.sh#fd4df5a944801019ef56a348bdcb483a7fdbf376c98aeacb25a78e5bc9bb4158" "miniconda" verify_py34
+  ;;
+* )
+  { echo
+    colorize 1 "ERROR"
+    echo ": The binary distribution of Miniconda is not available for $(anaconda_architecture 2>/dev/null || true)."
+    echo
+  } >&2
+  exit 1
+  ;;
+esac
--- a/plugins/python-build/share/python-build/patches/2.6.9/Python-2.6.9/001_remove_systemstubs.patch
+++ b/plugins/python-build/share/python-build/patches/2.6.9/Python-2.6.9/001_remove_systemstubs.patch
@@ -0,0 +1,12 @@
+diff -ru ../Python-2.6.9/configure ./configure
+--- ../Python-2.6.9/configure	2013-10-29 17:04:39.000000000 +0200
+++ ./configure	2014-11-14 11:33:00.000000000 +0200
+@@ -7227,7 +7227,7 @@
+ 	#ARCH_RUN_32BIT="true"
+     fi
+ 
+-    LIBTOOL_CRUFT=$LIBTOOL_CRUFT" -lSystem -lSystemStubs -arch_only ${MACOSX_DEFAULT_ARCH}"
+    LIBTOOL_CRUFT=$LIBTOOL_CRUFT" -lSystem -arch_only ${MACOSX_DEFAULT_ARCH}"
+     LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -install_name $(PYTHONFRAMEWORKINSTALLDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK)'
+     LIBTOOL_CRUFT=$LIBTOOL_CRUFT' -compatibility_version $(VERSION) -current_version $(VERSION)';;
+ esac
--- a/plugins/python-build/share/python-build/patches/3.2.6rc1/Python-3.2.6rc1/002_readline63.patch
+++ b/plugins/python-build/share/python-build/patches/3.2.6rc1/Python-3.2.6rc1/002_readline63.patch
--- a/plugins/python-build/share/python-build/pypy-2.0
+++ b/plugins/python-build/share/python-build/pypy-2.0
@@ -1,15 +1,3 @@
-require_distro() {
-  if [[ "$(cat /etc/issue 2>/dev/null || true)" != "$1"* ]]; then
-    { echo
-      colorize 1 "WARNING"
-      echo ": The binary distribution of PyPy is built for $1."
-      echo "installed binary may not run expectedly on other platforms."
-      echo
-    } >&2
-    return 1
-  fi
-}
-
 case "$(pypy_architecture 2>/dev/null || true)" in
 "linux" )
  require_distro "Ubuntu 10.04" || true
--- a/plugins/python-build/share/python-build/pypy-2.0.1
+++ b/plugins/python-build/share/python-build/pypy-2.0.1
@@ -1,15 +1,3 @@
-require_distro() {
-  if [[ "$(cat /etc/issue 2>/dev/null || true)" != "$1"* ]]; then
-    { echo
-      colorize 1 "WARNING"
-      echo ": The binary distribution of PyPy is built for $1."
-      echo "installed binary may not run expectedly on other platforms."
-      echo
-    } >&2
-    return 1
-  fi
-}
-
 case "$(pypy_architecture 2>/dev/null || true)" in
 "linux" )
  require_distro "Ubuntu 10.04" || true
--- a/plugins/python-build/share/python-build/pypy-2.0.2
+++ b/plugins/python-build/share/python-build/pypy-2.0.2
@@ -1,15 +1,3 @@
-require_distro() {
-  if [[ "$(cat /etc/issue 2>/dev/null || true)" != "$1"* ]]; then
-    { echo
-      colorize 1 "WARNING"
-      echo ": The binary distribution of PyPy is built for $1."
-      echo "installed binary may not run expectedly on other platforms."
-      echo
-    } >&2
-    return 1
-  fi
-}
-
 case "$(pypy_architecture 2>/dev/null || true)" in
 "linux" )
  require_distro "Ubuntu 10.04" || true
--- a/plugins/python-build/share/python-build/pypy-2.1
+++ b/plugins/python-build/share/python-build/pypy-2.1
@@ -1,15 +1,3 @@
-require_distro() {
-  if [[ "$(cat /etc/issue 2>/dev/null || true)" != "$1"* ]]; then
-    { echo
-      colorize 1 "WARNING"
-      echo ": The binary distribution of PyPy is built for $1."
-      echo "installed binary may not run expectedly on other platforms."
-      echo
-    } >&2
-    return 1
-  fi
-}
-
 case "$(pypy_architecture 2>/dev/null || true)" in
 "linux" )
  require_distro "Ubuntu 10.04" || true
--- a/plugins/python-build/share/python-build/pypy-2.2
+++ b/plugins/python-build/share/python-build/pypy-2.2
@@ -1,15 +1,3 @@
-require_distro() {
-  if [[ "$(cat /etc/issue 2>/dev/null || true)" != "$1"* ]]; then
-    { echo
-      colorize 1 "WARNING"
-      echo ": The binary distribution of PyPy is built for $1."
-      echo "installed binary may not run expectedly on other platforms."
-      echo
-    } >&2
-    return 1
-  fi
-}
-
 case "$(pypy_architecture 2>/dev/null || true)" in
 "linux" )
  require_distro "Ubuntu 10.04" || true
--- a/plugins/python-build/share/python-build/pypy-2.2.1
+++ b/plugins/python-build/share/python-build/pypy-2.2.1
@@ -1,15 +1,3 @@
-require_distro() {
-  if [[ "$(cat /etc/issue 2>/dev/null || true)" != "$1"* ]]; then
-    { echo
-      colorize 1 "WARNING"
-      echo ": The binary distribution of PyPy is built for $1."
-      echo "installed binary may not run expectedly on other platforms."
-      echo
-    } >&2
-    return 1
-  fi
-}
-
 case "$(pypy_architecture 2>/dev/null || true)" in
 "linux" )
  require_distro "Ubuntu 10.04" || true
--- a/plugins/python-build/share/python-build/pypy-2.3
+++ b/plugins/python-build/share/python-build/pypy-2.3
@@ -1,15 +1,3 @@
-require_distro() {
-  if [[ "$(cat /etc/issue 2>/dev/null || true)" != "$1"* ]]; then
-    { echo
-      colorize 1 "WARNING"
-      echo ": The binary distribution of PyPy is built for $1."
-      echo "installed binary may not run expectedly on other platforms."
-      echo
-    } >&2
-    return 1
-  fi
-}
-
 case "$(pypy_architecture 2>/dev/null || true)" in
 "linux" )
  require_distro "Ubuntu 10.04" || true
--- a/plugins/python-build/share/python-build/pypy-2.3.1
+++ b/plugins/python-build/share/python-build/pypy-2.3.1
@@ -1,15 +1,3 @@
-require_distro() {
-  if [[ "$(cat /etc/issue 2>/dev/null || true)" != "$1"* ]]; then
-    { echo
-      colorize 1 "WARNING"
-      echo ": The binary distribution of PyPy is built for $1."
-      echo "installed binary may not run expectedly on other platforms."
-      echo
-    } >&2
-    return 1
-  fi
-}
-
 case "$(pypy_architecture 2>/dev/null || true)" in
 "linux" )
  require_distro "Ubuntu 10.04" || true
--- a/plugins/python-build/share/python-build/pypy-2.4-beta1
+++ b/plugins/python-build/share/python-build/pypy-2.4-beta1
@@ -1,15 +1,3 @@
-require_distro() {
-  if [[ "$(cat /etc/issue 2>/dev/null || true)" != "$1"* ]]; then
-    { echo
-      colorize 1 "WARNING"
-      echo ": The binary distribution of PyPy is built for $1."
-      echo "installed binary may not run expectedly on other platforms."
-      echo
-    } >&2
-    return 1
-  fi
-}
-
 case "$(pypy_architecture 2>/dev/null || true)" in
 "linux" )
  require_distro "Ubuntu 10.04" || true
--- a/plugins/python-build/share/python-build/pypy-2.4.0
+++ b/plugins/python-build/share/python-build/pypy-2.4.0
@@ -1,22 +1,10 @@
-require_distro() {
-  if [[ "$(cat /etc/issue 2>/dev/null || true)" != "$1"* ]]; then
-    { echo
-      colorize 1 "WARNING"
-      echo ": The binary distribution of PyPy is built for $1."
-      echo "installed binary may not run expectedly on other platforms."
-      echo
-    } >&2
-    return 1
-  fi
-}
-
 case "$(pypy_architecture 2>/dev/null || true)" in
 "linux" )
-  require_distro "Ubuntu 10.04" || true
+  require_distro "Ubuntu 12.04" "Ubuntu 12.10" "Ubuntu 13.04" "Ubuntu 13.10" "Ubuntu 14.04" || true
  install_package "pypy-2.4.0-linux" "https://bitbucket.org/pypy/pypy/downloads/pypy-2.4.0-linux.tar.bz2#a24adb366f87ac0eba829d7188a156a7d897e71893689fab06502c3f4152ac0e" "pypy" verify_py27 ensurepip
  ;;
 "linux-armel" )
-  require_distro "Ubuntu 12.04" || true
+  require_distro "Ubuntu 12.04" "Ubuntu 12.10" "Ubuntu 13.04" "Ubuntu 13.10" "Ubuntu 14.04" || true
  install_package "pypy-2.4.0-linux-armel" "https://bitbucket.org/pypy/pypy/downloads/pypy-2.4.0-linux-armel.tar.bz2#8362d634bf86fbfb3b99b578b13c0a9fd673b2b7580d6d65b4a181934c659ccd" "pypy" verify_py27 ensurepip
  ;;
 "linux-armhf" )
--- a/plugins/python-build/share/python-build/pypy-c-jit-latest
+++ b/plugins/python-build/share/python-build/pypy-c-jit-latest
@@ -0,0 +1,35 @@
+case "$(pypy_architecture 2>/dev/null || true)" in
+"linux" )
+  install_nightly_package "pypy-c-jit-latest-linux" "http://buildbot.pypy.org/nightly/trunk/pypy-c-jit-latest-linux.tar.bz2" "pypy-c-jit-*-linux" "pypy" verify_py27 ensurepip
+  ;;
+"linux-armel" )
+  install_nightly_package "pypy-c-jit-latest-linux-armel" "http://buildbot.pypy.org/nightly/trunk/pypy-c-jit-latest-linux-armel.tar.bz2" "pypy-c-jit-*-linux-armel" "pypy" verify_py27 ensurepip
+  ;;
+"linux-armhf" )
+  if [[ "$(cat /etc/issue 2>/dev/null || true)" == "Raspbian"* ]]; then
+    install_nightly_package "pypy-c-jit-latest-linux-armhf-raspbian" "http://buildbot.pypy.org/nightly/trunk/pypy-c-jit-latest-linux-armhf-raspbian.tar.bz2" "pypy-c-jit-*-linux-armhf-raspbian" "pypy" verify_py27 ensurepip
+  else
+    install_nightly_package "pypy-c-jit-latest-linux-armhf-raring" "http://buildbot.pypy.org/nightly/trunk/pypy-c-jit-latest-linux-armhf-raring.tar.bz2" "pypy-c-jit-*-linux-armhf-raring" "pypy" verify_py27 ensurepip
+  fi
+  ;;
+"linux64" )
+  install_nightly_package "pypy-c-jit-latest-linux64" "http://buildbot.pypy.org/nightly/trunk/pypy-c-jit-latest-linux64.tar.bz2" "pypy-c-jit-*-linux64" "pypy" verify_py27 ensurepip
+  ;;
+"osx64" )
+  install_nightly_package "pypy-c-jit-latest-osx64" "http://buildbot.pypy.org/nightly/trunk/pypy-c-jit-latest-osx64.tar.bz2" "pypy-c-jit-*-osx64" "pypy" verify_py27 ensurepip
+  ;;
+"freebsd64" )
+  install_nightly_package "pypy-c-jit-latest-freebsd64" "http://buildbot.pypy.org/nightly/trunk/pypy-c-jit-latest-freebsd64.tar.bz2" "pypy-c-jit-*-freebsd64" "pypy" verify_py27 ensurepip
+  ;;
+#"win32" )
+#  install_zip "pypy-c-jit-latest-win32" "http://buildbot.pypy.org/nightly/trunk/pypy-c-jit-latest-win32.zip" "pypy" verify_py27 ensurepip
+#  ;;
+* )
+  { echo
+    colorize 1 "ERROR"
+    echo ": The binary distribution of PyPy is not available for $(pypy_architecture 2>/dev/null || true)."
+    echo
+  } >&2
+  exit 1
+  ;;
+esac
--- a/plugins/python-build/share/python-build/pypy-c-nojit-latest
+++ b/plugins/python-build/share/python-build/pypy-c-nojit-latest
@@ -0,0 +1,35 @@
+case "$(pypy_architecture 2>/dev/null || true)" in
+"linux" )
+  install_nightly_package "pypy-c-nojit-latest-linux" "http://buildbot.pypy.org/nightly/trunk/pypy-c-nojit-latest-linux.tar.bz2" "pypy-c-nojit-*-linux" "pypy" verify_py27 ensurepip
+  ;;
+"linux-armel" )
+  install_nightly_package "pypy-c-nojit-latest-linux-armel" "http://buildbot.pypy.org/nightly/trunk/pypy-c-nojit-latest-linux-armel.tar.bz2" "pypy-c-nojit-*-linux-armel" "pypy" verify_py27 ensurepip
+  ;;
+"linux-armhf" )
+  if [[ "$(cat /etc/issue 2>/dev/null || true)" == "Raspbian"* ]]; then
+    install_nightly_package "pypy-c-nojit-latest-linux-armhf-raspbian" "http://buildbot.pypy.org/nightly/trunk/pypy-c-nojit-latest-linux-armhf-raspbian.tar.bz2" "pypy-c-nojit-*-linux-armhf-raspbian" "pypy" verify_py27 ensurepip
+  else
+    install_nightly_package "pypy-c-nojit-latest-linux-armhf-raring" "http://buildbot.pypy.org/nightly/trunk/pypy-c-nojit-latest-linux-armhf-raring.tar.bz2" "pypy-c-nojit-*-linux-armhf-raring" "pypy" verify_py27 ensurepip
+  fi
+  ;;
+"linux64" )
+  install_nightly_package "pypy-c-nojit-latest-linux64" "http://buildbot.pypy.org/nightly/trunk/pypy-c-nojit-latest-linux64.tar.bz2" "pypy-c-nojit-*-linux64" "pypy" verify_py27 ensurepip
+  ;;
+"osx64" )
+  install_nightly_package "pypy-c-nojit-latest-osx64" "http://buildbot.pypy.org/nightly/trunk/pypy-c-nojit-latest-osx64.tar.bz2" "pypy-c-nojit-*-osx64" "pypy" verify_py27 ensurepip
+  ;;
+"freebsd64" )
+  install_nightly_package "pypy-c-nojit-latest-freebsd64" "http://buildbot.pypy.org/nightly/trunk/pypy-c-nojit-latest-freebsd64.tar.bz2" "pypy-c-nojit-*-freebsd64" "pypy" verify_py27 ensurepip
+  ;;
+#"win32" )
+#  install_zip "pypy-c-nojit-latest-win32" "http://buildbot.pypy.org/nightly/trunk/pypy-c-nojit-latest-win32.zip" "pypy" verify_py27 ensurepip
+#  ;;
+* )
+  { echo
+    colorize 1 "ERROR"
+    echo ": The binary distribution of PyPy is not available for $(pypy_architecture 2>/dev/null || true)."
+    echo
+  } >&2
+  exit 1
+  ;;
+esac
--- a/plugins/python-build/share/python-build/pypy3-2.3.1
+++ b/plugins/python-build/share/python-build/pypy3-2.3.1
@@ -1,15 +1,3 @@
-require_distro() {
-  if [[ "$(cat /etc/issue 2>/dev/null || true)" != "$1"* ]]; then
-    { echo
-      colorize 1 "WARNING"
-      echo ": The binary distribution of PyPy is built for $1."
-      echo "installed binary may not run expectedly on other platforms."
-      echo
-    } >&2
-    return 1
-  fi
-}
-
 case "$(pypy_architecture 2>/dev/null || true)" in
 "linux" )
  require_distro "Ubuntu 10.04" || true
--- a/plugins/python-build/share/python-build/pypy3-2.4.0
+++ b/plugins/python-build/share/python-build/pypy3-2.4.0
@@ -0,0 +1,38 @@
+case "$(pypy_architecture 2>/dev/null || true)" in
+"linux" )
+  require_distro "Ubuntu 10.04" || true
+  install_package "pypy3-2.4.0-linux" "https://bitbucket.org/pypy/pypy/downloads/pypy3-2.4.0-linux.tar.bz2#108fdcccfddb9b2cb2fc3cbca5e6f7902ed3ab74a24c8ae29da7fbdadbab4345" "pypy" verify_py32 ensurepip
+  ;;
+"linux-armel" )
+  require_distro "Ubuntu 12.04" "Ubuntu 12.10" "Ubuntu 13.04" "Ubuntu 13.10" "Ubuntu 14.04" || true
+  install_package "pypy3-2.4.0-linux-armel" "https://bitbucket.org/pypy/pypy/downloads/pypy3-2.4.0-linux-armel.tar.bz2#322ddc863006a97d48edc302a73bb0981bbc142951237ed161ca0ca2cd02831f" "pypy" verify_py32 ensurepip
+  ;;
+"linux-armhf")
+  if [[ "$(cat /etc/issue 2>/dev/null || true)" == "Raspbian"* ]]; then
+    install_package "pypy3-2.4.0-linux-armhf-raspbian" "https://bitbucket.org/pypy/pypy/downloads/pypy3-2.4.0-linux-armhf-raspbian.tar.bz2#ad8f00255c85bf3c1012d56d5638c7aee12bc9f1ddcdaad35985bbd65a16c602" "pypy" verify_py32 ensurepip
+  else
+    require_distro "Ubuntu 13.04" || true
+    install_package "pypy3-2.4.0-linux-armhf-raring" "https://bitbucket.org/pypy/pypy/downloads/pypy3-2.4.0-linux-armhf-raring.tar.bz2#eb41a3ee62741199aeeab818553ded460db991911609acf36e5710f491e5ac0a" "pypy" verify_py32 ensurepip
+  fi
+  ;;
+"linux64" )
+  require_distro "Ubuntu 12.04" || true
+  install_package "pypy3-2.4.0-linux64" "https://bitbucket.org/pypy/pypy/downloads/pypy3-2.4.0-linux64.tar.bz2#24e680b1742af7361107876a421dd793f5ef852dd5f097546f84b1378f7f70cc" "pypy" verify_py32 ensurepip
+  ;;
+"osx64" )
+  install_package "pypy3-2.4.0-osx64" "https://bitbucket.org/pypy/pypy/downloads/pypy3-2.4.0-osx64.tar.bz2#dcd86bdb753e93dbf55e1f3af3ffa97eea328b8b77aa60e92ea2260a6258cedb" "pypy" verify_py32 ensurepip
+  ;;
+"win32" )
+  # FIXME: never tested on Windows
+  install_zip "pypy3-2.4.0-win32" "https://bitbucket.org/pypy/pypy/downloads/pypy3-2.4.0-win32.zip#7ea499993b07405898dee9435836220d8c7b8abfa1b1f760c4a1c04b43945797" "pypy" verify_py32 ensurepip
+  ;;
+* )
+  { echo
+    colorize 1 "ERROR"
+    echo ": The binary distribution of PyPy is not available for $(pypy_architecture 2>/dev/null || true)."
+    echo "try 'pypy3-2.4.0-src' to build from soruce."
+    echo
+  } >&2
+  exit 1
+  ;;
+esac
--- a/plugins/python-build/share/python-build/pypy3-2.4.0-src
+++ b/plugins/python-build/share/python-build/pypy3-2.4.0-src
@@ -0,0 +1,2 @@
+require_gcc
+install_package "pypy3-2.4.0-src" "https://bitbucket.org/pypy/pypy/downloads/pypy3-2.4.0-src.tar.bz2#d9ba207d6eecf8a0dc4414e9f4e92db1abd143e8cc6ec4a6bdcac75b29f104f3" "pypy_builder" verify_py32 ensurepip
--- a/plugins/python-build/share/python-build/stackless-2.7-dev
+++ b/plugins/python-build/share/python-build/stackless-2.7-dev
@@ -1,3 +1,3 @@
-require_cc
+#require_gcc
 install_package "readline-6.3" "http://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43" standard --if has_broken_mac_readline
 install_hg "stackless-2.7-dev" "http://hg.python.org/stackless" "2.7-slp" standard verify_py27 ensurepip
--- a/plugins/python-build/share/python-build/stackless-2.7.2
+++ b/plugins/python-build/share/python-build/stackless-2.7.2
@@ -1,3 +1,3 @@
-require_cc
+#require_gcc
 install_package "readline-6.3" "http://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43" standard --if has_broken_mac_readline
 install_package "stackless-272-export" "http://www.stackless.com/binaries/stackless-272-export.tar.bz2#e2e2706b22839e3e3f45085d0ec8030dd7374d8a65d3297981b7189a7c613197" ldflags_dirs standard verify_py27 ensurepip
--- a/plugins/python-build/share/python-build/stackless-2.7.3
+++ b/plugins/python-build/share/python-build/stackless-2.7.3
@@ -1,3 +1,3 @@
-require_cc
+#require_gcc
 install_package "readline-6.3" "http://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43" standard --if has_broken_mac_readline
 install_package "stackless-273-export" "http://www.stackless.com/binaries/stackless-273-export.tar.bz2#77bee863bfd16dc4eca7fc078b12db608db7dd6e2481981bb68250118e001dfc" ldflags_dirs standard verify_py27 ensurepip
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Yamashita Yuu	d320d74a07	v20141211 (fixes #288 )	2014-12-11 22:39:38 +09:00
Yamashita Yuu	fc49f7e21e	Fix building _dev_ versions	2014-12-11 22:35:12 +09:00
Yamashita Yuu	be4f5992d6	Add `3.5-dev` (#287 )	2014-12-11 21:46:22 +09:00
Yamashita Yuu	25a48694be	Use `3.4` branch for `3.4-dev` (fixes #287 )	2014-12-11 21:45:37 +09:00
Yamashita, Yuu	9b7b2a6b40	Merge pull request #286 from joshfriend/ignore-bats Ignore the bats/ directory cloned by tests	2014-12-11 12:50:24 +09:00
Yamashita, Yuu	f59729359a	Merge pull request #285 from joshfriend/python-279 Add Python 2.7.9	2014-12-11 12:48:31 +09:00
Josh Friend	93ac0632c7	ignore bats/ directory cloned by tests	2014-12-10 22:20:56 -05:00
Josh Friend	7a21cf9c10	Add release version of 2.7.9 (fixes #284 )	2014-12-10 21:51:52 -05:00
Josh Friend	720dee76af	remove 2.7.9 release candidate	2014-12-10 18:16:54 -05:00
Yamashita, Yuu	db6a41c90f	Merge pull request #280 from yyuu/rbenv-7e0e85bd Import recent changes from rbenv	2014-12-01 22:53:51 +09:00
Yamashita Yuu	bfddc69120	Update Makefile. Use same path configuration as travis-ci.	2014-12-01 22:50:04 +09:00
Yamashita Yuu	acce3744e7	Add pip-rehash	2014-12-01 22:36:10 +09:00
Yamashita Yuu	5ca423c9f3	Revert a fix for #101 to fix broken tests relating to `PYENV_NATIVE_EXT`	2014-12-01 20:34:12 +09:00
Yamashita Yuu	f0e852553a	Import rbenv changes at `7e0e85bdda`	2014-12-01 00:29:26 +09:00
Yamashita Yuu	fc8597ca38	Rename build definitions of pypy nightly build	2014-11-29 17:22:39 +09:00
Yamashita Yuu	e7a68ad467	Update `require_distro` of pypy-2.4.0 on Linux x86/amd64	2014-11-29 11:21:08 +09:00
Yamashita Yuu	0fd1eaaeb5	Add pypy3-2.4.0-src (#277 )	2014-11-29 11:16:44 +09:00
Yamashita Yuu	b986f8f93f	Add PyPy nightly builds	2014-11-29 10:55:26 +09:00
Yamashita Yuu	60e1abe7fa	Add PyPy3 2.4.0 (fixes #277 )	2014-11-29 09:48:04 +09:00
Yamashita Yuu	afcf4f0c7c	Move `require_distro` out from PyPy build definitions	2014-11-29 09:11:36 +09:00
Makoto Sasaki	c0aff27842	v20141127	2014-11-27 14:58:31 +09:00
Makoto Sasaki	e172eb2818	Add CPython 2.7.9rc1 (fixes #276 )	2014-11-27 14:13:44 +09:00
Yamashita Yuu	8761ae8f7c	v20141118	2014-11-18 20:05:01 +09:00
Yamashita, Yuu	3d401ebcd2	Merge pull request #271 from s1341/master add a patch to allow building 2.6.9 on osx 10.9	2014-11-18 19:56:52 +09:00
srubenst	268f965421	add a patch to allow building 2.6.9 on osx 10.9	2014-11-14 11:51:02 +02:00
Yamashita Yuu	ff0f8a140b	Merge branch 'test-builtin-patches'	2014-11-13 21:56:27 -08:00
Yamashita Yuu	6c2d234e55	Split test files	2014-11-13 21:56:14 -08:00
Yamashita Yuu	c6dd3b9468	Add test for built-in python-build's patching feature	2014-11-13 21:53:52 -08:00
Yamashita Yuu	8fee82e456	Fix broken `setup_builtin_patches`	2014-11-12 11:03:49 -08:00
Yamashita Yuu	7220044b49	v20141106	2014-11-06 09:41:22 -08:00
Daniel Hahler	a797bb6d88	Fix "pyenv: version 'system' is not installed" with `pyenv which` This is a follow-up to `de5c61c`.	2014-11-06 17:57:17 +01:00
Yamashita Yuu	665f9d9466	Merge branch 'use-https' (fixes #262 )	2014-11-05 09:25:36 -08:00
Eric Mill	cb260fb9d0	fix another failing test with https URL	2014-11-05 09:23:06 -08:00
Eric Mill	4f0439cd12	fix one failing test, around mirror URL	2014-11-05 09:22:59 -08:00
Eric Mill	2e387816f1	use https for download URLs Conflicts: plugins/python-build/bin/python-build	2014-11-05 09:22:52 -08:00
Yamashita Yuu	ee4182321e	Update python versions in README	2014-11-05 09:17:05 -08:00
Yamashita, Yuu	661a2b29d3	Merge pull request #236 from blueyed/doc-mention-pyenv-pip-rehash README: mention https://github.com/yyuu/pyenv-pip-rehash	2014-11-05 09:14:35 -08:00
Yamashita, Yuu	8c503c6e75	Merge pull request #237 from blueyed/doc-recent-python-versions doc: use recommended python versions	2014-11-05 09:13:55 -08:00
Yamashita, Yuu	743a637b59	Merge pull request #265 from yyuu/ruby-build-v20141028 Import changes from ruby-build v20141028	2014-11-04 21:15:26 -08:00
Yamashita, Yuu	7fe78245d8	Merge pull request #266 from konstantint/patch-1 Warn about #264 in the README	2014-11-04 09:28:20 -08:00
Konstantin Tretyakov	96c0362b53	Warn about #264 in the README	2014-11-04 18:54:19 +02:00
Yamashita Yuu	2dae281201	Need to chdir before running tests of `python-build`	2014-11-04 00:14:57 -08:00
Yamashita Yuu	4a52bfaff9	Fix broken tests	2014-11-04 00:04:25 -08:00
Yamashita Yuu	b26b83a11f	Import changes from ruby-build v20141028	2014-10-29 04:04:10 -07:00
Yamashita, Yuu	35aed218cf	Merge pull request #260 from jensraaby/anaconda210 Add Miniconda/Miniconda3 3.7.0 and Anaconda/Anaconda3 2.1.0	2014-10-24 08:16:37 +09:00
Jens Raaby	38ab616344	Add Miniconda/Miniconda3 3.7.0 and Anaconda/Anaconda3 2.1.0 SHA256 values generated with direct downloads from repo.continuum.io	2014-10-23 19:25:41 +01:00
Yamashita Yuu	720870011b	Merge branch 'altinstall' (fixes #255 ) Allow installing CPython with `make altinstall` instead of `make install` with following command-line. ```sh $ env PYTHON_MAKE_INSTALL_PACKAGE="altinstall" pyenv install -v 3.4.2 ```	2014-10-19 11:19:17 +09:00
Yamashita Yuu	b2ac5df98d	Calling `create_symlinks` after `ensurepip` is unnecessary (#182 , #255 ) Install script of setuptools-6.1/pip-1.5.6 will create those links if needed	2014-10-19 10:59:35 +09:00
Yamashita Yuu	d9e772eb6e	Stop creating symlinks w/ version suffix if `altinstall` has specified (#182 , #255 )	2014-10-19 00:34:20 +09:00
Yamashita Yuu	eef8ac2701	Use version suffixed executable (e.g. `python3.4`) for internal use of python (#255 )	2014-10-19 00:28:33 +09:00
Yamashita Yuu	45b45bcf25	Pass `--altinstall` to `ensurepip` (#255 )	2014-10-18 23:56:51 +09:00
Yamashita Yuu	ded98e11de	Allow users to change the name of `install` target (#255 )	2014-10-18 23:06:19 +09:00
Yamashita, Yuu	dc1b5a197f	Merge pull request #254 from blueyed/add-Makefile Add Makefile for 'make test'	2014-10-18 09:30:22 +09:00
Daniel Hahler	79507fbadf	Add Makefile for 'make test'	2014-10-16 03:13:39 +02:00
Daniel Hahler	de5c61cd59	Fix "version X is not installed" with multiple PYENV_VERSIONs This was introduced when merging the rbenv upstream change (https://github.com/sstephenson/rbenv/commit/6bb7f07d2d).	2014-10-16 02:51:07 +02:00
Yamashita Yuu	8e657374a1	Import recent changes from rbenv-versions	2014-10-15 00:46:11 +09:00
Yamashita, Yuu	77bd5bc6c9	Merge pull request #129 from blueyed/optimize-pyenv-which Optimize pyenv-which: implement remove_from_path in Bash	2014-10-15 00:19:28 +09:00
Daniel Hahler	e82f943174	Merge rbenv's "Isolate rbenv-which tests …" (`c69d9a11`) This is the remaining part of `c69d9a1128`. commit `c69d9a1128` Author: Mislav Marohnić <mislav.marohnic@gmail.com> Date: Mon Oct 13 12:39:47 2014 +0200 Isolate rbenv-which tests from any `.ruby-version` file on the system Having a `.ruby-version` file in any of the parent directories of the local clone of rbenv could cause the test suite to fail because it wasn't expecting a local version to be set.	2014-10-13 21:20:57 +02:00
Daniel Hahler	bbf8cb4a95	Add test for PYENV_VERSION=3.4:2.7	2014-10-13 21:15:22 +02:00
Daniel Hahler	a1df551bcf	Merge tests and remove_from_path from rbenv This adds the missing parts from the upstream rbenv merge: `f4652fbbf0` - `e4cbf04592` - `3ee395f9b5`	2014-10-13 21:14:57 +02:00
Yamashita Yuu	fc41c87395	Check existence of `curses` module before start building PyPy (#244 )	2014-10-13 02:29:55 +09:00
Yamashita Yuu	6e02ad2fe4	Merge branch 'pypy-shared'	2014-10-12 21:58:08 +09:00
Yamashita Yuu	58e24a64a2	Set PYENV_VERSION on building pypy from source	2014-10-12 21:57:21 +09:00
Makoto Sasaki	77d9e34a49	v20141012	2014-10-12 21:48:56 +09:00
Makoto Sasaki	d7f4aa02ed	Add CPython 3.2.6 and CPython 3.3.6 (fixes #253 )	2014-10-12 20:41:49 +09:00
Yamashita Yuu	42bb40a5d8	Try to set `rpath` for `--shared` build of PyPy (#244 )	2014-10-12 20:19:37 +09:00
Makoto Sasaki	d38f00cd4a	v20141011	2014-10-11 20:00:54 +09:00
Makoto Sasaki	e9a6a2909c	Add Stackless 2.7.7, Stackless 2.7.8, and Stackless 3.4.1 (fixes #252 )	2014-10-11 18:06:23 +09:00
Makoto Sasaki	5f95ce1835	Fix build problem of Stackless 3.3.5 (refs #250 )	2014-10-10 04:22:47 +09:00
Daniel Hahler	04ce9bcd5c	doc: use recommended python versions	2014-09-11 12:56:56 +02:00
Daniel Hahler	4cf93df059	README: mention https://github.com/yyuu/pyenv-pip-rehash	2014-09-11 12:55:39 +02:00
Daniel Hahler	44c20af80e	Optimize pyenv-which: implement remove_from_path in Bash This greatly improves the performance of `pyenv virtualenvwrapper_lazy`, which happens to call pyenv-which a lot. For profiling I've initially used: % zmodload zsh/zprof % eval "$(pyenv init -)" % pyenv virtualenvwrapper_lazy Before: % zprof\|grep -E '(pyenv\|virtualenv)' 1) 1 754,07 754,07 58,95% 751,50 751,50 58,75% pyenv 21) 1 2,57 2,57 0,20% 2,57 2,57 0,20% virtualenvwrapper_setup_lazy_loader 1) 1 754,07 754,07 58,95% 751,50 751,50 58,75% pyenv 1/1 2,57 2,57 0,20% 2,57 2,57 virtualenvwrapper_setup_lazy_loader [21] 1/1 2,57 2,57 0,20% 2,57 2,57 pyenv [1] 21) 1 2,57 2,57 0,20% 2,57 2,57 0,20% virtualenvwrapper_setup_lazy_loader After: % zprof\|grep -E '(pyenv\|virtualenv)' 1) 1 383,30 383,30 27,97% 380,88 380,88 27,79% pyenv 31) 1 2,42 2,42 0,18% 2,42 2,42 0,18% virtualenvwrapper_setup_lazy_loader 1) 1 383,30 383,30 27,97% 380,88 380,88 27,79% pyenv 1/1 2,42 2,42 0,18% 2,42 2,42 virtualenvwrapper_setup_lazy_loader [31] 1/1 2,42 2,42 0,18% 2,42 2,42 pyenv [1] 31) 1 2,42 2,42 0,18% 2,42 2,42 0,18% virtualenvwrapper_setup_lazy_loader Fixes https://github.com/yyuu/pyenv-virtualenvwrapper/issues/13	2014-03-13 19:21:32 +01:00