v0.4.0-20140110

Should not recognize cc as clang
Use same require_gcc as ruby-build
2025-11-15 06:43:53 -05:00 · 2014-01-10 11:27:43 +09:00 · 2014-01-09 18:18:50 +09:00 · 2014-01-08 22:34:10 +09:00 · 2014-01-08 21:47:36 +09:00 · 2014-01-08 21:44:19 +09:00
137 changed files with 2131 additions and 574 deletions
--- a/.travis.yml
+++ b/.travis.yml
@@ -0,0 +1,4 @@
+install: git clone https://github.com/sstephenson/bats.git
+script: bats/bin/bats --tap test
+# skips unnecessary Python-specific setup
+language: c
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,25 @@
 ## Version History

+#### 0.4.0-20140110
+
+* pyenv: Reliably detect parent shell in `pyenv init` (#93)
+* pyenv: Import recent changes from rbenv 0.4.0
+* pyenv: Import `bats` tests from rbenv 0.4.0
+* python-build: Add new CPython releases candidates; 3.4.0b2
+* python-build: Add ruby-build style patching feature (#91)
+* python-build: Set `RPATH` if `--enable-shared` was given (#65, #66, 82)
+* python-build: Update default setuptools version (2.0 -> 2.1)
+* python-build: Update default pip version (1.4.1 -> 1.5)
+* python-build: Activate friendly CPython during build if the one is not activated (8fa6b4a1847851919ad7857c6c42ed809a4d277b)
+* python-build: Fix broken install.sh
+* python-build: Import recent changes from ruby-build v20131225.1
+* version-ext-compat: Removed from default plugin. Please use [pyenv-version-ext](https://github.com/yyuu/pyenv-version-ext) instead.
+
+#### 0.4.0-20131217
+
+* python-build: Fix broken build of CPython 3.3+ on Darwin
+* python-build: Not build GNU Readline uselessly on Darwin
+
 #### 0.4.0-20131216

 * python-build: Add new CPython releases; 3.3.3 (#80)
--- a/README.md
+++ b/README.md
@@ -1,5 +1,7 @@
 # Simple Python Version Management: pyenv

+[![Build Status](https://travis-ci.org/yyuu/pyenv.png)](https://travis-ci.org/yyuu/pyenv)
+
 pyenv lets you easily switch between multiple versions of Python. It's
 simple, unobtrusive, and follows the UNIX tradition of single-purpose
 tools that do one thing well.
--- a/libexec/pyenv
+++ b/libexec/pyenv
@@ -1,9 +1,25 @@
 #!/usr/bin/env bash
 set -e
-[ -n "$PYENV_DEBUG" ] && set -x
+export -n CDPATH
+
+if [ "$1" = "--debug" ]; then
+  export PYENV_DEBUG=1
+  shift
+fi
+
+if [ -n "$PYENV_DEBUG" ]; then
+  export PS4='+ [${BASH_SOURCE##*/}:${LINENO}] '
+  set -x
+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() {
-  $(type -p greadlink readlink | head -1) "$1"
+  $READLINK "$1"
 }

 abs_dirname() {
--- a/libexec/pyenv---version
+++ b/libexec/pyenv---version
@@ -12,10 +12,11 @@
 set -e
 [ -n "$PYENV_DEBUG" ] && set -x

-version="0.4.0-20131216"
+version="0.4.0-20140110"

-cd "$PYENV_ROOT"
-git_revision="$(git describe --tags HEAD 2>/dev/null || true)"
-git_revision="${git_revision#v}"
+if cd "$PYENV_ROOT" 2>/dev/null; then
+  git_revision="$(git describe --tags HEAD 2>/dev/null || true)"
+  git_revision="${git_revision#v}"
+fi

 echo "pyenv ${git_revision:-$version}"
--- a/libexec/pyenv-completions
+++ b/libexec/pyenv-completions
@@ -11,7 +11,7 @@ if [ -z "$COMMAND" ]; then
 fi

 COMMAND_PATH="$(command -v "pyenv-$COMMAND" || command -v "pyenv-sh-$COMMAND")"
-if grep -i "^\([#%]\|--\|//\) provide pyenv completions" "$COMMAND_PATH" >/dev/null; then
+if grep -iE "^([#%]|--|//) provide pyenv completions" "$COMMAND_PATH" >/dev/null; then
  shift
  exec "$COMMAND_PATH" --complete "$@"
 fi
--- a/libexec/pyenv-exec
+++ b/libexec/pyenv-exec
@@ -7,11 +7,11 @@
 # Runs an executable by first preparing PATH so that the selected Python
 # version's `bin' directory is at the front.
 #
-# For example, if the currently selected Python version is 2.7.7:
+# For example, if the currently selected Python version is 2.7.6:
 #   pyenv exec pip install -rrequirements.txt
 #
 # is equivalent to:
-#   PATH="$PYENV_ROOT/versions/2.7.7/bin:$PATH" pip install -rrequirements.txt
+#   PATH="$PYENV_ROOT/versions/2.7.6/bin:$PATH" pip install -rrequirements.txt

 set -e
 [ -n "$PYENV_DEBUG" ] && set -x
@@ -21,7 +21,7 @@ if [ "$1" = "--complete" ]; then
  exec pyenv shims --short
 fi

-export PYENV_VERSION="$(pyenv-version-name)"
+PYENV_VERSION="$(pyenv-version-name)"
 PYENV_COMMAND="$1"

 if [ -z "$PYENV_COMMAND" ]; then
@@ -29,10 +29,14 @@ if [ -z "$PYENV_COMMAND" ]; then
  exit 1
 fi

+export PYENV_VERSION
 PYENV_COMMAND_PATH="$(pyenv-which "$PYENV_COMMAND")"
 PYENV_BIN_PATH="${PYENV_COMMAND_PATH%/*}"

-for script in $(pyenv-hooks exec); do
+OLDIFS="$IFS"
+IFS=$'\n' scripts=(`pyenv-hooks exec`)
+IFS="$OLDIFS"
+for script in "${scripts[@]}"; do
  source "$script"
 done

--- a/libexec/pyenv-hooks
+++ b/libexec/pyenv-hooks
@@ -19,13 +19,18 @@ if [ -z "$PYENV_COMMAND" ]; then
  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
+
 resolve_link() {
-  $(type -p greadlink readlink | head -1) $1
+  $READLINK "$1"
 }

 realpath() {
  local cwd="$(pwd)"
-  local base="$(basename $1)"
  local path="$1"

  while [ -n "$path" ]; do
@@ -34,13 +39,15 @@ realpath() {
    path="$(resolve_link "$name" || true)"
  done

-  echo "$(pwd)/$base"
+  echo "$(pwd)/$name"
  cd "$cwd"
 }

+IFS=: hook_paths=($PYENV_HOOK_PATH)
+
 shopt -s nullglob
-for path in ${PYENV_HOOK_PATH//:/$'\n'}; do
-  for script in $path/"$PYENV_COMMAND"/*.bash; do
+for path in "${hook_paths[@]}"; do
+  for script in "$path/$PYENV_COMMAND"/*.bash; do
    echo $(realpath $script)
  done
 done
--- a/libexec/pyenv-init
+++ b/libexec/pyenv-init
@@ -22,7 +22,10 @@ done

 shell="$1"
 if [ -z "$shell" ]; then
-  shell="$(basename "$SHELL")"
+  shell="$(ps c -p "$PPID" -o 'ucomm=' 2>/dev/null || true)"
+  shell="${shell##-}"
+  shell="${shell%% *}"
+  shell="$(basename "${shell:-$SHELL}")"
 fi

 READLINK=$(type -p greadlink readlink | head -1)
@@ -75,7 +78,7 @@ if [ -z "$print" ]; then
    echo
    case "$shell" in
    fish )
-      echo '. (pyenv init -|psub)'
+      echo 'status --is-interactive; and . (pyenv init -|psub)'
      ;;
    * )
      echo 'eval "$(pyenv init -)"'
@@ -100,8 +103,22 @@ if [[ ":${PATH}:" != *:"${PYENV_ROOT}/shims":* ]]; then
  esac
 fi

+case "$shell" in
+fish )
+  echo "setenv PYENV_SHELL $shell"
+;;
+* )
+  echo "export PYENV_SHELL=$shell"
+;;
+esac
+
 completion="${root}/completions/pyenv.${shell}"
-[ -r "$completion" ] && echo ". '$completion'"
+if [ -r "$completion" ]; then
+  case "$shell" in
+  fish ) echo ". '$completion'" ;;
+  *    ) echo "source '$completion'" ;;
+  esac
+fi

 if [ -z "$no_rehash" ]; then
  echo 'pyenv rehash 2>/dev/null'
--- a/libexec/pyenv-local
+++ b/libexec/pyenv-local
@@ -38,13 +38,14 @@ versions=($@)
 if [ "$versions" = "--unset" ]; then
  rm -f .python-version .pyenv-version
 elif [ -n "$versions" ]; then
-  if [ "$(PYENV_VERSION= pyenv-version-origin)" -ef .pyenv-version ]; then
+  previous_file="$(PYENV_VERSION= pyenv-version-origin || true)"
+  pyenv-version-file-write .python-version "${versions[@]}"
+  if [ "$previous_file" -ef .pyenv-version ]; then
    rm -f .pyenv-version
    { echo "pyenv: removed existing \`.pyenv-version' file and migrated"
      echo "       local version specification to \`.python-version' file"
    } >&2
  fi
-  pyenv-version-file-write .python-version "${versions[@]}"
 else
  OLDIFS="$IFS"
  IFS=: versions=($(
--- a/libexec/pyenv-prefix
+++ b/libexec/pyenv-prefix
@@ -16,32 +16,38 @@ if [ "$1" = "--complete" ]; then
 fi

 if [ -n "$1" ]; then
-  versions=($@)
  OLDIFS="$IFS"
-  IFS=: PYENV_VERSION="${versions[*]}"
-  IFS="$OLDIFS"
-  export PYENV_VERSION
-else
-  OLDIFS="$IFS"
-  IFS=: versions=($(pyenv-version-name))
+  { IFS=:
+    export PYENV_VERSION="$*"
+  }
  IFS="$OLDIFS"
+elif [ -z "$PYENV_VERSION" ]; then
+  PYENV_VERSION="$(pyenv-version-name)"
 fi

 PYENV_PREFIX_PATHS=()
-for version in "${versions[@]}"; do
-  if [ "$version" = "system" ]; then
-    PYTHON_PATH="$(PYENV_VERSION="${version}" pyenv-which python || true)"
-    PYENV_PREFIX_PATH="${PYTHON_PATH%/bin/*}"
-  else
-    PYENV_PREFIX_PATH="${PYENV_ROOT}/versions/${version}"
-  fi
-  if [ -d "$PYENV_PREFIX_PATH" ]; then
-    PYENV_PREFIX_PATHS=("${PYENV_PREFIX_PATHS[@]}" "$PYENV_PREFIX_PATH")
-  else
-    echo "pyenv: version \`${version}' not installed" >&2
-    exit 1
-  fi
-done
+OLDIFS="$IFS"
+{ IFS=:
+  for version in ${PYENV_VERSION}; do
+    if [ "$version" = "system" ]; then
+      if PYTHON_PATH="$(pyenv-which python 2>/dev/null)"; then
+        PYENV_PREFIX_PATH="${PYTHON_PATH%/bin/*}"
+      else
+        echo "pyenv: system version not found in PATH" >&2
+        exit 1
+      fi
+    else
+      PYENV_PREFIX_PATH="${PYENV_ROOT}/versions/${version}"
+    fi
+    if [ -d "$PYENV_PREFIX_PATH" ]; then
+      PYENV_PREFIX_PATHS=("${PYENV_PREFIX_PATHS[@]}" "$PYENV_PREFIX_PATH")
+    else
+      echo "pyenv: version \`${version}' not installed" >&2
+      exit 1
+    fi
+  done
+}
+IFS="$OLDIFS"

 OLDIFS="$IFS"
 { IFS=:
--- a/libexec/pyenv-rehash
+++ b/libexec/pyenv-rehash
@@ -17,7 +17,11 @@ mkdir -p "$SHIM_PATH"
 set -o noclobber
 { echo > "$PROTOTYPE_SHIM_PATH"
 } 2>/dev/null ||
-{ echo "pyenv: cannot rehash: $PROTOTYPE_SHIM_PATH exists"
+{ if [ -w "$SHIM_PATH" ]; then
+    echo "pyenv: cannot rehash: $PROTOTYPE_SHIM_PATH exists"
+  else
+    echo "pyenv: cannot rehash: $SHIM_PATH isn't writable"
+  fi
  exit 1
 } >&2
 set +o noclobber
@@ -78,9 +82,9 @@ remove_outdated_shims() {
 # 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="$@"
+  local shims=("$@")

-  for file in $shims; do
+  for file in "${shims[@]}"; do
    local shim="${file##*/}"
    register_shim "$shim"
  done
@@ -92,7 +96,7 @@ registered_shims=()
 registered_shims_index=""

 # We will keep track of shims registered for installation with the
-# global `reigstered_shims` array and with a global search index
+# 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.
@@ -140,7 +144,11 @@ make_shims ../versions/*/bin/*
 cd "$OLDPWD"

 # Allow plugins to register shims.
-for script in $(pyenv-hooks rehash); do
+OLDIFS="$IFS"
+IFS=$'\n' scripts=(`pyenv-hooks rehash`)
+IFS="$OLDIFS"
+
+for script in "${scripts[@]}"; do
  source "$script"
 done

--- a/libexec/pyenv-sh-rehash
+++ b/libexec/pyenv-sh-rehash
@@ -7,7 +7,7 @@ if [ "$1" = "--complete" ]; then
  exec pyenv-rehash --complete
 fi

-shell="$(basename "$SHELL")"
+shell="$(basename "${PYENV_SHELL:-$SHELL}")"

 # When pyenv shell integration is enabled, delegate to pyenv-rehash,
 # then tell the shell to empty its command lookup cache.
@@ -15,11 +15,9 @@ pyenv-rehash

 case "$shell" in
 fish )
-  or='; or'
+  # no rehash support
  ;;
 * )
-  or='||'
+  echo "hash -r 2>/dev/null || true"
  ;;
 esac
-
-echo "hash -r 2>/dev/null $or true"
--- a/libexec/pyenv-sh-shell
+++ b/libexec/pyenv-sh-shell
@@ -24,7 +24,7 @@ if [ "$1" = "--complete" ]; then
 fi

 versions=("$@")
-shell="$(basename "$SHELL")"
+shell="$(basename "${PYENV_SHELL:-$SHELL}")"

 if [ -z "$versions" ]; then
  if [ -z "$PYENV_VERSION" ]; then
@@ -51,14 +51,14 @@ fi
 # Make sure the specified version is installed.
 if pyenv-prefix "${versions[@]}" >/dev/null; then
  OLDIFS="$IFS"
-  IFS=: PYENV_VERSION="${versions[*]}"
+  IFS=: version="${versions[*]}"
  IFS="$OLDIFS"
  case "$shell" in
  fish )
-    echo "setenv PYENV_VERSION \"${PYENV_VERSION}\""
+    echo "setenv PYENV_VERSION \"${version}\""
    ;;
  * )
-    echo "export PYENV_VERSION=\"${PYENV_VERSION}\""
+    echo "export PYENV_VERSION=\"${version}\""
    ;;
  esac
 else
--- a/libexec/pyenv-shims
+++ b/libexec/pyenv-shims
@@ -11,6 +11,8 @@ if [ "$1" = "--complete" ]; then
  exit
 fi

+shopt -s nullglob
+
 for command in "${PYENV_ROOT}/shims/"*; do
  if [ "$1" = "--short" ]; then
    echo "${command##*/}"
--- a/libexec/pyenv-version-file
+++ b/libexec/pyenv-version-file
@@ -13,6 +13,7 @@ find_local_version_file() {
      echo "${root}/.pyenv-version"
      exit
    fi
+    [ "${root}" = "${root%/*}" ] && break
    root="${root%/*}"
  done
 }
--- a/libexec/pyenv-version-file-read
+++ b/libexec/pyenv-version-file-read
@@ -8,14 +8,8 @@ VERSION_FILE="$1"
 if [ -e "$VERSION_FILE" ]; then
  # Read the first non-whitespace word from the specified version file.
  # Be careful not to load it whole in case there's something crazy in it.
-  versions=()
-  while read -a words; do
-    word="${words[0]}"
-    if [ -n "$word" ]; then
-      length="${#versions[@]}"
-      versions=("${versions[@]}" "$word")
-    fi
-  done < <( cat "$VERSION_FILE" && echo )
+  words=( $(cut -b 1-1024 "$VERSION_FILE") )
+  versions=("${words[@]}")

  if [ -n "$versions" ]; then
    OLDIFS="$IFS"
--- a/libexec/pyenv-version-file-write
+++ b/libexec/pyenv-version-file-write
@@ -5,7 +5,7 @@ set -e
 [ -n "$PYENV_DEBUG" ] && set -x

 PYENV_VERSION_FILE="$1"
-shift
+shift || true
 versions=("$@")

 if [ -z "$versions" ] || [ -z "$PYENV_VERSION_FILE" ]; then
--- a/libexec/pyenv-version-name
+++ b/libexec/pyenv-version-name
@@ -3,20 +3,12 @@
 set -e
 [ -n "$PYENV_DEBUG" ] && set -x

-if [ -n "$PYENV_VERSION" ]; then
-  OLDIFS="$IFS"
-  IFS=: versions=($(echo "${PYENV_VERSION}"))
-  IFS="$IFS"
-else
+if [ -z "$PYENV_VERSION" ]; then
  PYENV_VERSION_FILE="$(pyenv-version-file)"
-  OLDIFS="$IFS"
-  IFS=: versions=($(pyenv-version-file-read "$PYENV_VERSION_FILE" || true))
-  IFS=: PYENV_VERSION="${versions[*]}"
-  IFS="$OLDIFS"
-  export PYENV_VERSION
+  PYENV_VERSION="$(pyenv-version-file-read "$PYENV_VERSION_FILE" || true)"
 fi

-if [ -z "$versions" ]; then
+if [ -z "$PYENV_VERSION" ] || [ "$PYENV_VERSION" = "system" ]; then
  echo "system"
  exit
 fi
@@ -26,11 +18,27 @@ version_exists() {
  [ -d "${PYENV_ROOT}/versions/${version}" ]
 }

-for version in "${versions[@]}"; do
-  if [ "$version" != "system" ] && ! version_exists "$version"; then
-    echo "pyenv: version \`$version' is not installed" >&2
-    exit 1
-  fi
-done
+versions=()
+OLDIFS="$IFS"
+{ IFS=:
+  for version in ${PYENV_VERSION}; do
+    if version_exists "$version" || [ "$version" = "system" ]; then
+      versions=("${versions[@]}" "${version}")
+    elif version_exists "${version#python-}"; then
+      { echo "warning: ignoring extraneous \`python-' prefix in version \`${version}'"
+        echo "         (set by $(pyenv-version-origin))"
+      } >&2
+      versions=("${versions[@]}" "${version#python-}")
+    else
+      echo "pyenv: version \`$version' is not installed" >&2
+      exit 1
+    fi
+  done
+}
+IFS="$OLDIFS"

-echo "${PYENV_VERSION}"
+OLDIFS="$IFS"
+{ IFS=:
+  echo "${versions[*]}"
+}
+IFS="$OLDIFS"
--- a/libexec/pyenv-versions
+++ b/libexec/pyenv-versions
@@ -34,9 +34,9 @@ array_exists() {

 print_version() {
  if array_exists "$1" "${current_versions[@]}"; then
-    echo "${hit_prefix}${1}${version_origin}"
+    echo "${hit_prefix}$1${version_origin}"
  else
-    echo "${miss_prefix}${1}"
+    echo "${miss_prefix}$1"
  fi
 }

--- a/libexec/pyenv-which
+++ b/libexec/pyenv-which
@@ -36,9 +36,7 @@ remove_from_path() {
  fi

  local paths
-  OLDIFS="$IFS"
  IFS=: paths=($PATH)
-  IFS="$OLDIFS"

  for path in "${paths[@]}"; do
    path="$(expand_path "$path" || true)"
@@ -73,7 +71,10 @@ for version in "${versions[@]}"; do
  fi
 done

-for script in $(pyenv-hooks which); do
+OLDIFS="$IFS"
+IFS=$'\n' scripts=(`pyenv-hooks which`)
+IFS="$OLDIFS"
+for script in "${scripts[@]}"; do
  source "$script"
 done

--- a/plugins/python-build/bin/pyenv-install
+++ b/plugins/python-build/bin/pyenv-install
@@ -1,17 +1,21 @@
 #!/usr/bin/env bash
 #
-# Summary: Install a Python version using the python-build plugin
+# Summary: Install a Python version using python-build
 #
-# Usage: pyenv install [-f|--force] [-g|--debug] [-k|--keep] [-v|--verbose] <version>
-#        pyenv install [-f|--force] [-g|--debug] [-k|--keep] [-v|--verbose] <definition-file>
+# Usage: pyenv install [-f] [-kvp] <version>
+#        pyenv install [-f] [-kvp] <definition-file>
 #        pyenv install -l|--list
 #
 #   -l/--list        List all available versions
 #   -f/--force       Install even if the version appears to be installed already
+#
+#   python-build options:
+#
 #   -k/--keep        Keep source tree in $PYENV_BUILD_ROOT after installation
 #                    (defaults to $PYENV_ROOT/sources)
-#   -g/--debug       Build a debug version
 #   -v/--verbose     Verbose mode: print compilation status to stdout
+#   -p/--patch       Apply a patch from stdin before building
+#   -g/--debug       Build a debug version
 #
 # For detailed information on installing Python versions with
 # python-build, including a list of environment variables for adjusting
@@ -50,6 +54,7 @@ indent() {
 unset FORCE
 unset KEEP
 unset VERBOSE
+unset HAS_PATCH
 unset DEBUG

 parse_options "$@"
@@ -72,6 +77,9 @@ for option in "${OPTIONS[@]}"; do
  "v" | "verbose" )
    VERBOSE="-v"
    ;;
+  "p" | "patch" )
+    HAS_PATCH="-p"
+    ;;
  "g" | "debug" )
    DEBUG="-g"
    ;;
@@ -148,11 +156,13 @@ if [ -z "${PYTHON_BUILD_CACHE_PATH}" ] && [ -d "${PYENV_ROOT}/cache" ]; then
  export PYTHON_BUILD_CACHE_PATH="${PYENV_ROOT}/cache"
 fi

-# Default PYENV_VERSION to the globally-specified Python version. (The
+# Default PYENV_VERSION to the friendly Python version. (The
 # CPython installer requires an existing Python installation to run. An
-# unsatisfied local .python-version file can cause the installer to
+# unsatisfied local python version can cause the installer to
 # fail.)
-#export PYENV_VERSION="$(pyenv global 2>/dev/null || true)"
+if [[ "${VERSION_NAME}" == [23]"."* ]]; then
+  export PYENV_VERSION="$(pyenv-whence "python${VERSION_NAME%%.${VERSION_NAME##*.}}" 2>/dev/null | tail -1 || true)"
+fi


 # Execute `before_install` hooks.
@@ -167,7 +177,7 @@ trap cleanup SIGINT

 # Invoke `python-build` and record the exit status in $STATUS.
 STATUS=0
-python-build $KEEP $VERBOSE $DEBUG "$DEFINITION" "$PREFIX" || STATUS="$?"
+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
--- 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="20131211"
+PYTHON_BUILD_VERSION="20131225.1"

 set -E
 exec 3<&2 # preserve original stderr at fd 3
@@ -160,31 +160,12 @@ install_package_using() {
  } >&2
 }

-apply_patches() {
-  local package_name="$1"
-  local patches_path="${PYTHON_BUILD_ROOT}/share/python-build/patches/${DEFINITION_PATH##*/}"
-
-  # Support PYTHON_PATCH_STRIP, etc.
-  local package_var_name="$(capitalize "${package_name%%-*}")"
-  local PACKAGE_PATCH_STRIP="${package_var_name}_PATCH_STRIP"
-
-  for patch in "${patches_path}/${package_name}/"*; do
-    if [ -f "$patch" ]; then
-      {
-        echo "Applying ${patch##*/} to ${package_name}..."
-        patch "-p${!PACKAGE_PATCH_STRIP:-0}" < "$patch"
-      } >&4 2>&1
-    fi
-  done
-}
-
 make_package() {
  local package_name="$1"
  shift

  pushd "$package_name" >&4
  before_install_package "$package_name"
-  apply_patches "$package_name"
  build_package "$package_name" $*
  after_install_package "$package_name"
  fix_directory_permissions
@@ -281,16 +262,14 @@ fetch_tarball() {
  local tar_args="xzvf"
  local package_filename="${package_name}.tar.gz"

-  local package_suffix extract_option
-  case "${package_url}" in
-  *".tgz" )
-    package_filename="${package_name}.tgz"
-  ;;
-  *".tar.bz2" )
-    package_filename="${package_name}.tar.bz2"
+  if [ "$package_url" != "${package_url%tgz}" ]; then
+    package_filename="${package_filename%tar.gz}tgz"
+  fi
+
+  if [ "$package_url" != "${package_url%bz2}" ]; then
+    package_filename="${package_filename%.gz}.bz2"
    tar_args="${tar_args/z/j}"
-  ;;
-  esac
+  fi

  if ! symlink_tarball_from_cache "$package_filename" "$checksum"; then
    echo "Downloading ${package_filename}..." >&2
@@ -501,6 +480,8 @@ build_package() {

  echo "Installing ${package_name}..." >&2

+  [ -n "$HAS_PATCH" ] && apply_python_patch "$package_name"
+
  for command in $commands; do
    "build_package_${command}" "$package_name"
  done
@@ -651,6 +632,7 @@ build_package_jruby() {
  ln -fs jruby ruby
  install_jruby_launcher
  remove_windows_files
+  fix_jruby_shebangs
 }

 install_jruby_launcher() {
@@ -659,6 +641,15 @@ install_jruby_launcher() {
  } >&4 2>&1
 }

+fix_jruby_shebangs() {
+  for file in "${PREFIX_PATH}/bin"/*; do
+    if [ "$(head -c 20 "$file")" = "#!/usr/bin/env jruby" ]; then
+      sed -i.bak -E "1s:.+:#\!${PREFIX_PATH}/bin/jruby:" "$file"
+      rm "$file".bak
+    fi
+  done
+}
+
 remove_windows_files() {
  cd "$PREFIX_PATH"
  rm -f bin/*.exe bin/*.dll bin/*.bat bin/jruby.sh
@@ -708,10 +699,32 @@ build_package_copy() {

 before_install_package() {
  local stub=1
+  before_install_package_patch "$@"
+}
+
+before_install_package_patch() {
+  local package_name="$1"
+  local package_patch_path="${PYTHON_BUILD_ROOT}/share/python-build/patches/${DEFINITION_PATH##*/}/${package_name}"
+
+  ORIG_HAS_PATCH="$HAS_PATCH"
+# Apply built-in patches if patch was not given from stdin
+  if [ -z "$HAS_PATCH" ] && [ -d "${package_patch_path}" ]; then
+    ( cat "${package_patch_path}"/* || true ) 2>/dev/null 1>"${package_name}.patch"
+    exec <&-
+    exec <"${package_name}.patch"
+    HAS_PATCH=true
+  fi
 }

 after_install_package() {
  local stub=1
+  after_install_package_patch "$@"
+}
+
+after_install_package_patch() {
+  local package_name="$1"
+  rm -f "${package_name}.patch"
+  HAS_PATCH="$ORIG_HAS_PATCH"
 }

 fix_directory_permissions() {
@@ -745,53 +758,56 @@ fix_rbx_irb() {
 }

 require_gcc() {
-  require_cc "gcc"
-}
+  local gcc="$(locate_gcc || true)"

-require_cc() {
-  while [ -n "$1" ]; do
-    if [ "$1" = "--if" ]; then
-      "$2" || return 0
-      shift 2
-    else
-      break
-    fi
-  done
-
-  local cc
-  local ccname="${1:-cc}"
-  cc="$(locate_cc "$ccname" || true)"
-
-  if [ -z "$cc" ]; then
+  if [ -z "$gcc" ]; then
    local esc=$'\033'
    { echo
-      echo "${esc}[1mERROR${esc}[0m: This package must be compiled with $ccname, but python-build couldn't"
-      echo "find a suitable \`$ccname\` executable on your system. Please install $ccname"
+      echo "${esc}[1mERROR${esc}[0m: This package must be compiled with GCC, but python-build couldn't"
+      echo "find a suitable \`gcc\` executable on your system. Please install GCC"
      echo "and try again."
      echo
+
+      if [ "$(uname -s)" = "Darwin" ]; then
+        echo "${esc}[1mDETAILS${esc}[0m: Apple no longer includes the official GCC compiler with Xcode"
+        echo "as of version 4.2. Instead, the \`gcc\` executable is a symlink to"
+        echo "\`llvm-gcc\`, a modified version of GCC which outputs LLVM bytecode."
+        echo
+        echo "For most programs the \`llvm-gcc\` compiler works fine. However,"
+        echo "versions of CPython newer than 3.3.0 are incompatible with"
+        echo "\`llvm-gcc\`. To build newer versions of CPython you must have the official"
+        echo "GCC compiler installed on your system."
+        echo
+
+        if type brew &>/dev/null; then
+          echo "${esc}[1mTO FIX THE PROBLEM${esc}[0m: Install Homebrew's apple-gcc42 package with this"
+          echo "command: ${esc}[4mbrew tap homebrew/dupes ; brew install apple-gcc42${esc}[0m"
+        else
+          echo "${esc}[1mTO FIX THE PROBLEM${esc}[0m: Install the official GCC compiler using these"
+          echo "packages: ${esc}[4mhttps://github.com/kennethreitz/osx-gcc-installer/downloads${esc}[0m"
+        fi
+
+        echo
+        echo "You will need to install the official GCC compiler to build newer"
+        echo "versions of CPython even if you have installed Apple's Command Line Tools"
+        echo "for Xcode package. The Command Line Tools for Xcode package only"
+        echo "includes \`llvm-gcc\`."
+      fi
    } >&3
    return 1
  fi
- 
-  export CC="$cc"
-} 

-locate_gcc() {
-  locate_cc "gcc" "$@"
+  export CC="$gcc"
 }

-locate_cc() {
-  local ccname="$1"; shift
-  if [ -z "$ccname" ]; then
-    return 1
-  fi
-  local cc ccs
-  IFS=: ccs=($(ccs_in_path "${ccname}"))
+locate_gcc() {
+  local gcc gccs
+  IFS=: gccs=($(gccs_in_path))

-  verify_cc "${ccname}" "$CC" ||
-  verify_cc "${ccname}" "$(command -v "${ccname}" || true)" || {
-    for cc in "${ccs[@]}"; do
-      verify_cc "${ccname}" "$cc" && break || true
+  verify_gcc "$CC" ||
+  verify_gcc "$(command -v gcc || true)" || {
+    for gcc in "${gccs[@]}"; do
+      verify_gcc "$gcc" && break || true
    done
  }

@@ -799,53 +815,58 @@ locate_cc() {
 }

 gccs_in_path() {
-  ccs_in_path "gcc" "$@"
-}
-
-ccs_in_path() {
-  local ccname="$1"; shift
-  if [ -z "$ccname" ]; then
-    return 1
-  fi
-  local cc path paths
-  local ccs=()
+  local gcc path paths
+  local gccs=()
  IFS=: paths=($PATH)

  shopt -s nullglob
  for path in "${paths[@]}"; do
-    for cc in "$path"/${ccname}-*; do
-      ccs["${#ccs[@]}"]="$cc"
+    for gcc in "$path"/gcc-*; do
+      gccs["${#gccs[@]}"]="$gcc"
    done
  done
  shopt -u nullglob

-  printf :%s "${ccs[@]}"
+  printf :%s "${gccs[@]}"
 }

 verify_gcc() {
-  verify_cc "gcc" "$@"
-}
-
-verify_cc() {
-  local ccname="$1"; shift
-  if [ -z "$ccname" ]; then
-    return 1
-  fi
-  local cc="$1"
-  if [ -z "$cc" ]; then
+  local gcc="$1"
+  if [ -z "$gcc" ]; then
    return 1
  fi

-  local version="$("$cc" --version || true)"
+  local version="$("$gcc" --version || true)"
  if [ -z "$version" ]; then
    return 1
  fi

-  echo "$cc"
+  if echo "$version" | grep LLVM >/dev/null; then
+    return 1
+  fi
+
+  echo "$gcc"
 }

+require_clang() {
+  local clang="$(command -v "$CC" || command -v "clang" || true)"
+
+  if [ -z "$clang" ]; then
+    local esc=$'\033'
+    { echo
+      echo "${esc}[1mERROR${esc}[0m: 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() {
-  local java="$(locate_java || true)"
+  local java="$(command -v java || true)"

  if [ -z "$java" ]; then
    local esc=$'\033'
@@ -861,91 +882,42 @@ require_java() {
  export JAVA="$java"
 }

-locate_java() {
-  local java javas
-  IFS=: javas=($(javas_in_path))
-
-  verify_java "$JAVA" ||
-  verify_java "$(command -v java || true)" || {
-    for java in "${javas[@]}"; do
-      verify_java "$java" && break || true
-    done
-  }
-
-  return 1
-}
-
-javas_in_path() {
-  local java path paths
-  local javas=()
-  IFS=: paths=($PATH)
-
-  shopt -s nullglob
-  for path in "${paths[@]}"; do
-    local java="$path"/java
-    if [ -x "$java" ]; then
-      javas["${#javas[@]}"]="$java"
-    fi
-  done
-  shopt -u nullglob
-
-  printf :%s "${javas[@]}"
-}
-
-verify_java() {
-  local java="$1"
-  if [ -z "$java" ]; then
-    return 1
-  fi
-
-  if [ ! -x "$java" ]; then
-    return 1
-  fi
-
-  echo "$java"
-}
-
 needs_yaml() {
-  [[ "$RUBY_CONFIGURE_OPTS" != *--with-libyaml-dir=* ]] &&
+  [[ "$PYTHON_CONFIGURE_OPTS" != *--with-libyaml-dir=* ]] &&
  ! use_homebrew_yaml
 }

 use_homebrew_yaml() {
  local libdir="$(brew --prefix libyaml 2>/dev/null || true)"
  if [ -d "$libdir" ]; then
-    package_option ruby configure --with-libyaml-dir="$libdir"
+    package_option python configure CPPFLAGS="-I$libdir/include" LDFLAGS="-L$libdir/lib"
  else
    return 1
  fi
 }

 has_broken_mac_readline() {
-  if [ "$(uname -s)" = "Darwin" ]; then
-    use_homebrew_readline || {
-      # MacOSX 10.4 has a broken readline.
-      # https://github.com/yyuu/pyenv/issues/23
-      local retval=1
-      local conftest="$BUILD_PATH/has_broken_mac_readline.h"
-      if [ "$(uname -s)" = "Darwin" ]; then
-        echo "#include <readline/rlconf.h>" > "$conftest"
-        "${CPP:-cpp}" $CPPFLAGS "$conftest" 1>/dev/null 2>&1 || retval=0
-        rm -f "$conftest"
-      fi
-      return "$retval"
-    }
+  if [ "$(uname -s)" = "Darwin" ] && ! use_homebrew_readline; then
+    # MacOSX 10.4 has a broken readline.
+    # https://github.com/yyuu/pyenv/issues/23
+    local retval=1
+    local conftest="$BUILD_PATH/has_broken_mac_readline.h"
+    echo "#include <readline/rlconf.h>" > "$conftest"
+    "${CPP:-cpp}" $CPPFLAGS "$conftest" 1>/dev/null 2>&1 || retval=0
+    rm -f "$conftest"
+    return "$retval"
  else
    return 1
  fi
 }

 use_homebrew_readline() {
-  local libdir="$(brew --prefix readline 2>/dev/null || true)"
-  if [ -d "$libdir" ]; then
-    CPPFLAGS="-I$libdir/include $CPPFLAGS"
-    LDFLAGS="-L$libdir/lib $LDFLAGS"
-  else
-    return 1
-  fi
+    local libdir="$(brew --prefix readline 2>/dev/null || true)"
+    if [ -d "$libdir" ]; then
+      package_option python configure CPPFLAGS="-I$libdir/include" LDFLAGS="-L$libdir/lib"
+    else
+      return 1
+    fi
 }

 has_broken_mac_openssl() {
@@ -957,8 +929,7 @@ has_broken_mac_openssl() {
 use_homebrew_openssl() {
  local ssldir="$(brew --prefix openssl 2>/dev/null || true)"
  if [ -d "$ssldir" ]; then
-    CPPFLAGS="-I$ssldir/include $CPPFLAGS"
-    LDFLAGS="-L$ssldir/lib $LDFLAGS"
+    package_option python configure CPPFLAGS="-I$ssldir/include" LDFLAGS="-L$ssldir/lib"
  else
    return 1
  fi
@@ -972,7 +943,7 @@ build_package_mac_openssl() {
  OPENSSLDIR="${OPENSSLDIR:-$OPENSSL_PREFIX_PATH/ssl}"

  # Tell Python to use this openssl for its extension.
-  package_option python configure --with-openssl-dir="$OPENSSL_PREFIX_PATH"
+  package_option python configure CPPFLAGS="-I${OPENSSL_PREFIX_PATH}/include" LDFLAGS="-L${OPENSSL_PREFIX_PATH}/lib"

  # Hint OpenSSL that we prefer a 64-bit build.
  export KERNEL_BITS="64"
@@ -1019,7 +990,7 @@ build_package_auto_tcltk() {
        export CPPFLAGS="-I/opt/X11/include $CPPFLAGS"
      fi
    else
-      package_option ruby configure --without-tk
+      package_option python configure --without-tk
    fi
  fi
 }
@@ -1054,6 +1025,14 @@ isolated_gem_install() {
  gem install "$@"
 }

+apply_python_patch() {
+  case "$1" in
+  Python-* | jython-* | pypy-* )
+    patch -p0 -i "${2:--}"
+    ;;
+  esac
+}
+
 build_package_verify_python() {
  # Check the existence of ./bin since pyenv-which searches the executables from there
  if [ ! -d "${PREFIX_PATH}/bin" ]; then
@@ -1179,7 +1158,7 @@ version() {

 usage() {
  { version
-    echo "usage: python-build [-g|--debug] [-k|--keep] [-v|--verbose] definition prefix"
+    echo "usage: python-build [-k|--keep] [-v|--verbose] [-p|--patch] [-g|--debug] definition prefix"
    echo "       python-build --definitions"
  } >&2

@@ -1199,8 +1178,9 @@ list_definitions() {

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

 parse_options "$@"

@@ -1210,8 +1190,9 @@ for option in "${OPTIONS[@]}"; do
    usage without_exiting
    { echo
      echo "  -k/--keep        Do not remove source tree after installation"
-      echo "  -g/--debug       Build a debug version"
      echo "  -v/--verbose     Verbose mode: print compilation status to stdout"
+      echo "  -p/--patch       Apply a patch from stdin before building"
+      echo "  -g/--debug       Build a debug version"
      echo "  --definitions    List all built-in definitions"
      echo
    } >&2
@@ -1227,6 +1208,9 @@ for option in "${OPTIONS[@]}"; do
  "v" | "verbose" )
    VERBOSE=true
    ;;
+  "p" | "patch" )
+    HAS_PATCH=true
+    ;;
  "g" | "debug" )
    DEBUG=true
    ;;
@@ -1310,7 +1294,14 @@ else
 fi

 if [ -n "$DEBUG" ]; then
-  PYTHON_CONFIGURE_OPTS="--with-pydebug $PYTHON_CONFIGURE_OPTS"
+  package_option python configure --with-pydebug
+fi
+
+if [[ "$PYTHON_CONFIGURE_OPTS" == *"--enable-shared"* ]] && [[ "$LDFLAGS" != *"-rpath="* ]]; then
+  # The ld on Darwin embeds the full paths to each dylib by default
+  if [[ "Darwin" != "$(uname -s)" ]]; then
+    export LDFLAGS="-Wl,-rpath=${PREFIX_PATH}/lib ${LDFLAGS}"
+  fi
 fi

 SEED="$(date "+%Y%m%d%H%M%S").$$"
--- a/plugins/python-build/install.sh
+++ b/plugins/python-build/install.sh
@@ -17,4 +17,4 @@ SHARE_PATH="${PREFIX}/share/python-build"
 mkdir -p "$BIN_PATH" "$SHARE_PATH"

 install -p bin/* "$BIN_PATH"
-install -p share/python-build/* "$SHARE_PATH"
+cp -RPp share/python-build/* "$SHARE_PATH"
--- a/plugins/python-build/share/python-build/2.4
+++ b/plugins/python-build/share/python-build/2.4
@@ -1,5 +1,5 @@
 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.4" "http://python.org/ftp/python/2.4/Python-2.4.tgz#149ad508f936eccf669d52682cf8e606" standard verify_py24
+install_package "Python-2.4" "http://python.org/ftp/python/2.4/Python-2.4.tgz#149ad508f936eccf669d52682cf8e606" 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#13951be6711438073fbe50843e7f141f" python
 install_package "pip-1.1" "https://pypi.python.org/packages/source/p/pip/pip-1.1.tar.gz#62a9f08dd5dc69d76734568a6c040508" python
--- a/plugins/python-build/share/python-build/2.4.1
+++ b/plugins/python-build/share/python-build/2.4.1
@@ -1,5 +1,5 @@
 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.4.1" "http://python.org/ftp/python/2.4.1/Python-2.4.1.tgz#7bb2416a4f421c3452d306694d3efbba" standard verify_py24
+install_package "Python-2.4.1" "http://python.org/ftp/python/2.4.1/Python-2.4.1.tgz#7bb2416a4f421c3452d306694d3efbba" 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#13951be6711438073fbe50843e7f141f" python
 install_package "pip-1.1" "https://pypi.python.org/packages/source/p/pip/pip-1.1.tar.gz#62a9f08dd5dc69d76734568a6c040508" python
--- a/plugins/python-build/share/python-build/2.4.2
+++ b/plugins/python-build/share/python-build/2.4.2
@@ -1,5 +1,5 @@
 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.4.2" "http://python.org/ftp/python/2.4.2/Python-2.4.2.tgz#07cfc759546f6723bb367be5b1ce9875" standard verify_py24
+install_package "Python-2.4.2" "http://python.org/ftp/python/2.4.2/Python-2.4.2.tgz#07cfc759546f6723bb367be5b1ce9875" 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#13951be6711438073fbe50843e7f141f" python
 install_package "pip-1.1" "https://pypi.python.org/packages/source/p/pip/pip-1.1.tar.gz#62a9f08dd5dc69d76734568a6c040508" python
--- a/plugins/python-build/share/python-build/2.4.3
+++ b/plugins/python-build/share/python-build/2.4.3
@@ -1,5 +1,5 @@
 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.4.3" "http://python.org/ftp/python/2.4.3/Python-2.4.3.tgz#edf994473a8c1a963aaa71e442b285b7" standard verify_py24
+install_package "Python-2.4.3" "http://python.org/ftp/python/2.4.3/Python-2.4.3.tgz#edf994473a8c1a963aaa71e442b285b7" 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#13951be6711438073fbe50843e7f141f" python
 install_package "pip-1.1" "https://pypi.python.org/packages/source/p/pip/pip-1.1.tar.gz#62a9f08dd5dc69d76734568a6c040508" python
--- a/plugins/python-build/share/python-build/2.4.4
+++ b/plugins/python-build/share/python-build/2.4.4
@@ -1,5 +1,5 @@
 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.4.4" "http://python.org/ftp/python/2.4.4/Python-2.4.4.tgz#82d000617baaef269ad5795c595fdc58" standard verify_py24
+install_package "Python-2.4.4" "http://python.org/ftp/python/2.4.4/Python-2.4.4.tgz#82d000617baaef269ad5795c595fdc58" 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#13951be6711438073fbe50843e7f141f" python
 install_package "pip-1.1" "https://pypi.python.org/packages/source/p/pip/pip-1.1.tar.gz#62a9f08dd5dc69d76734568a6c040508" python
--- a/plugins/python-build/share/python-build/2.4.5
+++ b/plugins/python-build/share/python-build/2.4.5
@@ -1,5 +1,5 @@
 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.4.5" "http://python.org/ftp/python/2.4.5/Python-2.4.5.tgz#750b652bfdd12675e102bbe25e5e9893" standard verify_py24
+install_package "Python-2.4.5" "http://python.org/ftp/python/2.4.5/Python-2.4.5.tgz#750b652bfdd12675e102bbe25e5e9893" 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#13951be6711438073fbe50843e7f141f" python
 install_package "pip-1.1" "https://pypi.python.org/packages/source/p/pip/pip-1.1.tar.gz#62a9f08dd5dc69d76734568a6c040508" python
--- a/plugins/python-build/share/python-build/2.4.6
+++ b/plugins/python-build/share/python-build/2.4.6
@@ -1,5 +1,5 @@
 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.4.6" "http://python.org/ftp/python/2.4.6/Python-2.4.6.tgz#7564b2b142b1b8345cd5358b7aaaa482" standard verify_py24
+install_package "Python-2.4.6" "http://python.org/ftp/python/2.4.6/Python-2.4.6.tgz#7564b2b142b1b8345cd5358b7aaaa482" 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#13951be6711438073fbe50843e7f141f" python
 install_package "pip-1.1" "https://pypi.python.org/packages/source/p/pip/pip-1.1.tar.gz#62a9f08dd5dc69d76734568a6c040508" python
--- a/plugins/python-build/share/python-build/2.5
+++ b/plugins/python-build/share/python-build/2.5
@@ -1,5 +1,5 @@
 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.5" "http://python.org/ftp/python/2.5/Python-2.5.tgz#bc1b74f90a472a6c0a85481aaeb43f95" standard verify_py25
+install_package "Python-2.5" "http://python.org/ftp/python/2.5/Python-2.5.tgz#bc1b74f90a472a6c0a85481aaeb43f95" 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#13951be6711438073fbe50843e7f141f" python
 install_package "pip-1.3.1" "https://pypi.python.org/packages/source/p/pip/pip-1.3.1.tar.gz#cbb27a191cebc58997c4da8513863153" python
--- a/plugins/python-build/share/python-build/2.5.1
+++ b/plugins/python-build/share/python-build/2.5.1
@@ -1,5 +1,5 @@
 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.5.1" "http://python.org/ftp/python/2.5.1/Python-2.5.1.tgz#cca695828df8adc3e69b637af07522e1" standard verify_py25
+install_package "Python-2.5.1" "http://python.org/ftp/python/2.5.1/Python-2.5.1.tgz#cca695828df8adc3e69b637af07522e1" 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#13951be6711438073fbe50843e7f141f" python
 install_package "pip-1.3.1" "https://pypi.python.org/packages/source/p/pip/pip-1.3.1.tar.gz#cbb27a191cebc58997c4da8513863153" python
--- a/plugins/python-build/share/python-build/2.5.2
+++ b/plugins/python-build/share/python-build/2.5.2
@@ -1,5 +1,5 @@
 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.5.2" "http://python.org/ftp/python/2.5.2/Python-2.5.2.tgz#3f7ca8aa86c6bd275426d63b46e07992" standard verify_py25
+install_package "Python-2.5.2" "http://python.org/ftp/python/2.5.2/Python-2.5.2.tgz#3f7ca8aa86c6bd275426d63b46e07992" 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#13951be6711438073fbe50843e7f141f" python
 install_package "pip-1.3.1" "https://pypi.python.org/packages/source/p/pip/pip-1.3.1.tar.gz#cbb27a191cebc58997c4da8513863153" python
--- a/plugins/python-build/share/python-build/2.5.3
+++ b/plugins/python-build/share/python-build/2.5.3
@@ -1,5 +1,5 @@
 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.5.3" "http://python.org/ftp/python/2.5.3/Python-2.5.3.tgz#a971f8928d6beb31ae0de56f7034d6a2" standard verify_py25
+install_package "Python-2.5.3" "http://python.org/ftp/python/2.5.3/Python-2.5.3.tgz#a971f8928d6beb31ae0de56f7034d6a2" 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#13951be6711438073fbe50843e7f141f" python
 install_package "pip-1.3.1" "https://pypi.python.org/packages/source/p/pip/pip-1.3.1.tar.gz#cbb27a191cebc58997c4da8513863153" python
--- a/plugins/python-build/share/python-build/2.5.4
+++ b/plugins/python-build/share/python-build/2.5.4
@@ -1,5 +1,5 @@
 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.5.4" "http://python.org/ftp/python/2.5.4/Python-2.5.4.tgz#ad47b23778f64edadaaa8b5534986eed" standard verify_py25
+install_package "Python-2.5.4" "http://python.org/ftp/python/2.5.4/Python-2.5.4.tgz#ad47b23778f64edadaaa8b5534986eed" 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#13951be6711438073fbe50843e7f141f" python
 install_package "pip-1.3.1" "https://pypi.python.org/packages/source/p/pip/pip-1.3.1.tar.gz#cbb27a191cebc58997c4da8513863153" python
--- a/plugins/python-build/share/python-build/2.5.5
+++ b/plugins/python-build/share/python-build/2.5.5
@@ -1,5 +1,5 @@
 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.5.5" "http://python.org/ftp/python/2.5.5/Python-2.5.5.tgz#abc02139ca38f4258e8e372f7da05c88" standard verify_py25
+install_package "Python-2.5.5" "http://python.org/ftp/python/2.5.5/Python-2.5.5.tgz#abc02139ca38f4258e8e372f7da05c88" 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#13951be6711438073fbe50843e7f141f" python
 install_package "pip-1.3.1" "https://pypi.python.org/packages/source/p/pip/pip-1.3.1.tar.gz#cbb27a191cebc58997c4da8513863153" python
--- a/plugins/python-build/share/python-build/2.5.6
+++ b/plugins/python-build/share/python-build/2.5.6
@@ -1,5 +1,5 @@
 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.5.6" "http://python.org/ftp/python/2.5.6/Python-2.5.6.tgz#d1d9c83928561addf11d00b22a18ca50" standard verify_py25
+install_package "Python-2.5.6" "http://python.org/ftp/python/2.5.6/Python-2.5.6.tgz#d1d9c83928561addf11d00b22a18ca50" 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#13951be6711438073fbe50843e7f141f" python
 install_package "pip-1.3.1" "https://pypi.python.org/packages/source/p/pip/pip-1.3.1.tar.gz#cbb27a191cebc58997c4da8513863153" python
--- a/plugins/python-build/share/python-build/2.6-dev
+++ b/plugins/python-build/share/python-build/2.6-dev
@@ -1,5 +1,5 @@
 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_hg "Python-2.6-dev" "https://bitbucket.org/mirror/cpython" "2.6" standard verify_py26
-install_package "setuptools-2.0" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.0.tar.gz#887cdf417bc5d25326c66bb98c0dd160" python
-install_package "pip-1.4.1" "https://pypi.python.org/packages/source/p/pip/pip-1.4.1.tar.gz#6afbb46aeb48abac658d4df742bff714" python
+install_package "setuptools-2.1" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.1.tar.gz#2044725530450d0517393882dc4b7508" python
+install_package "pip-1.5" "https://pypi.python.org/packages/source/p/pip/pip-1.5.tar.gz#6969b8a8adc4c7f7c5eb1707118f0686" python
--- a/plugins/python-build/share/python-build/2.6.6
+++ b/plugins/python-build/share/python-build/2.6.6
@@ -1,5 +1,5 @@
 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.6.6" "http://python.org/ftp/python/2.6.6/Python-2.6.6.tgz#b2f209df270a33315e62c1ffac1937f0" standard verify_py26
-install_package "setuptools-2.0" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.0.tar.gz#887cdf417bc5d25326c66bb98c0dd160" python
-install_package "pip-1.4.1" "https://pypi.python.org/packages/source/p/pip/pip-1.4.1.tar.gz#6afbb46aeb48abac658d4df742bff714" python
+install_package "Python-2.6.6" "http://python.org/ftp/python/2.6.6/Python-2.6.6.tgz#b2f209df270a33315e62c1ffac1937f0" ldflags_dirs standard verify_py26
+install_package "setuptools-2.1" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.1.tar.gz#2044725530450d0517393882dc4b7508" python
+install_package "pip-1.5" "https://pypi.python.org/packages/source/p/pip/pip-1.5.tar.gz#6969b8a8adc4c7f7c5eb1707118f0686" python
--- a/plugins/python-build/share/python-build/2.6.7
+++ b/plugins/python-build/share/python-build/2.6.7
@@ -1,5 +1,5 @@
 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.6.7" "http://python.org/ftp/python/2.6.7/Python-2.6.7.tgz#af474f85a3af69ea50438a2a48039d7d" standard verify_py26
-install_package "setuptools-2.0" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.0.tar.gz#887cdf417bc5d25326c66bb98c0dd160" python
-install_package "pip-1.4.1" "https://pypi.python.org/packages/source/p/pip/pip-1.4.1.tar.gz#6afbb46aeb48abac658d4df742bff714" python
+install_package "Python-2.6.7" "http://python.org/ftp/python/2.6.7/Python-2.6.7.tgz#af474f85a3af69ea50438a2a48039d7d" ldflags_dirs standard verify_py26
+install_package "setuptools-2.1" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.1.tar.gz#2044725530450d0517393882dc4b7508" python
+install_package "pip-1.5" "https://pypi.python.org/packages/source/p/pip/pip-1.5.tar.gz#6969b8a8adc4c7f7c5eb1707118f0686" python
--- a/plugins/python-build/share/python-build/2.6.8
+++ b/plugins/python-build/share/python-build/2.6.8
@@ -1,5 +1,5 @@
 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.6.8" "http://python.org/ftp/python/2.6.8/Python-2.6.8.tgz#f6c1781f5d73ab7dfa5181f43ea065f6" standard verify_py26
-install_package "setuptools-2.0" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.0.tar.gz#887cdf417bc5d25326c66bb98c0dd160" python
-install_package "pip-1.4.1" "https://pypi.python.org/packages/source/p/pip/pip-1.4.1.tar.gz#6afbb46aeb48abac658d4df742bff714" python
+install_package "Python-2.6.8" "http://python.org/ftp/python/2.6.8/Python-2.6.8.tgz#f6c1781f5d73ab7dfa5181f43ea065f6" ldflags_dirs standard verify_py26
+install_package "setuptools-2.1" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.1.tar.gz#2044725530450d0517393882dc4b7508" python
+install_package "pip-1.5" "https://pypi.python.org/packages/source/p/pip/pip-1.5.tar.gz#6969b8a8adc4c7f7c5eb1707118f0686" python
--- a/plugins/python-build/share/python-build/2.6.9
+++ b/plugins/python-build/share/python-build/2.6.9
@@ -1,5 +1,5 @@
 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.6.9" "http://python.org/ftp/python/2.6.9/Python-2.6.9.tgz#bddbd64bf6f5344fc55bbe49a72fe4f3" standard verify_py26
-install_package "setuptools-2.0" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.0.tar.gz#887cdf417bc5d25326c66bb98c0dd160" python
-install_package "pip-1.4.1" "https://pypi.python.org/packages/source/p/pip/pip-1.4.1.tar.gz#6afbb46aeb48abac658d4df742bff714" python
+install_package "Python-2.6.9" "http://python.org/ftp/python/2.6.9/Python-2.6.9.tgz#bddbd64bf6f5344fc55bbe49a72fe4f3" ldflags_dirs standard verify_py26
+install_package "setuptools-2.1" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.1.tar.gz#2044725530450d0517393882dc4b7508" python
+install_package "pip-1.5" "https://pypi.python.org/packages/source/p/pip/pip-1.5.tar.gz#6969b8a8adc4c7f7c5eb1707118f0686" python
--- a/plugins/python-build/share/python-build/2.7
+++ b/plugins/python-build/share/python-build/2.7
@@ -1,5 +1,5 @@
 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.7" "http://python.org/ftp/python/2.7/Python-2.7.tgz#35f56b092ecf39a6bd59d64f142aae0f" standard verify_py27
-install_package "setuptools-2.0" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.0.tar.gz#887cdf417bc5d25326c66bb98c0dd160" python
-install_package "pip-1.4.1" "https://pypi.python.org/packages/source/p/pip/pip-1.4.1.tar.gz#6afbb46aeb48abac658d4df742bff714" python
+install_package "Python-2.7" "http://python.org/ftp/python/2.7/Python-2.7.tgz#35f56b092ecf39a6bd59d64f142aae0f" ldflags_dirs standard verify_py27
+install_package "setuptools-2.1" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.1.tar.gz#2044725530450d0517393882dc4b7508" python
+install_package "pip-1.5" "https://pypi.python.org/packages/source/p/pip/pip-1.5.tar.gz#6969b8a8adc4c7f7c5eb1707118f0686" python
--- a/plugins/python-build/share/python-build/2.7-dev
+++ b/plugins/python-build/share/python-build/2.7-dev
@@ -1,5 +1,5 @@
 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_hg "Python-2.7-dev" "https://bitbucket.org/mirror/cpython" "2.7" standard verify_py27
-install_package "setuptools-2.0" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.0.tar.gz#887cdf417bc5d25326c66bb98c0dd160" python
-install_package "pip-1.4.1" "https://pypi.python.org/packages/source/p/pip/pip-1.4.1.tar.gz#6afbb46aeb48abac658d4df742bff714" python
+install_package "setuptools-2.1" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.1.tar.gz#2044725530450d0517393882dc4b7508" python
+install_package "pip-1.5" "https://pypi.python.org/packages/source/p/pip/pip-1.5.tar.gz#6969b8a8adc4c7f7c5eb1707118f0686" python
--- a/plugins/python-build/share/python-build/2.7.1
+++ b/plugins/python-build/share/python-build/2.7.1
@@ -1,5 +1,5 @@
 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.7.1" "http://python.org/ftp/python/2.7.1/Python-2.7.1.tgz#15ed56733655e3fab785e49a7278d2fb" standard verify_py27
-install_package "setuptools-2.0" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.0.tar.gz#887cdf417bc5d25326c66bb98c0dd160" python
-install_package "pip-1.4.1" "https://pypi.python.org/packages/source/p/pip/pip-1.4.1.tar.gz#6afbb46aeb48abac658d4df742bff714" python
+install_package "Python-2.7.1" "http://python.org/ftp/python/2.7.1/Python-2.7.1.tgz#15ed56733655e3fab785e49a7278d2fb" ldflags_dirs standard verify_py27
+install_package "setuptools-2.1" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.1.tar.gz#2044725530450d0517393882dc4b7508" python
+install_package "pip-1.5" "https://pypi.python.org/packages/source/p/pip/pip-1.5.tar.gz#6969b8a8adc4c7f7c5eb1707118f0686" python
--- a/plugins/python-build/share/python-build/2.7.2
+++ b/plugins/python-build/share/python-build/2.7.2
@@ -1,5 +1,5 @@
 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.7.2" "http://python.org/ftp/python/2.7.2/Python-2.7.2.tgz#0ddfe265f1b3d0a8c2459f5bf66894c7" standard verify_py27
-install_package "setuptools-2.0" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.0.tar.gz#887cdf417bc5d25326c66bb98c0dd160" python
-install_package "pip-1.4.1" "https://pypi.python.org/packages/source/p/pip/pip-1.4.1.tar.gz#6afbb46aeb48abac658d4df742bff714" python
+install_package "Python-2.7.2" "http://python.org/ftp/python/2.7.2/Python-2.7.2.tgz#0ddfe265f1b3d0a8c2459f5bf66894c7" ldflags_dirs standard verify_py27
+install_package "setuptools-2.1" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.1.tar.gz#2044725530450d0517393882dc4b7508" python
+install_package "pip-1.5" "https://pypi.python.org/packages/source/p/pip/pip-1.5.tar.gz#6969b8a8adc4c7f7c5eb1707118f0686" python
--- a/plugins/python-build/share/python-build/2.7.3
+++ b/plugins/python-build/share/python-build/2.7.3
@@ -1,5 +1,5 @@
 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.7.3" "http://python.org/ftp/python/2.7.3/Python-2.7.3.tgz#2cf641732ac23b18d139be077bd906cd" standard verify_py27
-install_package "setuptools-2.0" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.0.tar.gz#887cdf417bc5d25326c66bb98c0dd160" python
-install_package "pip-1.4.1" "https://pypi.python.org/packages/source/p/pip/pip-1.4.1.tar.gz#6afbb46aeb48abac658d4df742bff714" python
+install_package "Python-2.7.3" "http://python.org/ftp/python/2.7.3/Python-2.7.3.tgz#2cf641732ac23b18d139be077bd906cd" ldflags_dirs standard verify_py27
+install_package "setuptools-2.1" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.1.tar.gz#2044725530450d0517393882dc4b7508" python
+install_package "pip-1.5" "https://pypi.python.org/packages/source/p/pip/pip-1.5.tar.gz#6969b8a8adc4c7f7c5eb1707118f0686" python
--- a/plugins/python-build/share/python-build/2.7.4
+++ b/plugins/python-build/share/python-build/2.7.4
@@ -1,5 +1,5 @@
 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.7.4" "http://python.org/ftp/python/2.7.4/Python-2.7.4.tgz#592603cfaf4490a980e93ecb92bde44a" standard verify_py27
-install_package "setuptools-2.0" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.0.tar.gz#887cdf417bc5d25326c66bb98c0dd160" python
-install_package "pip-1.4.1" "https://pypi.python.org/packages/source/p/pip/pip-1.4.1.tar.gz#6afbb46aeb48abac658d4df742bff714" python
+install_package "Python-2.7.4" "http://python.org/ftp/python/2.7.4/Python-2.7.4.tgz#592603cfaf4490a980e93ecb92bde44a" ldflags_dirs standard verify_py27
+install_package "setuptools-2.1" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.1.tar.gz#2044725530450d0517393882dc4b7508" python
+install_package "pip-1.5" "https://pypi.python.org/packages/source/p/pip/pip-1.5.tar.gz#6969b8a8adc4c7f7c5eb1707118f0686" python
--- a/plugins/python-build/share/python-build/2.7.5
+++ b/plugins/python-build/share/python-build/2.7.5
@@ -1,5 +1,5 @@
 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.7.5" "http://python.org/ftp/python/2.7.5/Python-2.7.5.tgz#b4f01a1d0ba0b46b05c73b2ac909b1df" standard verify_py27
-install_package "setuptools-2.0" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.0.tar.gz#887cdf417bc5d25326c66bb98c0dd160" python
-install_package "pip-1.4.1" "https://pypi.python.org/packages/source/p/pip/pip-1.4.1.tar.gz#6afbb46aeb48abac658d4df742bff714" python
+install_package "Python-2.7.5" "http://python.org/ftp/python/2.7.5/Python-2.7.5.tgz#b4f01a1d0ba0b46b05c73b2ac909b1df" ldflags_dirs standard verify_py27
+install_package "setuptools-2.1" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.1.tar.gz#2044725530450d0517393882dc4b7508" python
+install_package "pip-1.5" "https://pypi.python.org/packages/source/p/pip/pip-1.5.tar.gz#6969b8a8adc4c7f7c5eb1707118f0686" python
--- a/plugins/python-build/share/python-build/2.7.6
+++ b/plugins/python-build/share/python-build/2.7.6
@@ -1,5 +1,5 @@
 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.7.6" "http://python.org/ftp/python/2.7.6/Python-2.7.6.tgz#1d8728eb0dfcac72a0fd99c17ec7f386" standard verify_py27
-install_package "setuptools-2.0" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.0.tar.gz#887cdf417bc5d25326c66bb98c0dd160" python
-install_package "pip-1.4.1" "https://pypi.python.org/packages/source/p/pip/pip-1.4.1.tar.gz#6afbb46aeb48abac658d4df742bff714" python
+install_package "Python-2.7.6" "http://python.org/ftp/python/2.7.6/Python-2.7.6.tgz#1d8728eb0dfcac72a0fd99c17ec7f386" ldflags_dirs standard verify_py27
+install_package "setuptools-2.1" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.1.tar.gz#2044725530450d0517393882dc4b7508" python
+install_package "pip-1.5" "https://pypi.python.org/packages/source/p/pip/pip-1.5.tar.gz#6969b8a8adc4c7f7c5eb1707118f0686" python
--- a/plugins/python-build/share/python-build/3.0.1
+++ b/plugins/python-build/share/python-build/3.0.1
@@ -1,5 +1,5 @@
 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-3.0.1" "http://python.org/ftp/python/3.0.1/Python-3.0.1.tgz#220b73f0a1a20c4b1cdf9f9db4cd52fe" standard verify_py30
-install_package "setuptools-2.0" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.0.tar.gz#887cdf417bc5d25326c66bb98c0dd160" python
-install_package "pip-1.4.1" "https://pypi.python.org/packages/source/p/pip/pip-1.4.1.tar.gz#6afbb46aeb48abac658d4df742bff714" python
+install_package "Python-3.0.1" "http://python.org/ftp/python/3.0.1/Python-3.0.1.tgz#220b73f0a1a20c4b1cdf9f9db4cd52fe" ldflags_dirs standard verify_py30
+install_package "setuptools-2.1" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.1.tar.gz#2044725530450d0517393882dc4b7508" python
+install_package "pip-1.5" "https://pypi.python.org/packages/source/p/pip/pip-1.5.tar.gz#6969b8a8adc4c7f7c5eb1707118f0686" python
--- a/plugins/python-build/share/python-build/3.1-dev
+++ b/plugins/python-build/share/python-build/3.1-dev
@@ -1,5 +1,5 @@
 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_hg "Python-3.1-dev" "https://bitbucket.org/mirror/cpython" "3.1" standard verify_py31
-install_package "setuptools-2.0" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.0.tar.gz#887cdf417bc5d25326c66bb98c0dd160" python
-install_package "pip-1.4.1" "https://pypi.python.org/packages/source/p/pip/pip-1.4.1.tar.gz#6afbb46aeb48abac658d4df742bff714" python
+install_package "setuptools-2.1" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.1.tar.gz#2044725530450d0517393882dc4b7508" python
+install_package "pip-1.5" "https://pypi.python.org/packages/source/p/pip/pip-1.5.tar.gz#6969b8a8adc4c7f7c5eb1707118f0686" python
--- a/plugins/python-build/share/python-build/3.1.3
+++ b/plugins/python-build/share/python-build/3.1.3
@@ -1,5 +1,5 @@
 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-3.1.3" "http://python.org/ftp/python/3.1.3/Python-3.1.3.tgz#d797fa6abe82c21227e328f05a535424" standard verify_py31
-install_package "setuptools-2.0" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.0.tar.gz#887cdf417bc5d25326c66bb98c0dd160" python
-install_package "pip-1.4.1" "https://pypi.python.org/packages/source/p/pip/pip-1.4.1.tar.gz#6afbb46aeb48abac658d4df742bff714" python
+install_package "Python-3.1.3" "http://python.org/ftp/python/3.1.3/Python-3.1.3.tgz#d797fa6abe82c21227e328f05a535424" ldflags_dirs standard verify_py31
+install_package "setuptools-2.1" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.1.tar.gz#2044725530450d0517393882dc4b7508" python
+install_package "pip-1.5" "https://pypi.python.org/packages/source/p/pip/pip-1.5.tar.gz#6969b8a8adc4c7f7c5eb1707118f0686" python
--- a/plugins/python-build/share/python-build/3.1.4
+++ b/plugins/python-build/share/python-build/3.1.4
@@ -1,5 +1,5 @@
 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-3.1.4" "http://python.org/ftp/python/3.1.4/Python-3.1.4.tgz#fa9f8efdc63944c8393870282e8b5c35" standard verify_py31
-install_package "setuptools-2.0" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.0.tar.gz#887cdf417bc5d25326c66bb98c0dd160" python
-install_package "pip-1.4.1" "https://pypi.python.org/packages/source/p/pip/pip-1.4.1.tar.gz#6afbb46aeb48abac658d4df742bff714" python
+install_package "Python-3.1.4" "http://python.org/ftp/python/3.1.4/Python-3.1.4.tgz#fa9f8efdc63944c8393870282e8b5c35" ldflags_dirs standard verify_py31
+install_package "setuptools-2.1" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.1.tar.gz#2044725530450d0517393882dc4b7508" python
+install_package "pip-1.5" "https://pypi.python.org/packages/source/p/pip/pip-1.5.tar.gz#6969b8a8adc4c7f7c5eb1707118f0686" python
--- a/plugins/python-build/share/python-build/3.1.5
+++ b/plugins/python-build/share/python-build/3.1.5
@@ -1,5 +1,5 @@
 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-3.1.5" "http://python.org/ftp/python/3.1.5/Python-3.1.5.tgz#02196d3fc7bc76bdda68aa36b0dd16ab" standard verify_py31
-install_package "setuptools-2.0" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.0.tar.gz#887cdf417bc5d25326c66bb98c0dd160" python
-install_package "pip-1.4.1" "https://pypi.python.org/packages/source/p/pip/pip-1.4.1.tar.gz#6afbb46aeb48abac658d4df742bff714" python
+install_package "Python-3.1.5" "http://python.org/ftp/python/3.1.5/Python-3.1.5.tgz#02196d3fc7bc76bdda68aa36b0dd16ab" ldflags_dirs standard verify_py31
+install_package "setuptools-2.1" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.1.tar.gz#2044725530450d0517393882dc4b7508" python
+install_package "pip-1.5" "https://pypi.python.org/packages/source/p/pip/pip-1.5.tar.gz#6969b8a8adc4c7f7c5eb1707118f0686" python
--- a/plugins/python-build/share/python-build/3.2
+++ b/plugins/python-build/share/python-build/3.2
@@ -1,5 +1,5 @@
 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-3.2" "http://python.org/ftp/python/3.2/Python-3.2.tgz#5efe838a7878b170f6728d7e5d7517af" standard verify_py32
-install_package "setuptools-2.0" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.0.tar.gz#887cdf417bc5d25326c66bb98c0dd160" python
-install_package "pip-1.4.1" "https://pypi.python.org/packages/source/p/pip/pip-1.4.1.tar.gz#6afbb46aeb48abac658d4df742bff714" python
+install_package "Python-3.2" "http://python.org/ftp/python/3.2/Python-3.2.tgz#5efe838a7878b170f6728d7e5d7517af" ldflags_dirs standard verify_py32
+install_package "setuptools-2.1" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.1.tar.gz#2044725530450d0517393882dc4b7508" python
+install_package "pip-1.5" "https://pypi.python.org/packages/source/p/pip/pip-1.5.tar.gz#6969b8a8adc4c7f7c5eb1707118f0686" python
--- a/plugins/python-build/share/python-build/3.2-dev
+++ b/plugins/python-build/share/python-build/3.2-dev
@@ -1,5 +1,5 @@
 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_hg "Python-3.2-dev" "https://bitbucket.org/mirror/cpython" "3.2" standard verify_py32
-install_package "setuptools-2.0" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.0.tar.gz#887cdf417bc5d25326c66bb98c0dd160" python
-install_package "pip-1.4.1" "https://pypi.python.org/packages/source/p/pip/pip-1.4.1.tar.gz#6afbb46aeb48abac658d4df742bff714" python
+install_package "setuptools-2.1" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.1.tar.gz#2044725530450d0517393882dc4b7508" python
+install_package "pip-1.5" "https://pypi.python.org/packages/source/p/pip/pip-1.5.tar.gz#6969b8a8adc4c7f7c5eb1707118f0686" python
--- a/plugins/python-build/share/python-build/3.2.1
+++ b/plugins/python-build/share/python-build/3.2.1
@@ -1,5 +1,5 @@
 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-3.2.1" "http://python.org/ftp/python/3.2.1/Python-3.2.1.tgz#6c2aa3481cadb7bdf74e625fffc352b2" standard verify_py32
-install_package "setuptools-2.0" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.0.tar.gz#887cdf417bc5d25326c66bb98c0dd160" python
-install_package "pip-1.4.1" "https://pypi.python.org/packages/source/p/pip/pip-1.4.1.tar.gz#6afbb46aeb48abac658d4df742bff714" python
+install_package "Python-3.2.1" "http://python.org/ftp/python/3.2.1/Python-3.2.1.tgz#6c2aa3481cadb7bdf74e625fffc352b2" ldflags_dirs standard verify_py32
+install_package "setuptools-2.1" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.1.tar.gz#2044725530450d0517393882dc4b7508" python
+install_package "pip-1.5" "https://pypi.python.org/packages/source/p/pip/pip-1.5.tar.gz#6969b8a8adc4c7f7c5eb1707118f0686" python
--- a/plugins/python-build/share/python-build/3.2.2
+++ b/plugins/python-build/share/python-build/3.2.2
@@ -1,5 +1,5 @@
 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-3.2.2" "http://python.org/ftp/python/3.2.2/Python-3.2.2.tgz#3c63a6d97333f4da35976b6a0755eb67" standard verify_py32
-install_package "setuptools-2.0" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.0.tar.gz#887cdf417bc5d25326c66bb98c0dd160" python
-install_package "pip-1.4.1" "https://pypi.python.org/packages/source/p/pip/pip-1.4.1.tar.gz#6afbb46aeb48abac658d4df742bff714" python
+install_package "Python-3.2.2" "http://python.org/ftp/python/3.2.2/Python-3.2.2.tgz#3c63a6d97333f4da35976b6a0755eb67" ldflags_dirs standard verify_py32
+install_package "setuptools-2.1" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.1.tar.gz#2044725530450d0517393882dc4b7508" python
+install_package "pip-1.5" "https://pypi.python.org/packages/source/p/pip/pip-1.5.tar.gz#6969b8a8adc4c7f7c5eb1707118f0686" python
--- a/plugins/python-build/share/python-build/3.2.3
+++ b/plugins/python-build/share/python-build/3.2.3
@@ -1,5 +1,5 @@
 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-3.2.3" "http://python.org/ftp/python/3.2.3/Python-3.2.3.tgz#dcf3a738e7028f1deb41b180bf0e2cbc" standard verify_py32
-install_package "setuptools-2.0" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.0.tar.gz#887cdf417bc5d25326c66bb98c0dd160" python
-install_package "pip-1.4.1" "https://pypi.python.org/packages/source/p/pip/pip-1.4.1.tar.gz#6afbb46aeb48abac658d4df742bff714" python
+install_package "Python-3.2.3" "http://python.org/ftp/python/3.2.3/Python-3.2.3.tgz#dcf3a738e7028f1deb41b180bf0e2cbc" ldflags_dirs standard verify_py32
+install_package "setuptools-2.1" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.1.tar.gz#2044725530450d0517393882dc4b7508" python
+install_package "pip-1.5" "https://pypi.python.org/packages/source/p/pip/pip-1.5.tar.gz#6969b8a8adc4c7f7c5eb1707118f0686" python
--- a/plugins/python-build/share/python-build/3.2.4
+++ b/plugins/python-build/share/python-build/3.2.4
@@ -1,5 +1,5 @@
 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-3.2.4" "http://python.org/ftp/python/3.2.4/Python-3.2.4.tgz#3af05758d0bc2b1a27249e8d622c3e91" standard verify_py32
-install_package "setuptools-2.0" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.0.tar.gz#887cdf417bc5d25326c66bb98c0dd160" python
-install_package "pip-1.4.1" "https://pypi.python.org/packages/source/p/pip/pip-1.4.1.tar.gz#6afbb46aeb48abac658d4df742bff714" python
+install_package "Python-3.2.4" "http://python.org/ftp/python/3.2.4/Python-3.2.4.tgz#3af05758d0bc2b1a27249e8d622c3e91" ldflags_dirs standard verify_py32
+install_package "setuptools-2.1" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.1.tar.gz#2044725530450d0517393882dc4b7508" python
+install_package "pip-1.5" "https://pypi.python.org/packages/source/p/pip/pip-1.5.tar.gz#6969b8a8adc4c7f7c5eb1707118f0686" python
--- a/plugins/python-build/share/python-build/3.2.5
+++ b/plugins/python-build/share/python-build/3.2.5
@@ -1,5 +1,5 @@
 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-3.2.5" "http://python.org/ftp/python/3.2.5/Python-3.2.5.tgz#ed8d5529d2aebc36b53f4e0a0c9e6728" standard verify_py32
-install_package "setuptools-2.0" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.0.tar.gz#887cdf417bc5d25326c66bb98c0dd160" python
-install_package "pip-1.4.1" "https://pypi.python.org/packages/source/p/pip/pip-1.4.1.tar.gz#6afbb46aeb48abac658d4df742bff714" python
+install_package "Python-3.2.5" "http://python.org/ftp/python/3.2.5/Python-3.2.5.tgz#ed8d5529d2aebc36b53f4e0a0c9e6728" ldflags_dirs standard verify_py32
+install_package "setuptools-2.1" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.1.tar.gz#2044725530450d0517393882dc4b7508" python
+install_package "pip-1.5" "https://pypi.python.org/packages/source/p/pip/pip-1.5.tar.gz#6969b8a8adc4c7f7c5eb1707118f0686" python
--- a/plugins/python-build/share/python-build/3.3-dev
+++ b/plugins/python-build/share/python-build/3.3-dev
@@ -1,5 +1,5 @@
-require_cc --if has_broken_mac_llvm_gcc "clang"
+require_clang || 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_hg "Python-3.3-dev" "https://bitbucket.org/mirror/cpython" "3.3" standard verify_py33
-install_package "setuptools-2.0" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.0.tar.gz#887cdf417bc5d25326c66bb98c0dd160" python
-install_package "pip-1.4.1" "https://pypi.python.org/packages/source/p/pip/pip-1.4.1.tar.gz#6afbb46aeb48abac658d4df742bff714" python
+install_package "setuptools-2.1" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.1.tar.gz#2044725530450d0517393882dc4b7508" python
+install_package "pip-1.5" "https://pypi.python.org/packages/source/p/pip/pip-1.5.tar.gz#6969b8a8adc4c7f7c5eb1707118f0686" python
--- a/plugins/python-build/share/python-build/3.3.0
+++ b/plugins/python-build/share/python-build/3.3.0
@@ -1,5 +1,5 @@
-require_cc --if has_broken_mac_llvm_gcc "clang"
+require_clang || 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-3.3.0" "http://python.org/ftp/python/3.3.0/Python-3.3.0.tgz#198a64f7a04d1d5e95ce2782d5fd8254" standard verify_py33
-install_package "setuptools-2.0" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.0.tar.gz#887cdf417bc5d25326c66bb98c0dd160" python
-install_package "pip-1.4.1" "https://pypi.python.org/packages/source/p/pip/pip-1.4.1.tar.gz#6afbb46aeb48abac658d4df742bff714" python
+install_package "Python-3.3.0" "http://python.org/ftp/python/3.3.0/Python-3.3.0.tgz#198a64f7a04d1d5e95ce2782d5fd8254" ldflags_dirs standard verify_py33
+install_package "setuptools-2.1" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.1.tar.gz#2044725530450d0517393882dc4b7508" python
+install_package "pip-1.5" "https://pypi.python.org/packages/source/p/pip/pip-1.5.tar.gz#6969b8a8adc4c7f7c5eb1707118f0686" python
--- a/plugins/python-build/share/python-build/3.3.1
+++ b/plugins/python-build/share/python-build/3.3.1
@@ -1,5 +1,5 @@
-require_cc --if has_broken_mac_llvm_gcc "clang"
+require_clang || 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-3.3.1" "http://python.org/ftp/python/3.3.1/Python-3.3.1.tgz#c19bfd6ea252b61779a4f2996fb3b330" standard verify_py33
-install_package "setuptools-2.0" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.0.tar.gz#887cdf417bc5d25326c66bb98c0dd160" python
-install_package "pip-1.4.1" "https://pypi.python.org/packages/source/p/pip/pip-1.4.1.tar.gz#6afbb46aeb48abac658d4df742bff714" python
+install_package "Python-3.3.1" "http://python.org/ftp/python/3.3.1/Python-3.3.1.tgz#c19bfd6ea252b61779a4f2996fb3b330" ldflags_dirs standard verify_py33
+install_package "setuptools-2.1" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.1.tar.gz#2044725530450d0517393882dc4b7508" python
+install_package "pip-1.5" "https://pypi.python.org/packages/source/p/pip/pip-1.5.tar.gz#6969b8a8adc4c7f7c5eb1707118f0686" python
--- a/plugins/python-build/share/python-build/3.3.2
+++ b/plugins/python-build/share/python-build/3.3.2
@@ -1,5 +1,5 @@
-require_cc --if has_broken_mac_llvm_gcc "clang"
+require_clang || 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-3.3.2" "http://python.org/ftp/python/3.3.2/Python-3.3.2.tgz#0a2ea57f6184baf45b150aee53c0c8da" standard verify_py33
-install_package "setuptools-2.0" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.0.tar.gz#887cdf417bc5d25326c66bb98c0dd160" python
-install_package "pip-1.4.1" "https://pypi.python.org/packages/source/p/pip/pip-1.4.1.tar.gz#6afbb46aeb48abac658d4df742bff714" python
+install_package "Python-3.3.2" "http://python.org/ftp/python/3.3.2/Python-3.3.2.tgz#0a2ea57f6184baf45b150aee53c0c8da" ldflags_dirs standard verify_py33
+install_package "setuptools-2.1" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.1.tar.gz#2044725530450d0517393882dc4b7508" python
+install_package "pip-1.5" "https://pypi.python.org/packages/source/p/pip/pip-1.5.tar.gz#6969b8a8adc4c7f7c5eb1707118f0686" python
--- a/plugins/python-build/share/python-build/3.3.3
+++ b/plugins/python-build/share/python-build/3.3.3
@@ -1,5 +1,5 @@
-require_cc --if has_broken_mac_llvm_gcc "clang"
+require_clang || 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-3.3.3" "http://python.org/ftp/python/3.3.3/Python-3.3.3.tgz#831d59212568dc12c95df222865d3441" standard verify_py33
-install_package "setuptools-2.0" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.0.tar.gz#887cdf417bc5d25326c66bb98c0dd160" python
-install_package "pip-1.4.1" "https://pypi.python.org/packages/source/p/pip/pip-1.4.1.tar.gz#6afbb46aeb48abac658d4df742bff714" python
+install_package "Python-3.3.3" "http://python.org/ftp/python/3.3.3/Python-3.3.3.tgz#831d59212568dc12c95df222865d3441" ldflags_dirs standard verify_py33
+install_package "setuptools-2.1" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.1.tar.gz#2044725530450d0517393882dc4b7508" python
+install_package "pip-1.5" "https://pypi.python.org/packages/source/p/pip/pip-1.5.tar.gz#6969b8a8adc4c7f7c5eb1707118f0686" python
--- a/plugins/python-build/share/python-build/3.4-dev
+++ b/plugins/python-build/share/python-build/3.4-dev
@@ -1,5 +1,5 @@
-require_cc --if has_broken_mac_llvm_gcc "clang"
+require_clang || 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_hg "Python-3.4-dev" "https://bitbucket.org/mirror/cpython" "default" standard verify_py34
-install_package "setuptools-2.0" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.0.tar.gz#887cdf417bc5d25326c66bb98c0dd160" python
-install_package "pip-1.4.1" "https://pypi.python.org/packages/source/p/pip/pip-1.4.1.tar.gz#6afbb46aeb48abac658d4df742bff714" python
+install_package "setuptools-2.1" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.1.tar.gz#2044725530450d0517393882dc4b7508" python
+install_package "pip-1.5" "https://pypi.python.org/packages/source/p/pip/pip-1.5.tar.gz#6969b8a8adc4c7f7c5eb1707118f0686" python
--- a/plugins/python-build/share/python-build/3.4.0a2
+++ b/plugins/python-build/share/python-build/3.4.0a2
@@ -1,5 +1,5 @@
-require_cc --if has_broken_mac_llvm_gcc "clang"
+require_clang || 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-3.4.0a2" "http://python.org/ftp/python/3.4.0/Python-3.4.0a2.tgz#e6e81242a32e6f63d224254d24edbd2f" standard verify_py34
-install_package "setuptools-2.0" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.0.tar.gz#887cdf417bc5d25326c66bb98c0dd160" python
-install_package "pip-1.4.1" "https://pypi.python.org/packages/source/p/pip/pip-1.4.1.tar.gz#6afbb46aeb48abac658d4df742bff714" python
+install_package "Python-3.4.0a2" "http://python.org/ftp/python/3.4.0/Python-3.4.0a2.tgz#e6e81242a32e6f63d224254d24edbd2f" ldflags_dirs standard verify_py34
+install_package "setuptools-2.1" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.1.tar.gz#2044725530450d0517393882dc4b7508" python
+install_package "pip-1.5" "https://pypi.python.org/packages/source/p/pip/pip-1.5.tar.gz#6969b8a8adc4c7f7c5eb1707118f0686" python
--- a/plugins/python-build/share/python-build/3.4.0a3
+++ b/plugins/python-build/share/python-build/3.4.0a3
@@ -1,5 +1,5 @@
-require_cc --if has_broken_mac_llvm_gcc "clang"
+require_clang || 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-3.4.0a3" "http://python.org/ftp/python/3.4.0/Python-3.4.0a3.tgz#3598af9717cddd4c346d731913fdfd64" standard verify_py34
-install_package "setuptools-2.0" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.0.tar.gz#887cdf417bc5d25326c66bb98c0dd160" python
-install_package "pip-1.4.1" "https://pypi.python.org/packages/source/p/pip/pip-1.4.1.tar.gz#6afbb46aeb48abac658d4df742bff714" python
+install_package "Python-3.4.0a3" "http://python.org/ftp/python/3.4.0/Python-3.4.0a3.tgz#3598af9717cddd4c346d731913fdfd64" ldflags_dirs standard verify_py34
+install_package "setuptools-2.1" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.1.tar.gz#2044725530450d0517393882dc4b7508" python
+install_package "pip-1.5" "https://pypi.python.org/packages/source/p/pip/pip-1.5.tar.gz#6969b8a8adc4c7f7c5eb1707118f0686" python
--- a/plugins/python-build/share/python-build/3.4.0a4
+++ b/plugins/python-build/share/python-build/3.4.0a4
@@ -1,5 +1,5 @@
-require_cc --if has_broken_mac_llvm_gcc "clang"
+require_clang || 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-3.4.0a4" "http://python.org/ftp/python/3.4.0/Python-3.4.0a4.tgz#f874d97c90130b0249848be889b5e6e1" standard verify_py34
-install_package "setuptools-2.0" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.0.tar.gz#887cdf417bc5d25326c66bb98c0dd160" python
-install_package "pip-1.4.1" "https://pypi.python.org/packages/source/p/pip/pip-1.4.1.tar.gz#6afbb46aeb48abac658d4df742bff714" python
+install_package "Python-3.4.0a4" "http://python.org/ftp/python/3.4.0/Python-3.4.0a4.tgz#f874d97c90130b0249848be889b5e6e1" ldflags_dirs standard verify_py34
+install_package "setuptools-2.1" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.1.tar.gz#2044725530450d0517393882dc4b7508" python
+install_package "pip-1.5" "https://pypi.python.org/packages/source/p/pip/pip-1.5.tar.gz#6969b8a8adc4c7f7c5eb1707118f0686" python
--- a/plugins/python-build/share/python-build/3.4.0b1
+++ b/plugins/python-build/share/python-build/3.4.0b1
@@ -1,5 +1,5 @@
-require_cc --if has_broken_mac_llvm_gcc "clang"
+require_clang || 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-3.4.0b1" "http://python.org/ftp/python/3.4.0/Python-3.4.0b1.tgz#83143a755b8a29a59026c1fdfb8d18fc" standard verify_py34
-install_package "setuptools-2.0" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.0.tar.gz#887cdf417bc5d25326c66bb98c0dd160" python
-install_package "pip-1.4.1" "https://pypi.python.org/packages/source/p/pip/pip-1.4.1.tar.gz#6afbb46aeb48abac658d4df742bff714" python
+install_package "Python-3.4.0b1" "http://python.org/ftp/python/3.4.0/Python-3.4.0b1.tgz#83143a755b8a29a59026c1fdfb8d18fc" ldflags_dirs standard verify_py34
+install_package "setuptools-2.1" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.1.tar.gz#2044725530450d0517393882dc4b7508" python
+install_package "pip-1.5" "https://pypi.python.org/packages/source/p/pip/pip-1.5.tar.gz#6969b8a8adc4c7f7c5eb1707118f0686" python
--- a/plugins/python-build/share/python-build/3.4.0b2
+++ b/plugins/python-build/share/python-build/3.4.0b2
@@ -0,0 +1,5 @@
+require_clang || 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-3.4.0b2" "http://python.org/ftp/python/3.4.0/Python-3.4.0b2.tgz#afe112d6fe595f501f1dcb3627e7b476" ldflags_dirs standard verify_py34
+install_package "setuptools-2.1" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.1.tar.gz#2044725530450d0517393882dc4b7508" python
+install_package "pip-1.5" "https://pypi.python.org/packages/source/p/pip/pip-1.5.tar.gz#6969b8a8adc4c7f7c5eb1707118f0686" python
--- a/plugins/python-build/share/python-build/jython-2.7-beta1
+++ b/plugins/python-build/share/python-build/jython-2.7-beta1
@@ -1,6 +1,6 @@
 require_java
 install_jar "Jython-2.7-beta1" "http://search.maven.org/remotecontent?filepath=org/python/jython-installer/2.7-b1/jython-installer-2.7-b1.jar" jython
-install_package "setuptools-2.0" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.0.tar.gz#887cdf417bc5d25326c66bb98c0dd160" python
+install_package "setuptools-2.1" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.1.tar.gz#2044725530450d0517393882dc4b7508" python
 # pip (>= 1.3) does not work properly since it uses HTTPS for downloads
 # * https://github.com/yyuu/pyenv/issues/15
 install_package "pip-1.2.1" "https://pypi.python.org/packages/source/p/pip/pip-1.2.1.tar.gz#db8a6d8a4564d3dc7f337ebed67b1a85" python
--- a/plugins/python-build/share/python-build/jython-dev
+++ b/plugins/python-build/share/python-build/jython-dev
@@ -1,6 +1,6 @@
 require_java
 install_hg "jython-dev" "http://hg.python.org/jython" "default" jython_builder
-install_package "setuptools-2.0" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.0.tar.gz#887cdf417bc5d25326c66bb98c0dd160" python
+install_package "setuptools-2.1" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.1.tar.gz#2044725530450d0517393882dc4b7508" python
 # pip (>= 1.3) does not work properly since it uses HTTPS for downloads
 # * https://github.com/yyuu/pyenv/issues/15
 install_package "pip-1.2.1" "https://pypi.python.org/packages/source/p/pip/pip-1.2.1.tar.gz#db8a6d8a4564d3dc7f337ebed67b1a85" python
--- a/plugins/python-build/share/python-build/pypy-1.5
+++ b/plugins/python-build/share/python-build/pypy-1.5
@@ -24,5 +24,5 @@ case "$(uname -s)" in
  ;;
 esac

-install_package "setuptools-2.0" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.0.tar.gz#887cdf417bc5d25326c66bb98c0dd160" python
-install_package "pip-1.4.1" "https://pypi.python.org/packages/source/p/pip/pip-1.4.1.tar.gz#6afbb46aeb48abac658d4df742bff714" python
+install_package "setuptools-2.1" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.1.tar.gz#2044725530450d0517393882dc4b7508" python
+install_package "pip-1.5" "https://pypi.python.org/packages/source/p/pip/pip-1.5.tar.gz#6969b8a8adc4c7f7c5eb1707118f0686" python
--- a/plugins/python-build/share/python-build/pypy-1.5-src
+++ b/plugins/python-build/share/python-build/pypy-1.5-src
@@ -1,4 +1,4 @@
 require_gcc
 install_package "pypy-1.5-src" "https://bitbucket.org/pypy/pypy/downloads/pypy-1.5-src.tar.bz2" "pypy_builder" verify_py27
-install_package "setuptools-2.0" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.0.tar.gz#887cdf417bc5d25326c66bb98c0dd160" python
-install_package "pip-1.4.1" "https://pypi.python.org/packages/source/p/pip/pip-1.4.1.tar.gz#6afbb46aeb48abac658d4df742bff714" python
+install_package "setuptools-2.1" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.1.tar.gz#2044725530450d0517393882dc4b7508" python
+install_package "pip-1.5" "https://pypi.python.org/packages/source/p/pip/pip-1.5.tar.gz#6969b8a8adc4c7f7c5eb1707118f0686" python
--- a/plugins/python-build/share/python-build/pypy-1.6
+++ b/plugins/python-build/share/python-build/pypy-1.6
@@ -23,5 +23,5 @@ case "$(uname -s)" in
  ;;
 esac

-install_package "setuptools-2.0" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.0.tar.gz#887cdf417bc5d25326c66bb98c0dd160" python
-install_package "pip-1.4.1" "https://pypi.python.org/packages/source/p/pip/pip-1.4.1.tar.gz#6afbb46aeb48abac658d4df742bff714" python
+install_package "setuptools-2.1" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.1.tar.gz#2044725530450d0517393882dc4b7508" python
+install_package "pip-1.5" "https://pypi.python.org/packages/source/p/pip/pip-1.5.tar.gz#6969b8a8adc4c7f7c5eb1707118f0686" python
--- a/plugins/python-build/share/python-build/pypy-1.7
+++ b/plugins/python-build/share/python-build/pypy-1.7
@@ -24,5 +24,5 @@ case "$(uname -s)" in
  ;;
 esac

-install_package "setuptools-2.0" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.0.tar.gz#887cdf417bc5d25326c66bb98c0dd160" python
-install_package "pip-1.4.1" "https://pypi.python.org/packages/source/p/pip/pip-1.4.1.tar.gz#6afbb46aeb48abac658d4df742bff714" python
+install_package "setuptools-2.1" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.1.tar.gz#2044725530450d0517393882dc4b7508" python
+install_package "pip-1.5" "https://pypi.python.org/packages/source/p/pip/pip-1.5.tar.gz#6969b8a8adc4c7f7c5eb1707118f0686" python
--- a/plugins/python-build/share/python-build/pypy-1.7-dev
+++ b/plugins/python-build/share/python-build/pypy-1.7-dev
@@ -1,4 +1,4 @@
 require_gcc
 install_hg "pypy-1.7-dev" "https://bitbucket.org/pypy/pypy" "release-1.7.x" "pypy_builder" verify_py27
-install_package "setuptools-2.0" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.0.tar.gz#887cdf417bc5d25326c66bb98c0dd160" python
-install_package "pip-1.4.1" "https://pypi.python.org/packages/source/p/pip/pip-1.4.1.tar.gz#6afbb46aeb48abac658d4df742bff714" python
+install_package "setuptools-2.1" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.1.tar.gz#2044725530450d0517393882dc4b7508" python
+install_package "pip-1.5" "https://pypi.python.org/packages/source/p/pip/pip-1.5.tar.gz#6969b8a8adc4c7f7c5eb1707118f0686" python
--- a/plugins/python-build/share/python-build/pypy-1.8
+++ b/plugins/python-build/share/python-build/pypy-1.8
@@ -24,5 +24,5 @@ case "$(uname -s)" in
  ;;
 esac

-install_package "setuptools-2.0" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.0.tar.gz#887cdf417bc5d25326c66bb98c0dd160" python
-install_package "pip-1.4.1" "https://pypi.python.org/packages/source/p/pip/pip-1.4.1.tar.gz#6afbb46aeb48abac658d4df742bff714" python
+install_package "setuptools-2.1" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.1.tar.gz#2044725530450d0517393882dc4b7508" python
+install_package "pip-1.5" "https://pypi.python.org/packages/source/p/pip/pip-1.5.tar.gz#6969b8a8adc4c7f7c5eb1707118f0686" python
--- a/plugins/python-build/share/python-build/pypy-1.8-dev
+++ b/plugins/python-build/share/python-build/pypy-1.8-dev
@@ -1,4 +1,4 @@
 require_gcc
 install_hg "pypy-1.8-dev" "https://bitbucket.org/pypy/pypy" "release-1.8.x" "pypy_builder" verify_py27
-install_package "setuptools-2.0" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.0.tar.gz#887cdf417bc5d25326c66bb98c0dd160" python
-install_package "pip-1.4.1" "https://pypi.python.org/packages/source/p/pip/pip-1.4.1.tar.gz#6afbb46aeb48abac658d4df742bff714" python
+install_package "setuptools-2.1" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.1.tar.gz#2044725530450d0517393882dc4b7508" python
+install_package "pip-1.5" "https://pypi.python.org/packages/source/p/pip/pip-1.5.tar.gz#6969b8a8adc4c7f7c5eb1707118f0686" python
--- a/plugins/python-build/share/python-build/pypy-1.9
+++ b/plugins/python-build/share/python-build/pypy-1.9
@@ -24,5 +24,5 @@ case "$(uname -s)" in
  ;;
 esac

-install_package "setuptools-2.0" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.0.tar.gz#887cdf417bc5d25326c66bb98c0dd160" python
-install_package "pip-1.4.1" "https://pypi.python.org/packages/source/p/pip/pip-1.4.1.tar.gz#6afbb46aeb48abac658d4df742bff714" python
+install_package "setuptools-2.1" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.1.tar.gz#2044725530450d0517393882dc4b7508" python
+install_package "pip-1.5" "https://pypi.python.org/packages/source/p/pip/pip-1.5.tar.gz#6969b8a8adc4c7f7c5eb1707118f0686" python
--- a/plugins/python-build/share/python-build/pypy-1.9-dev
+++ b/plugins/python-build/share/python-build/pypy-1.9-dev
@@ -1,4 +1,4 @@
 require_gcc
 install_hg "pypy-1.9-dev" "https://bitbucket.org/pypy/pypy" "release-1.9.x" "pypy_builder" verify_py27
-install_package "setuptools-2.0" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.0.tar.gz#887cdf417bc5d25326c66bb98c0dd160" python
-install_package "pip-1.4.1" "https://pypi.python.org/packages/source/p/pip/pip-1.4.1.tar.gz#6afbb46aeb48abac658d4df742bff714" python
+install_package "setuptools-2.1" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.1.tar.gz#2044725530450d0517393882dc4b7508" python
+install_package "pip-1.5" "https://pypi.python.org/packages/source/p/pip/pip-1.5.tar.gz#6969b8a8adc4c7f7c5eb1707118f0686" python
--- a/plugins/python-build/share/python-build/pypy-2.0
+++ b/plugins/python-build/share/python-build/pypy-2.0
@@ -29,5 +29,5 @@ case "$(uname -s)" in
  ;;
 esac

-install_package "setuptools-2.0" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.0.tar.gz#887cdf417bc5d25326c66bb98c0dd160" python
-install_package "pip-1.4.1" "https://pypi.python.org/packages/source/p/pip/pip-1.4.1.tar.gz#6afbb46aeb48abac658d4df742bff714" python
+install_package "setuptools-2.1" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.1.tar.gz#2044725530450d0517393882dc4b7508" python
+install_package "pip-1.5" "https://pypi.python.org/packages/source/p/pip/pip-1.5.tar.gz#6969b8a8adc4c7f7c5eb1707118f0686" python
--- a/plugins/python-build/share/python-build/pypy-2.0-dev
+++ b/plugins/python-build/share/python-build/pypy-2.0-dev
@@ -1,4 +1,4 @@
 require_gcc
 install_hg "pypy-2.0-dev" "https://bitbucket.org/pypy/pypy" "release-2.0.x" "pypy_builder" verify_py27
-install_package "setuptools-2.0" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.0.tar.gz#887cdf417bc5d25326c66bb98c0dd160" python
-install_package "pip-1.4.1" "https://pypi.python.org/packages/source/p/pip/pip-1.4.1.tar.gz#6afbb46aeb48abac658d4df742bff714" python
+install_package "setuptools-2.1" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.1.tar.gz#2044725530450d0517393882dc4b7508" python
+install_package "pip-1.5" "https://pypi.python.org/packages/source/p/pip/pip-1.5.tar.gz#6969b8a8adc4c7f7c5eb1707118f0686" python
--- a/plugins/python-build/share/python-build/pypy-2.0-src
+++ b/plugins/python-build/share/python-build/pypy-2.0-src
@@ -1,4 +1,4 @@
 require_gcc
 install_package "pypy-2.0-src" "https://bitbucket.org/pypy/pypy/downloads/pypy-2.0-src.tar.bz2#4dc82e2240dd2b5be313119672988538" "pypy_builder" verify_py27
-install_package "setuptools-2.0" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.0.tar.gz#887cdf417bc5d25326c66bb98c0dd160" python
-install_package "pip-1.4.1" "https://pypi.python.org/packages/source/p/pip/pip-1.4.1.tar.gz#6afbb46aeb48abac658d4df742bff714" python
+install_package "setuptools-2.1" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.1.tar.gz#2044725530450d0517393882dc4b7508" python
+install_package "pip-1.5" "https://pypi.python.org/packages/source/p/pip/pip-1.5.tar.gz#6969b8a8adc4c7f7c5eb1707118f0686" python
--- a/plugins/python-build/share/python-build/pypy-2.0.1
+++ b/plugins/python-build/share/python-build/pypy-2.0.1
@@ -23,5 +23,5 @@ case "$(uname -s)" in
  ;;
 esac

-install_package "setuptools-2.0" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.0.tar.gz#887cdf417bc5d25326c66bb98c0dd160" python
-install_package "pip-1.4.1" "https://pypi.python.org/packages/source/p/pip/pip-1.4.1.tar.gz#6afbb46aeb48abac658d4df742bff714" python
+install_package "setuptools-2.1" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.1.tar.gz#2044725530450d0517393882dc4b7508" python
+install_package "pip-1.5" "https://pypi.python.org/packages/source/p/pip/pip-1.5.tar.gz#6969b8a8adc4c7f7c5eb1707118f0686" python
--- a/plugins/python-build/share/python-build/pypy-2.0.1-src
+++ b/plugins/python-build/share/python-build/pypy-2.0.1-src
@@ -1,4 +1,4 @@
 require_gcc
 install_package "pypy-2.0.1-src" "https://bitbucket.org/pypy/pypy/downloads/pypy-2.0.1-src.tar.bz2#34072be1eeb63f9d37cf387e58aae81d" "pypy_builder" verify_py27
-install_package "setuptools-2.0" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.0.tar.gz#887cdf417bc5d25326c66bb98c0dd160" python
-install_package "pip-1.4.1" "https://pypi.python.org/packages/source/p/pip/pip-1.4.1.tar.gz#6afbb46aeb48abac658d4df742bff714" python
+install_package "setuptools-2.1" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.1.tar.gz#2044725530450d0517393882dc4b7508" python
+install_package "pip-1.5" "https://pypi.python.org/packages/source/p/pip/pip-1.5.tar.gz#6969b8a8adc4c7f7c5eb1707118f0686" python
--- a/plugins/python-build/share/python-build/pypy-2.0.2
+++ b/plugins/python-build/share/python-build/pypy-2.0.2
@@ -23,5 +23,5 @@ case "$(uname -s)" in
  ;;
 esac

-install_package "setuptools-2.0" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.0.tar.gz#887cdf417bc5d25326c66bb98c0dd160" python
-install_package "pip-1.4.1" "https://pypi.python.org/packages/source/p/pip/pip-1.4.1.tar.gz#6afbb46aeb48abac658d4df742bff714" python
+install_package "setuptools-2.1" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.1.tar.gz#2044725530450d0517393882dc4b7508" python
+install_package "pip-1.5" "https://pypi.python.org/packages/source/p/pip/pip-1.5.tar.gz#6969b8a8adc4c7f7c5eb1707118f0686" python
--- a/plugins/python-build/share/python-build/pypy-2.0.2-src
+++ b/plugins/python-build/share/python-build/pypy-2.0.2-src
@@ -1,4 +1,4 @@
 require_gcc
 install_package "pypy-2.0.2-src" "https://bitbucket.org/pypy/pypy/downloads/pypy-2.0.2-src.tar.bz2#c26662e348159b460057548ddaf35333" "pypy_builder" verify_py27
-install_package "setuptools-2.0" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.0.tar.gz#887cdf417bc5d25326c66bb98c0dd160" python
-install_package "pip-1.4.1" "https://pypi.python.org/packages/source/p/pip/pip-1.4.1.tar.gz#6afbb46aeb48abac658d4df742bff714" python
+install_package "setuptools-2.1" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.1.tar.gz#2044725530450d0517393882dc4b7508" python
+install_package "pip-1.5" "https://pypi.python.org/packages/source/p/pip/pip-1.5.tar.gz#6969b8a8adc4c7f7c5eb1707118f0686" python
--- a/plugins/python-build/share/python-build/pypy-2.1
+++ b/plugins/python-build/share/python-build/pypy-2.1
@@ -29,5 +29,5 @@ case "$(uname -s)" in
  ;;
 esac

-install_package "setuptools-2.0" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.0.tar.gz#887cdf417bc5d25326c66bb98c0dd160" python
-install_package "pip-1.4.1" "https://pypi.python.org/packages/source/p/pip/pip-1.4.1.tar.gz#6afbb46aeb48abac658d4df742bff714" python
+install_package "setuptools-2.1" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.1.tar.gz#2044725530450d0517393882dc4b7508" python
+install_package "pip-1.5" "https://pypi.python.org/packages/source/p/pip/pip-1.5.tar.gz#6969b8a8adc4c7f7c5eb1707118f0686" python
--- a/plugins/python-build/share/python-build/pypy-2.1-src
+++ b/plugins/python-build/share/python-build/pypy-2.1-src
@@ -1,4 +1,4 @@
 require_gcc
 install_package "pypy-2.1-src" "https://bitbucket.org/pypy/pypy/downloads/pypy-2.1-src.tar.bz2#7c43cd95aa37a7f0ca2465ed930646c0" "pypy_builder" verify_py27
-install_package "setuptools-2.0" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.0.tar.gz#887cdf417bc5d25326c66bb98c0dd160" python
-install_package "pip-1.4.1" "https://pypi.python.org/packages/source/p/pip/pip-1.4.1.tar.gz#6afbb46aeb48abac658d4df742bff714" python
+install_package "setuptools-2.1" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.1.tar.gz#2044725530450d0517393882dc4b7508" python
+install_package "pip-1.5" "https://pypi.python.org/packages/source/p/pip/pip-1.5.tar.gz#6969b8a8adc4c7f7c5eb1707118f0686" python
--- a/plugins/python-build/share/python-build/pypy-2.2
+++ b/plugins/python-build/share/python-build/pypy-2.2
@@ -29,5 +29,5 @@ case "$(uname -s)" in
  ;;
 esac

-install_package "setuptools-2.0" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.0.tar.gz#887cdf417bc5d25326c66bb98c0dd160" python
-install_package "pip-1.4.1" "https://pypi.python.org/packages/source/p/pip/pip-1.4.1.tar.gz#6afbb46aeb48abac658d4df742bff714" python
+install_package "setuptools-2.1" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.1.tar.gz#2044725530450d0517393882dc4b7508" python
+install_package "pip-1.5" "https://pypi.python.org/packages/source/p/pip/pip-1.5.tar.gz#6969b8a8adc4c7f7c5eb1707118f0686" python
--- a/plugins/python-build/share/python-build/pypy-2.2-src
+++ b/plugins/python-build/share/python-build/pypy-2.2-src
@@ -1,4 +1,4 @@
 require_gcc
 install_package "pypy-2.2-src" "https://bitbucket.org/pypy/pypy/downloads/pypy-2.2-src.tar.bz2#5a5a3822605d7d811066b1b279da3c6e" "pypy_builder" verify_py27
-install_package "setuptools-2.0" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.0.tar.gz#887cdf417bc5d25326c66bb98c0dd160" python
-install_package "pip-1.4.1" "https://pypi.python.org/packages/source/p/pip/pip-1.4.1.tar.gz#6afbb46aeb48abac658d4df742bff714" python
+install_package "setuptools-2.1" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.1.tar.gz#2044725530450d0517393882dc4b7508" python
+install_package "pip-1.5" "https://pypi.python.org/packages/source/p/pip/pip-1.5.tar.gz#6969b8a8adc4c7f7c5eb1707118f0686" python
--- a/plugins/python-build/share/python-build/pypy-2.2.1
+++ b/plugins/python-build/share/python-build/pypy-2.2.1
@@ -29,5 +29,5 @@ case "$(uname -s)" in
  ;;
 esac

-install_package "setuptools-2.0" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.0.tar.gz#887cdf417bc5d25326c66bb98c0dd160" python
-install_package "pip-1.4.1" "https://pypi.python.org/packages/source/p/pip/pip-1.4.1.tar.gz#6afbb46aeb48abac658d4df742bff714" python
+install_package "setuptools-2.1" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.1.tar.gz#2044725530450d0517393882dc4b7508" python
+install_package "pip-1.5" "https://pypi.python.org/packages/source/p/pip/pip-1.5.tar.gz#6969b8a8adc4c7f7c5eb1707118f0686" python
--- a/plugins/python-build/share/python-build/pypy-2.2.1-src
+++ b/plugins/python-build/share/python-build/pypy-2.2.1-src
@@ -1,4 +1,4 @@
 require_gcc
 install_package "pypy-2.2.1-src" "https://bitbucket.org/pypy/pypy/downloads/pypy-2.2.1-src.tar.bz2#7ec9f48702323f9e93654ba73dd46720" "pypy_builder" verify_py27
-install_package "setuptools-2.0" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.0.tar.gz#887cdf417bc5d25326c66bb98c0dd160" python
-install_package "pip-1.4.1" "https://pypi.python.org/packages/source/p/pip/pip-1.4.1.tar.gz#6afbb46aeb48abac658d4df742bff714" python
+install_package "setuptools-2.1" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.1.tar.gz#2044725530450d0517393882dc4b7508" python
+install_package "pip-1.5" "https://pypi.python.org/packages/source/p/pip/pip-1.5.tar.gz#6969b8a8adc4c7f7c5eb1707118f0686" python
--- a/plugins/python-build/share/python-build/pypy-dev
+++ b/plugins/python-build/share/python-build/pypy-dev
@@ -1,4 +1,4 @@
 require_gcc
 install_hg "pypy-dev" "https://bitbucket.org/pypy/pypy" "default" "pypy_builder" verify_py27
-install_package "setuptools-2.0" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.0.tar.gz#887cdf417bc5d25326c66bb98c0dd160" python
-install_package "pip-1.4.1" "https://pypi.python.org/packages/source/p/pip/pip-1.4.1.tar.gz#6afbb46aeb48abac658d4df742bff714" python
+install_package "setuptools-2.1" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.1.tar.gz#2044725530450d0517393882dc4b7508" python
+install_package "pip-1.5" "https://pypi.python.org/packages/source/p/pip/pip-1.5.tar.gz#6969b8a8adc4c7f7c5eb1707118f0686" python
--- a/plugins/python-build/share/python-build/pypy3-2.1-beta1
+++ b/plugins/python-build/share/python-build/pypy3-2.1-beta1
@@ -29,5 +29,5 @@ case "$(uname -s)" in
  ;;
 esac

-install_package "setuptools-2.0" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.0.tar.gz#887cdf417bc5d25326c66bb98c0dd160" python
-install_package "pip-1.4.1" "https://pypi.python.org/packages/source/p/pip/pip-1.4.1.tar.gz#6afbb46aeb48abac658d4df742bff714" python
+install_package "setuptools-2.1" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.1.tar.gz#2044725530450d0517393882dc4b7508" python
+install_package "pip-1.5" "https://pypi.python.org/packages/source/p/pip/pip-1.5.tar.gz#6969b8a8adc4c7f7c5eb1707118f0686" python
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Yamashita Yuu	38eb9fe948	v0.4.0-20140110	2014-01-10 11:27:43 +09:00
Yamashita Yuu	6ee7aaf611	Should not recognize `cc` as `clang`	2014-01-09 18:18:50 +09:00
Yamashita Yuu	93ba3a4c51	Use same `require_gcc` as ruby-build	2014-01-08 22:34:10 +09:00
Yamashita Yuu	34087d03ec	Add build status badge	2014-01-08 21:47:36 +09:00
Yamashita Yuu	f136b219db	Update pip (1.4.1 -> 1.5)	2014-01-08 21:44:19 +09:00
Yamashita Yuu	84705cfe61	Update setuptools (2.0.2 -> 2.1)	2014-01-08 21:42:59 +09:00
Yamashita Yuu	2a9f6038e0	Use `package_option()` to setup configure options	2014-01-08 11:49:48 +09:00
Yamashita Yuu	0e3e603429	Don't check `$(uname -s)` twice	2014-01-08 10:56:43 +09:00
Yamashita Yuu	71a916faf2	simplicy the check for infinite loop	2014-01-08 10:54:11 +09:00
Yamashita Yuu	8e02b93e39	Call `build_package_ldflags_dirs` to suppress linker warnings	2014-01-07 12:46:40 +09:00
Yamashita Yuu	a7a99c75eb	Apply patch only if there are patches exist for the package	2014-01-07 11:52:22 +09:00
Yamashita Yuu	bb3b5de179	Add CPython 3.4.0b2	2014-01-06 13:03:40 +09:00
Yamashita Yuu	f956502fd8	Merge branch 'avoid-infinite-loop-even-if-pwd-returns-relative-path'	2014-01-03 08:36:05 +09:00
Yamashita Yuu	4c5ffc8d99	Avoid infinite loop in case where `pwd` returns relative path The `pwd` may return relative path if the `$PWD` is badly declared in bash/zsh (e.g. `PWD="." bash`). To avoid the infinite loop in `find_local_version_file()`, stop finding the version file if the target paths are same consecutively.	2014-01-03 08:35:39 +09:00
Yamashita Yuu	8dc4e8d6f8	Revert "Merge branch 'golang-workaround'" This reverts commit `7edceff71c`, reversing changes made to `5dea3c9e63`.	2014-01-03 07:39:52 +09:00
Yamashita Yuu	7edceff71c	Merge branch 'golang-workaround'	2014-01-03 06:23:03 +09:00
Yamashita Yuu	1587d8a03c	Apply readlink to output from `pwd` may returns "." to get actual path	2014-01-03 05:07:21 +09:00
Yamashita Yuu	5dea3c9e63	Import changes from recent rbenv	2014-01-03 04:58:44 +09:00
Yamashita Yuu	12d4fdb307	Merge branch 'unittest' (#21 )	2014-01-03 04:43:44 +09:00
Yamashita Yuu	319721b380	Modify applications and versions for Python	2014-01-03 04:41:23 +09:00
Yamashita Yuu	3dd9332eee	Fix broken tests	2014-01-03 04:33:30 +09:00
Yamashita Yuu	88922e2bc0	Remove `version-ext-compat` plugin to make test success	2014-01-03 02:07:20 +09:00
Yamashita Yuu	0965577b93	Import tests from rbenv with `sed -e s/rbenv/pyenv/g`	2014-01-03 02:06:36 +09:00
Yamashita Yuu	f538169992	Restore OLDIFS expectedly	2014-01-03 01:47:10 +09:00
Yamashita Yuu	d03f290b5d	s/rbenv/pyenv/	2014-01-02 22:49:23 +09:00
Yamashita Yuu	8ddf8760d5	Import recent changes from rbenv 0.4.0	2014-01-02 22:45:02 +09:00
Yamashita Yuu	8fa6b4a184	CPython installer requires existing Pyhthon of similar version.	2013-11-19 18:02:59 +09:00
Yamashita Yuu	e1a5b326e4	Merge branch 'ruby-build-style-patching'	2014-01-01 13:01:34 +09:00
Yamashita Yuu	8892f3735d	Use `-p0` for all patches to keep things simple (sstephenson/ruby-build#484 ) There is filterdiff(1) available to transform strip level of a patch if optional level is required. ``` git diff HEAD^ \| filterdiff --strip=1 \| pyenv install -p 3.3.3 ```	2014-01-01 12:25:17 +09:00
Yamashita Yuu	9eedd4ef84	Update setuptools (2.0.1 -> 2.0.2)	2013-12-31 22:19:22 +09:00
Yamashita Yuu	b70dcb9f2d	Add `list_patches()` to sort patches by their names	2013-12-26 16:31:43 +09:00
Yamashita Yuu	008a5a1ff9	Force `PYTHON_BUILD_PATCH_PATH` to be absolute path	2013-12-26 16:30:16 +09:00
Yamashita Yuu	5b7eb42a9f	Add `-p0` as an option for patch if both `PATCH_OPTS` and `PACKAGE_PATCH_OPTS` aren't defined	2013-12-26 15:44:56 +09:00
Yamashita Yuu	35d4cd2259	Remove `PACKAGE_PATCH_STRIP`. Use `PACKAGE_PATCH_OPTS` instead.	2013-12-26 14:01:46 +09:00
Yamashita Yuu	5bff9c773a	Reliably detect parent shell in `pyenv init` (fixes #93 ) Imported changes from sstephenson/rbenv#453.	2013-12-26 13:48:43 +09:00
Yamashita Yuu	6efb3c327f	Revert setuptools version for jython-2.7-beta1 (2.0.1 -> 2.0) Could not install setuptools 2.0.1 for jython-2.7-beta1 by the lack of `parser` module.	2013-12-25 20:42:11 +09:00
Yamashita Yuu	1a05d9a8cd	Merge branch 'apply-extra-patches'	2013-12-21 01:06:13 +09:00
Yamashita Yuu	df51c13323	Use `cp -RPp` to copy share directories recursively. We have some patches for CPython in `share/python-build/patches`.	2013-12-21 01:04:19 +09:00
Yamashita Yuu	a025866bac	Update setuptools (2.0 -> 2.0.1)	2013-12-21 00:50:28 +09:00
Yamashita Yuu	2797f3d80e	Update README about `PYTHON_PATCH_PATH`.	2013-12-21 00:36:32 +09:00
Yamashita Yuu	0d85193f39	Remove `-Wl,-rpath=...` from `LDFLAGS` on Darwin to fix build. We don't need to set `rpath` explicitly because the ld on Darwin embeds the full paths to each dylib by default	2013-12-20 20:37:47 +09:00
Yamashita Yuu	4d534fed31	Merge branch 'enable-shared'	2013-12-20 18:36:42 +09:00
Yamashita Yuu	43212f64ed	Pass rpath to linker if `--enable-shared` was given (#65 , #66 , #82 )	2013-12-20 18:22:43 +09:00
Yamashita Yuu	75559df89d	Search extra patches from given directory then apply it during build (#91 ) ``` $ env PYTHON_PATCH_PATH="./patches" PYTHON_PATCH_OPTS="-p1" pyenv install 2.7.6 ```	2013-12-20 17:17:17 +09:00
Yamashita Yuu	3d5156ed1d	v0.4.0-20131217	2013-12-17 11:46:44 +09:00
Yamashita Yuu	aa76fd2f9c	On Darwin, should not build readline if there is brewed readline	2013-12-16 16:27:45 +09:00
Yamashita Yuu	db141f66a4	Restored `has_broken_mac_llvm_gcc` which is required to build 3.3+ on Darwin	2013-12-16 16:24:25 +09:00
Yamashita Yuu	4953fa4034	Apply built-in patches only if patch is not given via STDIN	2013-11-19 05:58:21 +09:00
Yamashita Yuu	1f76effbfb	Import changes from ruby-build v20131225.1	2013-12-27 18:44:54 +09:00