v0.4.0-20131216

Fix pyenv-prefix to trim "/bin" in `pyenv prefix system`

CHANGELOG.md

@@ -1,5 +1,14 @@
 ## Version History
 
+#### 0.4.0-20131216
+
+* python-build: Add new CPython releases; 3.3.3 (#80)
+* python-build: Add new CPython releases candidates; 3.4.0b1
+* python-build: Add new PyPy releases; pypy-2.2.1, pypy-2.2.1-src
+* python-build: Update default setuptools version (1.3.2 -> 2.0)
+* python-build: Imported recent changes from ruby-build v20131211
+* pyenv: Fix pyenv-prefix to trim "/bin" in `pyenv prefix system` (#88)
+
 #### 0.4.0-20131116
 
 * python-build: Add new CPython releases; 2.6.9, 2.7.6 (#76)

README.md

@@ -183,6 +183,8 @@ to the `pyenv` command-line utility.
    **NOTE** If you need to pass configure option to build, please use
    ```CONFIGURE_OPTS``` environment variable.
    
+   **NOTE** If you are having trouble installing a python version please visit the wiki page about [Common Build Problems](https://github.com/yyuu/pyenv/wiki/Common-build-problems)
+
 6. Rebuild the shim binaries. You should do this any time you install
    a new Python binary (for example, when installing a new Python version,
    or when installing a package that provides a binary).

libexec/pyenv---version

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

libexec/pyenv-prefix

@@ -31,7 +31,7 @@ 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%/*}"
+    PYENV_PREFIX_PATH="${PYTHON_PATH%/bin/*}"
   else
     PYENV_PREFIX_PATH="${PYENV_ROOT}/versions/${version}"
   fi

plugins/python-build/bin/python-build

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-PYTHON_BUILD_VERSION="20131030"
+PYTHON_BUILD_VERSION="20131211"
 
 set -E
 exec 3<&2 # preserve original stderr at fd 3
@@ -101,7 +101,7 @@ num_cpu_cores() {
   if [ "Darwin" = "$(uname -s)" ]; then
     num="$(sysctl -n hw.ncpu 2>/dev/null || true)"
   elif [ -r /proc/cpuinfo ]; then
-    num="$(grep -c ^processor /proc/cpuinfo)"
+    num="$(grep ^processor /proc/cpuinfo | wc -l)"
     [ "$num" -gt 0 ] || num=""
   fi
   echo "${num:-2}"
@@ -535,6 +535,8 @@ build_package_standard() {
   local PACKAGE_MAKE_OPTS_ARRAY="${package_var_name}_MAKE_OPTS_ARRAY[@]"
   local PACKAGE_CFLAGS="${package_var_name}_CFLAGS"
 
+  [ "$package_var_name" = "PYTHON" ] && use_homebrew_readline || true
+
   ( if [ "${CFLAGS+defined}" ] || [ "${!PACKAGE_CFLAGS+defined}" ]; then
       export CFLAGS="$CFLAGS ${!PACKAGE_CFLAGS}"
     fi
@@ -553,6 +555,13 @@ build_package_autoconf() {
   } >&4 2>&1
 }
 
+build_package_ruby() {
+  local package_name="$1"
+
+  { "$RUBY_BIN" setup.rb
+  } >&4 2>&1
+}
+
 build_package_python() {
   local package_name="$1"
 
@@ -560,6 +569,101 @@ build_package_python() {
   } >&4 2>&1
 }
 
+build_package_ree_installer() {
+  build_package_auto_tcltk
+
+  local options=""
+  if [[ "Darwin" = "$(uname)" ]]; then
+    options="--no-tcmalloc"
+  fi
+
+  local option
+  for option in $RUBY_CONFIGURE_OPTS ${RUBY_CONFIGURE_OPTS_ARRAY[@]}; do
+    options="$options -c $option"
+  done
+
+  # Work around install_useful_libraries crash with --dont-install-useful-gems
+  mkdir -p "$PREFIX_PATH/lib/ruby/gems/1.8/gems"
+
+  { ./installer --auto "$PREFIX_PATH" --dont-install-useful-gems $options $CONFIGURE_OPTS
+  } >&4 2>&1
+}
+
+build_package_rbx() {
+  local package_name="$1"
+
+  { bundle --path=vendor/bundle
+    RUBYOPT="-rubygems $RUBYOPT" ./configure --prefix="$PREFIX_PATH" $RUBY_CONFIGURE_OPTS
+    rake install
+    fix_rbx_gem_binstubs "$PREFIX_PATH"
+    fix_rbx_irb "$PREFIX_PATH"
+  } >&4 2>&1
+}
+
+build_package_mruby() {
+  local package_name="$1"
+
+  { rake
+    mkdir -p "$PREFIX_PATH"
+    cp -fR build/host/* "$PREFIX_PATH"
+    cd "$PREFIX_PATH/bin"
+    ln -fs mruby ruby
+    ln -fs mirb irb
+  } >&4 2>&1
+}
+
+build_package_maglev() {
+  build_package_copy
+
+  { cd "${PREFIX_PATH}"
+    ./install.sh
+    cd "${PREFIX_PATH}/bin"
+    echo "Creating symlink for ruby*"
+    ln -fs maglev-ruby ruby
+    echo "Creating symlink for irb*"
+    ln -fs maglev-irb irb
+  } >&4 2>&1
+  echo
+  echo "Run 'maglev start' to start up the stone before using 'ruby' or 'irb'"
+}
+
+build_package_topaz() {
+  build_package_copy
+  { cd "${PREFIX_PATH}/bin"
+    echo "Creating symlink for ruby*"
+    ln -fs topaz ruby
+  } >&4 2>&1
+}
+
+topaz_architecture() {
+  case "$(uname -s)" in
+  "Darwin") echo "osx64";;
+  "Linux") [[ "$(uname -m)" = "x86_64" ]] && echo "linux64" || echo "linux32";;
+  *)
+    echo "no nightly builds available" >&2
+    exit 1;;
+  esac
+}
+
+build_package_jruby() {
+  build_package_copy
+  cd "${PREFIX_PATH}/bin"
+  ln -fs jruby ruby
+  install_jruby_launcher
+  remove_windows_files
+}
+
+install_jruby_launcher() {
+  cd "${PREFIX_PATH}/bin"
+  { ./ruby gem install jruby-launcher
+  } >&4 2>&1
+}
+
+remove_windows_files() {
+  cd "$PREFIX_PATH"
+  rm -f bin/*.exe bin/*.dll bin/*.bat bin/jruby.sh
+}
+
 build_package_jython() {
   build_package_copy
   { if [ -x "${PREFIX_PATH}/bin/jython" ] && [ ! -x "${PREFIX_PATH}/bin/python" ]; then
@@ -615,6 +719,31 @@ fix_directory_permissions() {
   find "$PREFIX_PATH" -type d \( -perm -020 -o -perm -002 \) -exec chmod go-w {} \;
 }
 
+fix_rbx_gem_binstubs() {
+  local prefix="$1"
+  local gemdir="${prefix}/gems/bin"
+  local bindir="${prefix}/bin"
+  local file binstub
+  # Symlink Rubinius' `gems/bin/` into `bin/`
+  if [ -d "$gemdir" ]; then
+    for file in "$gemdir"/*; do
+      binstub="${bindir}/${file##*/}"
+      rm -f "$binstub"
+      sed -E "s:^#\!.+:#\!${bindir}/ruby:" < "$file" > "$binstub"
+      chmod +x "$binstub"
+    done
+    rm -rf "$gemdir"
+    ln -s ../bin "$gemdir"
+  fi
+}
+
+fix_rbx_irb() {
+  local prefix="$1"
+  "${prefix}/bin/irb" --version &>/dev/null ||
+    "${prefix}/bin/gem" install rubysl-tracer -v '~> 2.0' --no-rdoc --no-ri &>/dev/null ||
+    true
+}
+
 require_gcc() {
   require_cc "gcc"
 }
@@ -776,6 +905,49 @@ verify_java() {
   echo "$java"
 }
 
+needs_yaml() {
+  [[ "$RUBY_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"
+  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"
+    }
+  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
+}
+
 has_broken_mac_openssl() {
   [ "$(uname -s)" = "Darwin" ] &&
   [[ "$(openssl version 2>/dev/null || true)" = "OpenSSL 0.9.8"?* ]] &&
@@ -821,6 +993,15 @@ build_package_mac_openssl() {
   security find-certificate -a -p /System/Library/Keychains/SystemRootCertificates.keychain >> "$pem_file"
 }
 
+# Post-install check that the openssl extension was built.
+build_package_verify_openssl() {
+  "$RUBY_BIN" -e 'begin
+    require "openssl"
+  rescue LoadError
+    abort "The Ruby openssl extension was not compiled. Missing the OpenSSL lib?"
+  end' >&4 2>&1
+}
+
 # Ensure that directories listed in LDFLAGS exist
 build_package_ldflags_dirs() {
   local arg
@@ -831,38 +1012,46 @@ build_package_ldflags_dirs() {
   done
 }
 
-has_broken_mac_readline() {
-  [ "$(uname -s)" = "Darwin" ] &&
-  _has_broken_mac_readline &&
-  ! use_homebrew_readline
-}
-
-_has_broken_mac_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"
+build_package_auto_tcltk() {
+  if [ "Darwin" = "$(uname -s)" ] && [ ! -d /usr/include/X11 ]; then
+    if [ -d /opt/X11/include ]; then
+      if [[ "$CPPFLAGS" != *-I/opt/X11/include* ]]; then
+        export CPPFLAGS="-I/opt/X11/include $CPPFLAGS"
       fi
-  return "$retval"
-}
-
-use_homebrew_readline() {
-  local rldir="$(brew --prefix readline 2>/dev/null || true)"
-  if [ -d "$rldir" ]; then
-    CPPFLAGS="-I$rldir/include $CPPFLAGS"
-    LDFLAGS="-L$rldir/lib $LDFLAGS"
     else
-    return 1
+      package_option ruby configure --without-tk
+    fi
   fi
 }
 
-has_broken_mac_llvm_gcc() {
-  [ "$(uname -s)" = "Darwin" ] &&
-  [[ "$(gcc --version 2>/dev/null || true)" == *"llvm-gcc-4.2"* ]]
+rake() {
+  if [ -e "./Gemfile" ]; then
+    bundle exec rake "$@"
+  else
+    isolated_gem_dependency "rake --version" rake -v '~> 10.1.0'
+    command rake "$@"
+  fi
+}
+
+bundle() {
+  isolated_gem_dependency "bundle --version" bundler -v '~> 1.3.5'
+  command bundle "$@"
+}
+
+isolated_gem_dependency() {
+  set +E
+  ( command $1 &>/dev/null ) || {
+    set -E
+    shift 1
+    isolated_gem_install "$@"
+  }
+  set -E
+}
+
+isolated_gem_install() {
+  export GEM_HOME="${PWD}/.gem"
+  export PATH="${GEM_HOME}/bin:${PATH}"
+  gem install "$@"
 }
 
 build_package_verify_python() {
@@ -1142,8 +1331,8 @@ if [ -n "$VERBOSE" ]; then
   trap "kill $TAIL_PID" SIGINT SIGTERM EXIT
 fi
 
-export LDFLAGS="-L'${PREFIX_PATH}/lib' ${LDFLAGS}"
-export CPPFLAGS="-I'${PREFIX_PATH}/include' ${CPPFLAGS}"
+export LDFLAGS="-L${PREFIX_PATH}/lib ${LDFLAGS}"
+export CPPFLAGS="-I${PREFIX_PATH}/include ${CPPFLAGS}"
 
 unset PYTHONHOME
 unset PYTHONPATH

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://www.python.org/ftp/python/2.4/Python-2.4.tgz#149ad508f936eccf669d52682cf8e606" standard verify_py24
-install_package "setuptools-1.3.2" "https://pypi.python.org/packages/source/s/setuptools/setuptools-1.3.2.tar.gz#441f2e58c0599d31597622a7b9eb605f" python
+install_package "Python-2.4" "http://python.org/ftp/python/2.4/Python-2.4.tgz#149ad508f936eccf669d52682cf8e606" 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

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://www.python.org/ftp/python/2.4.1/Python-2.4.1.tgz#7bb2416a4f421c3452d306694d3efbba" standard verify_py24
-install_package "setuptools-1.3.2" "https://pypi.python.org/packages/source/s/setuptools/setuptools-1.3.2.tar.gz#441f2e58c0599d31597622a7b9eb605f" python
+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 "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

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://www.python.org/ftp/python/2.4.2/Python-2.4.2.tgz#07cfc759546f6723bb367be5b1ce9875" standard verify_py24
-install_package "setuptools-1.3.2" "https://pypi.python.org/packages/source/s/setuptools/setuptools-1.3.2.tar.gz#441f2e58c0599d31597622a7b9eb605f" python
+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 "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

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://www.python.org/ftp/python/2.4.3/Python-2.4.3.tgz#edf994473a8c1a963aaa71e442b285b7" standard verify_py24
-install_package "setuptools-1.3.2" "https://pypi.python.org/packages/source/s/setuptools/setuptools-1.3.2.tar.gz#441f2e58c0599d31597622a7b9eb605f" python
+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 "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

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://www.python.org/ftp/python/2.4.4/Python-2.4.4.tgz#82d000617baaef269ad5795c595fdc58" standard verify_py24
-install_package "setuptools-1.3.2" "https://pypi.python.org/packages/source/s/setuptools/setuptools-1.3.2.tar.gz#441f2e58c0599d31597622a7b9eb605f" python
+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 "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

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://www.python.org/ftp/python/2.4.5/Python-2.4.5.tgz#750b652bfdd12675e102bbe25e5e9893" standard verify_py24
-install_package "setuptools-1.3.2" "https://pypi.python.org/packages/source/s/setuptools/setuptools-1.3.2.tar.gz#441f2e58c0599d31597622a7b9eb605f" python
+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 "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

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://www.python.org/ftp/python/2.4.6/Python-2.4.6.tgz#7564b2b142b1b8345cd5358b7aaaa482" standard verify_py24
-install_package "setuptools-1.3.2" "https://pypi.python.org/packages/source/s/setuptools/setuptools-1.3.2.tar.gz#441f2e58c0599d31597622a7b9eb605f" python
+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 "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

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://www.python.org/ftp/python/2.5/Python-2.5.tgz#bc1b74f90a472a6c0a85481aaeb43f95" standard verify_py25
-install_package "setuptools-1.3.2" "https://pypi.python.org/packages/source/s/setuptools/setuptools-1.3.2.tar.gz#441f2e58c0599d31597622a7b9eb605f" python
+install_package "Python-2.5" "http://python.org/ftp/python/2.5/Python-2.5.tgz#bc1b74f90a472a6c0a85481aaeb43f95" 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

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://www.python.org/ftp/python/2.5.1/Python-2.5.1.tgz#cca695828df8adc3e69b637af07522e1" standard verify_py25
-install_package "setuptools-1.3.2" "https://pypi.python.org/packages/source/s/setuptools/setuptools-1.3.2.tar.gz#441f2e58c0599d31597622a7b9eb605f" python
+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 "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

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://www.python.org/ftp/python/2.5.2/Python-2.5.2.tgz#3f7ca8aa86c6bd275426d63b46e07992" standard verify_py25
-install_package "setuptools-1.3.2" "https://pypi.python.org/packages/source/s/setuptools/setuptools-1.3.2.tar.gz#441f2e58c0599d31597622a7b9eb605f" python
+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 "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

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://www.python.org/ftp/python/2.5.3/Python-2.5.3.tgz#a971f8928d6beb31ae0de56f7034d6a2" standard verify_py25
-install_package "setuptools-1.3.2" "https://pypi.python.org/packages/source/s/setuptools/setuptools-1.3.2.tar.gz#441f2e58c0599d31597622a7b9eb605f" python
+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 "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

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://www.python.org/ftp/python/2.5.4/Python-2.5.4.tgz#ad47b23778f64edadaaa8b5534986eed" standard verify_py25
-install_package "setuptools-1.3.2" "https://pypi.python.org/packages/source/s/setuptools/setuptools-1.3.2.tar.gz#441f2e58c0599d31597622a7b9eb605f" python
+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 "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

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://www.python.org/ftp/python/2.5.5/Python-2.5.5.tgz#abc02139ca38f4258e8e372f7da05c88" standard verify_py25
-install_package "setuptools-1.3.2" "https://pypi.python.org/packages/source/s/setuptools/setuptools-1.3.2.tar.gz#441f2e58c0599d31597622a7b9eb605f" python
+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 "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

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://www.python.org/ftp/python/2.5.6/Python-2.5.6.tgz#d1d9c83928561addf11d00b22a18ca50" standard verify_py25
-install_package "setuptools-1.3.2" "https://pypi.python.org/packages/source/s/setuptools/setuptools-1.3.2.tar.gz#441f2e58c0599d31597622a7b9eb605f" python
+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 "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

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-1.3.2" "https://pypi.python.org/packages/source/s/setuptools/setuptools-1.3.2.tar.gz#441f2e58c0599d31597622a7b9eb605f" python
+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

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://www.python.org/ftp/python/2.6.6/Python-2.6.6.tgz#b2f209df270a33315e62c1ffac1937f0" standard verify_py26
-install_package "setuptools-1.3.2" "https://pypi.python.org/packages/source/s/setuptools/setuptools-1.3.2.tar.gz#441f2e58c0599d31597622a7b9eb605f" python
+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

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://www.python.org/ftp/python/2.6.7/Python-2.6.7.tgz#af474f85a3af69ea50438a2a48039d7d" standard verify_py26
-install_package "setuptools-1.3.2" "https://pypi.python.org/packages/source/s/setuptools/setuptools-1.3.2.tar.gz#441f2e58c0599d31597622a7b9eb605f" python
+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

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://www.python.org/ftp/python/2.6.8/Python-2.6.8.tgz#f6c1781f5d73ab7dfa5181f43ea065f6" standard verify_py26
-install_package "setuptools-1.3.2" "https://pypi.python.org/packages/source/s/setuptools/setuptools-1.3.2.tar.gz#441f2e58c0599d31597622a7b9eb605f" python
+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

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://www.python.org/ftp/python/2.6.9/Python-2.6.9.tgz#bddbd64bf6f5344fc55bbe49a72fe4f3" standard verify_py26
-install_package "setuptools-1.3.2" "https://pypi.python.org/packages/source/s/setuptools/setuptools-1.3.2.tar.gz#441f2e58c0599d31597622a7b9eb605f" python
+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

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://www.python.org/ftp/python/2.7/Python-2.7.tgz#35f56b092ecf39a6bd59d64f142aae0f" standard verify_py27
-install_package "setuptools-1.3.2" "https://pypi.python.org/packages/source/s/setuptools/setuptools-1.3.2.tar.gz#441f2e58c0599d31597622a7b9eb605f" python
+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

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-1.3.2" "https://pypi.python.org/packages/source/s/setuptools/setuptools-1.3.2.tar.gz#441f2e58c0599d31597622a7b9eb605f" python
+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

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://www.python.org/ftp/python/2.7.1/Python-2.7.1.tgz#15ed56733655e3fab785e49a7278d2fb" standard verify_py27
-install_package "setuptools-1.3.2" "https://pypi.python.org/packages/source/s/setuptools/setuptools-1.3.2.tar.gz#441f2e58c0599d31597622a7b9eb605f" python
+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

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://www.python.org/ftp/python/2.7.2/Python-2.7.2.tgz#0ddfe265f1b3d0a8c2459f5bf66894c7" standard verify_py27
-install_package "setuptools-1.3.2" "https://pypi.python.org/packages/source/s/setuptools/setuptools-1.3.2.tar.gz#441f2e58c0599d31597622a7b9eb605f" python
+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

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://www.python.org/ftp/python/2.7.3/Python-2.7.3.tgz#2cf641732ac23b18d139be077bd906cd" standard verify_py27
-install_package "setuptools-1.3.2" "https://pypi.python.org/packages/source/s/setuptools/setuptools-1.3.2.tar.gz#441f2e58c0599d31597622a7b9eb605f" python
+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

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://www.python.org/ftp/python/2.7.4/Python-2.7.4.tgz#592603cfaf4490a980e93ecb92bde44a" standard verify_py27
-install_package "setuptools-1.3.2" "https://pypi.python.org/packages/source/s/setuptools/setuptools-1.3.2.tar.gz#441f2e58c0599d31597622a7b9eb605f" python
+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

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://www.python.org/ftp/python/2.7.5/Python-2.7.5.tgz#b4f01a1d0ba0b46b05c73b2ac909b1df" standard verify_py27
-install_package "setuptools-1.3.2" "https://pypi.python.org/packages/source/s/setuptools/setuptools-1.3.2.tar.gz#441f2e58c0599d31597622a7b9eb605f" python
+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

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://www.python.org/ftp/python/2.7.6/Python-2.7.6.tgz#1d8728eb0dfcac72a0fd99c17ec7f386" standard verify_py27
-install_package "setuptools-1.3.2" "https://pypi.python.org/packages/source/s/setuptools/setuptools-1.3.2.tar.gz#441f2e58c0599d31597622a7b9eb605f" python
+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

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://www.python.org/ftp/python/3.0.1/Python-3.0.1.tgz#220b73f0a1a20c4b1cdf9f9db4cd52fe" standard verify_py30
-install_package "setuptools-1.3.2" "https://pypi.python.org/packages/source/s/setuptools/setuptools-1.3.2.tar.gz#441f2e58c0599d31597622a7b9eb605f" python
+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

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-1.3.2" "https://pypi.python.org/packages/source/s/setuptools/setuptools-1.3.2.tar.gz#441f2e58c0599d31597622a7b9eb605f" python
+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

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://www.python.org/ftp/python/3.1.3/Python-3.1.3.tgz#d797fa6abe82c21227e328f05a535424" standard verify_py31
-install_package "setuptools-1.3.2" "https://pypi.python.org/packages/source/s/setuptools/setuptools-1.3.2.tar.gz#441f2e58c0599d31597622a7b9eb605f" python
+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

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://www.python.org/ftp/python/3.1.4/Python-3.1.4.tgz#fa9f8efdc63944c8393870282e8b5c35" standard verify_py31
-install_package "setuptools-1.3.2" "https://pypi.python.org/packages/source/s/setuptools/setuptools-1.3.2.tar.gz#441f2e58c0599d31597622a7b9eb605f" python
+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

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://www.python.org/ftp/python/3.1.5/Python-3.1.5.tgz#02196d3fc7bc76bdda68aa36b0dd16ab" standard verify_py31
-install_package "setuptools-1.3.2" "https://pypi.python.org/packages/source/s/setuptools/setuptools-1.3.2.tar.gz#441f2e58c0599d31597622a7b9eb605f" python
+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

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://www.python.org/ftp/python/3.2/Python-3.2.tgz#5efe838a7878b170f6728d7e5d7517af" standard verify_py32
-install_package "setuptools-1.3.2" "https://pypi.python.org/packages/source/s/setuptools/setuptools-1.3.2.tar.gz#441f2e58c0599d31597622a7b9eb605f" python
+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

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-1.3.2" "https://pypi.python.org/packages/source/s/setuptools/setuptools-1.3.2.tar.gz#441f2e58c0599d31597622a7b9eb605f" python
+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

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://www.python.org/ftp/python/3.2.1/Python-3.2.1.tgz#6c2aa3481cadb7bdf74e625fffc352b2" standard verify_py32
-install_package "setuptools-1.3.2" "https://pypi.python.org/packages/source/s/setuptools/setuptools-1.3.2.tar.gz#441f2e58c0599d31597622a7b9eb605f" python
+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

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://www.python.org/ftp/python/3.2.2/Python-3.2.2.tgz#3c63a6d97333f4da35976b6a0755eb67" standard verify_py32
-install_package "setuptools-1.3.2" "https://pypi.python.org/packages/source/s/setuptools/setuptools-1.3.2.tar.gz#441f2e58c0599d31597622a7b9eb605f" python
+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

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://www.python.org/ftp/python/3.2.3/Python-3.2.3.tgz#dcf3a738e7028f1deb41b180bf0e2cbc" standard verify_py32
-install_package "setuptools-1.3.2" "https://pypi.python.org/packages/source/s/setuptools/setuptools-1.3.2.tar.gz#441f2e58c0599d31597622a7b9eb605f" python
+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

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://www.python.org/ftp/python/3.2.4/Python-3.2.4.tgz#3af05758d0bc2b1a27249e8d622c3e91" standard verify_py32
-install_package "setuptools-1.3.2" "https://pypi.python.org/packages/source/s/setuptools/setuptools-1.3.2.tar.gz#441f2e58c0599d31597622a7b9eb605f" python
+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

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://www.python.org/ftp/python/3.2.5/Python-3.2.5.tgz#ed8d5529d2aebc36b53f4e0a0c9e6728" standard verify_py32
-install_package "setuptools-1.3.2" "https://pypi.python.org/packages/source/s/setuptools/setuptools-1.3.2.tar.gz#441f2e58c0599d31597622a7b9eb605f" python
+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

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

@@ -1,5 +1,5 @@
 require_cc --if has_broken_mac_llvm_gcc "clang"
 install_package "readline-6.2" "http://ftpmirror.gnu.org/readline/readline-6.2.tar.gz#67948acb2ca081f23359d0256e9a271c" standard --if has_broken_mac_readline
 install_hg "Python-3.3-dev" "https://bitbucket.org/mirror/cpython" "3.3" standard verify_py33
-install_package "setuptools-1.3.2" "https://pypi.python.org/packages/source/s/setuptools/setuptools-1.3.2.tar.gz#441f2e58c0599d31597622a7b9eb605f" python
+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

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

@@ -1,5 +1,5 @@
 require_cc --if has_broken_mac_llvm_gcc "clang"
 install_package "readline-6.2" "http://ftpmirror.gnu.org/readline/readline-6.2.tar.gz#67948acb2ca081f23359d0256e9a271c" standard --if has_broken_mac_readline
 install_package "Python-3.3.0" "http://python.org/ftp/python/3.3.0/Python-3.3.0.tgz#198a64f7a04d1d5e95ce2782d5fd8254" standard verify_py33
-install_package "setuptools-1.3.2" "https://pypi.python.org/packages/source/s/setuptools/setuptools-1.3.2.tar.gz#441f2e58c0599d31597622a7b9eb605f" python
+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

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

@@ -1,5 +1,5 @@
 require_cc --if has_broken_mac_llvm_gcc "clang"
 install_package "readline-6.2" "http://ftpmirror.gnu.org/readline/readline-6.2.tar.gz#67948acb2ca081f23359d0256e9a271c" standard --if has_broken_mac_readline
 install_package "Python-3.3.1" "http://python.org/ftp/python/3.3.1/Python-3.3.1.tgz#c19bfd6ea252b61779a4f2996fb3b330" standard verify_py33
-install_package "setuptools-1.3.2" "https://pypi.python.org/packages/source/s/setuptools/setuptools-1.3.2.tar.gz#441f2e58c0599d31597622a7b9eb605f" python
+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

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

@@ -1,5 +1,5 @@
 require_cc --if has_broken_mac_llvm_gcc "clang"
 install_package "readline-6.2" "http://ftpmirror.gnu.org/readline/readline-6.2.tar.gz#67948acb2ca081f23359d0256e9a271c" standard --if has_broken_mac_readline
 install_package "Python-3.3.2" "http://python.org/ftp/python/3.3.2/Python-3.3.2.tgz#0a2ea57f6184baf45b150aee53c0c8da" standard verify_py33
-install_package "setuptools-1.3.2" "https://pypi.python.org/packages/source/s/setuptools/setuptools-1.3.2.tar.gz#441f2e58c0599d31597622a7b9eb605f" python
+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

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

@@ -1,5 +1,5 @@
 require_cc --if has_broken_mac_llvm_gcc "clang"
 install_package "readline-6.2" "http://ftpmirror.gnu.org/readline/readline-6.2.tar.gz#67948acb2ca081f23359d0256e9a271c" standard --if has_broken_mac_readline
-install_package "Python-3.3.3rc1" "http://python.org/ftp/python/3.3.3/Python-3.3.3rc1.tgz#f91e09aa838743f7243f8ebfa7e7368c" standard verify_py33
-install_package "setuptools-1.3.2" "https://pypi.python.org/packages/source/s/setuptools/setuptools-1.3.2.tar.gz#441f2e58c0599d31597622a7b9eb605f" python
+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

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

@@ -1,5 +1,5 @@
 require_cc --if has_broken_mac_llvm_gcc "clang"
 install_package "readline-6.2" "http://ftpmirror.gnu.org/readline/readline-6.2.tar.gz#67948acb2ca081f23359d0256e9a271c" standard --if has_broken_mac_readline
 install_hg "Python-3.4-dev" "https://bitbucket.org/mirror/cpython" "default" standard verify_py34
-install_package "setuptools-1.3.2" "https://pypi.python.org/packages/source/s/setuptools/setuptools-1.3.2.tar.gz#441f2e58c0599d31597622a7b9eb605f" python
+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

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

@@ -1,5 +1,5 @@
 require_cc --if has_broken_mac_llvm_gcc "clang"
 install_package "readline-6.2" "http://ftpmirror.gnu.org/readline/readline-6.2.tar.gz#67948acb2ca081f23359d0256e9a271c" standard --if has_broken_mac_readline
 install_package "Python-3.4.0a2" "http://python.org/ftp/python/3.4.0/Python-3.4.0a2.tgz#e6e81242a32e6f63d224254d24edbd2f" standard verify_py34
-install_package "setuptools-1.3.2" "https://pypi.python.org/packages/source/s/setuptools/setuptools-1.3.2.tar.gz#441f2e58c0599d31597622a7b9eb605f" python
+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

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

@@ -1,5 +1,5 @@
 require_cc --if has_broken_mac_llvm_gcc "clang"
 install_package "readline-6.2" "http://ftpmirror.gnu.org/readline/readline-6.2.tar.gz#67948acb2ca081f23359d0256e9a271c" standard --if has_broken_mac_readline
 install_package "Python-3.4.0a3" "http://python.org/ftp/python/3.4.0/Python-3.4.0a3.tgz#3598af9717cddd4c346d731913fdfd64" standard verify_py34
-install_package "setuptools-1.3.2" "https://pypi.python.org/packages/source/s/setuptools/setuptools-1.3.2.tar.gz#441f2e58c0599d31597622a7b9eb605f" python
+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

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

@@ -1,5 +1,5 @@
 require_cc --if has_broken_mac_llvm_gcc "clang"
 install_package "readline-6.2" "http://ftpmirror.gnu.org/readline/readline-6.2.tar.gz#67948acb2ca081f23359d0256e9a271c" standard --if has_broken_mac_readline
 install_package "Python-3.4.0a4" "http://python.org/ftp/python/3.4.0/Python-3.4.0a4.tgz#f874d97c90130b0249848be889b5e6e1" standard verify_py34
-install_package "setuptools-1.3.2" "https://pypi.python.org/packages/source/s/setuptools/setuptools-1.3.2.tar.gz#441f2e58c0599d31597622a7b9eb605f" python
+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

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

@@ -1,5 +1,5 @@
 require_cc --if has_broken_mac_llvm_gcc "clang"
 install_package "readline-6.2" "http://ftpmirror.gnu.org/readline/readline-6.2.tar.gz#67948acb2ca081f23359d0256e9a271c" standard --if has_broken_mac_readline
-install_package "Python-3.3.3rc2" "http://python.org/ftp/python/3.3.3/Python-3.3.3rc2.tgz#64c3f7cf6832edf86f796b66689f7184" standard verify_py33
-install_package "setuptools-1.3.2" "https://pypi.python.org/packages/source/s/setuptools/setuptools-1.3.2.tar.gz#441f2e58c0599d31597622a7b9eb605f" python
+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

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

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

plugins/python-build/share/python-build/jython-2.5.2

@@ -1,6 +1,6 @@
 require_java
 install_jar "Jython-2.5.2" "https://downloads.sourceforge.net/project/jython/jython/2.5.2/jython_installer-2.5.2.jar#7c7d9abd8985df480edeacd27ed9dcd5" jython
-install_package "setuptools-1.3.2" "https://pypi.python.org/packages/source/s/setuptools/setuptools-1.3.2.tar.gz#441f2e58c0599d31597622a7b9eb605f" python
+install_package "setuptools-1.4.2" "https://pypi.python.org/packages/source/s/setuptools/setuptools-1.4.2.tar.gz#13951be6711438073fbe50843e7f141f" python
 # pip (>= 1.3) does not work properly since it uses HTTPS for downloads
 # * https://github.com/yyuu/pyenv/issues/15
 install_package "pip-1.2.1" "https://pypi.python.org/packages/source/p/pip/pip-1.2.1.tar.gz#db8a6d8a4564d3dc7f337ebed67b1a85" python

plugins/python-build/share/python-build/jython-2.5.3

@@ -1,6 +1,6 @@
 require_java
 install_jar "Jython-2.5.3" "http://search.maven.org/remotecontent?filepath=org/python/jython-installer/2.5.3/jython-installer-2.5.3.jar#41633b4557483d6d4237ee79ffcebe7b" jython
-install_package "setuptools-1.3.2" "https://pypi.python.org/packages/source/s/setuptools/setuptools-1.3.2.tar.gz#441f2e58c0599d31597622a7b9eb605f" python
+install_package "setuptools-1.4.2" "https://pypi.python.org/packages/source/s/setuptools/setuptools-1.4.2.tar.gz#13951be6711438073fbe50843e7f141f" python
 # pip (>= 1.3) does not work properly since it uses HTTPS for downloads
 # * https://github.com/yyuu/pyenv/issues/15
 install_package "pip-1.2.1" "https://pypi.python.org/packages/source/p/pip/pip-1.2.1.tar.gz#db8a6d8a4564d3dc7f337ebed67b1a85" python

plugins/python-build/share/python-build/jython-2.5.4-rc1

@@ -1,6 +1,6 @@
 require_java
 install_jar "Jython-2.5.4-rc1" "http://search.maven.org/remotecontent?filepath=org/python/jython-installer/2.5.4-rc1/jython-installer-2.5.4-rc1.jar#1be8d75d02886ce1a8542bb794a20db2" jython
-install_package "setuptools-1.3.2" "https://pypi.python.org/packages/source/s/setuptools/setuptools-1.3.2.tar.gz#441f2e58c0599d31597622a7b9eb605f" python
+install_package "setuptools-1.4.2" "https://pypi.python.org/packages/source/s/setuptools/setuptools-1.4.2.tar.gz#13951be6711438073fbe50843e7f141f" python
 # pip (>= 1.3) does not work properly since it uses HTTPS for downloads
 # * https://github.com/yyuu/pyenv/issues/15
 install_package "pip-1.2.1" "https://pypi.python.org/packages/source/p/pip/pip-1.2.1.tar.gz#db8a6d8a4564d3dc7f337ebed67b1a85" python

plugins/python-build/share/python-build/jython-2.7-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-1.3.2" "https://pypi.python.org/packages/source/s/setuptools/setuptools-1.3.2.tar.gz#441f2e58c0599d31597622a7b9eb605f" python
+install_package "setuptools-2.0" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.0.tar.gz#887cdf417bc5d25326c66bb98c0dd160" python
 # pip (>= 1.3) does not work properly since it uses HTTPS for downloads
 # * https://github.com/yyuu/pyenv/issues/15
 install_package "pip-1.2.1" "https://pypi.python.org/packages/source/p/pip/pip-1.2.1.tar.gz#db8a6d8a4564d3dc7f337ebed67b1a85" python

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

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

plugins/python-build/share/python-build/patches/2.6-dev/Python-2.6-dev/001_openssl_no_ssl2.patch

@@ -1,77 +0,0 @@
-diff -r -u ./Lib/ssl.py ../Python-2.6.8/Lib/ssl.py
---- ./Lib/ssl.py	2012-04-11 00:32:06.000000000 +0900
-+++ ../Python-2.6.8/Lib/ssl.py	2013-05-08 19:44:49.000000000 +0900
-@@ -61,7 +61,19 @@
- 
- from _ssl import SSLError
- from _ssl import CERT_NONE, CERT_OPTIONAL, CERT_REQUIRED
--from _ssl import PROTOCOL_SSLv2, PROTOCOL_SSLv3, PROTOCOL_SSLv23, PROTOCOL_TLSv1
-+from _ssl import PROTOCOL_SSLv3, PROTOCOL_SSLv23, PROTOCOL_TLSv1
-+_PROTOCOL_NAMES = {
-+    PROTOCOL_TLSv1: "TLSv1",
-+    PROTOCOL_SSLv23: "SSLv23",
-+    PROTOCOL_SSLv3: "SSLv3",
-+}
-+try:
-+    from _ssl import PROTOCOL_SSLv2
-+    _SSLv2_IF_EXISTS = PROTOCOL_SSLv2
-+except ImportError:
-+    _SSLv2_IF_EXISTS = None
-+else:
-+    _PROTOCOL_NAMES[PROTOCOL_SSLv2] = "SSLv2"
- from _ssl import RAND_status, RAND_egd, RAND_add
- from _ssl import \
-      SSL_ERROR_ZERO_RETURN, \
-@@ -402,16 +414,7 @@
-     return DER_cert_to_PEM_cert(dercert)
- 
- def get_protocol_name(protocol_code):
--    if protocol_code == PROTOCOL_TLSv1:
--        return "TLSv1"
--    elif protocol_code == PROTOCOL_SSLv23:
--        return "SSLv23"
--    elif protocol_code == PROTOCOL_SSLv2:
--        return "SSLv2"
--    elif protocol_code == PROTOCOL_SSLv3:
--        return "SSLv3"
--    else:
--        return "<unknown>"
-+    return _PROTOCOL_NAMES.get(protocol_code, '<unknown>')
- 
- 
- # a replacement for the old socket.ssl function
-diff -r -u ./Modules/_ssl.c ../Python-2.6.8/Modules/_ssl.c
---- ./Modules/_ssl.c	2012-04-11 00:32:09.000000000 +0900
-+++ ../Python-2.6.8/Modules/_ssl.c	2013-05-08 17:34:38.000000000 +0900
-@@ -62,7 +62,9 @@
- };
- 
- enum py_ssl_version {
-+#ifndef OPENSSL_NO_SSL2
-     PY_SSL_VERSION_SSL2,
-+#endif
-     PY_SSL_VERSION_SSL3,
-     PY_SSL_VERSION_SSL23,
-     PY_SSL_VERSION_TLS1
-@@ -302,8 +304,10 @@
-         self->ctx = SSL_CTX_new(TLSv1_method()); /* Set up context */
-     else if (proto_version == PY_SSL_VERSION_SSL3)
-         self->ctx = SSL_CTX_new(SSLv3_method()); /* Set up context */
-+#ifndef OPENSSL_NO_SSL2
-     else if (proto_version == PY_SSL_VERSION_SSL2)
-         self->ctx = SSL_CTX_new(SSLv2_method()); /* Set up context */
-+#endif
-     else if (proto_version == PY_SSL_VERSION_SSL23)
-         self->ctx = SSL_CTX_new(SSLv23_method()); /* Set up context */
-     PySSL_END_ALLOW_THREADS
-@@ -1688,8 +1692,10 @@
-                             PY_SSL_CERT_REQUIRED);
- 
-     /* protocol versions */
-+#ifndef OPENSSL_NO_SSL2
-     PyModule_AddIntConstant(m, "PROTOCOL_SSLv2",
-                             PY_SSL_VERSION_SSL2);
-+#endif
-     PyModule_AddIntConstant(m, "PROTOCOL_SSLv3",
-                             PY_SSL_VERSION_SSL3);
-     PyModule_AddIntConstant(m, "PROTOCOL_SSLv23",

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

@@ -24,5 +24,5 @@ case "$(uname -s)" in
   ;;
 esac
 
-install_package "setuptools-1.3.2" "https://pypi.python.org/packages/source/s/setuptools/setuptools-1.3.2.tar.gz#441f2e58c0599d31597622a7b9eb605f" python
+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

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-1.3.2" "https://pypi.python.org/packages/source/s/setuptools/setuptools-1.3.2.tar.gz#441f2e58c0599d31597622a7b9eb605f" python
+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

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

@@ -23,5 +23,5 @@ case "$(uname -s)" in
   ;;
 esac
 
-install_package "setuptools-1.3.2" "https://pypi.python.org/packages/source/s/setuptools/setuptools-1.3.2.tar.gz#441f2e58c0599d31597622a7b9eb605f" python
+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

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

@@ -24,5 +24,5 @@ case "$(uname -s)" in
   ;;
 esac
 
-install_package "setuptools-1.3.2" "https://pypi.python.org/packages/source/s/setuptools/setuptools-1.3.2.tar.gz#441f2e58c0599d31597622a7b9eb605f" python
+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

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-1.3.2" "https://pypi.python.org/packages/source/s/setuptools/setuptools-1.3.2.tar.gz#441f2e58c0599d31597622a7b9eb605f" python
+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

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

@@ -24,5 +24,5 @@ case "$(uname -s)" in
   ;;
 esac
 
-install_package "setuptools-1.3.2" "https://pypi.python.org/packages/source/s/setuptools/setuptools-1.3.2.tar.gz#441f2e58c0599d31597622a7b9eb605f" python
+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

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-1.3.2" "https://pypi.python.org/packages/source/s/setuptools/setuptools-1.3.2.tar.gz#441f2e58c0599d31597622a7b9eb605f" python
+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

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

@@ -24,5 +24,5 @@ case "$(uname -s)" in
   ;;
 esac
 
-install_package "setuptools-1.3.2" "https://pypi.python.org/packages/source/s/setuptools/setuptools-1.3.2.tar.gz#441f2e58c0599d31597622a7b9eb605f" python
+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

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-1.3.2" "https://pypi.python.org/packages/source/s/setuptools/setuptools-1.3.2.tar.gz#441f2e58c0599d31597622a7b9eb605f" python
+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

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

@@ -29,5 +29,5 @@ case "$(uname -s)" in
   ;;
 esac
 
-install_package "setuptools-1.3.2" "https://pypi.python.org/packages/source/s/setuptools/setuptools-1.3.2.tar.gz#441f2e58c0599d31597622a7b9eb605f" python
+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

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-1.3.2" "https://pypi.python.org/packages/source/s/setuptools/setuptools-1.3.2.tar.gz#441f2e58c0599d31597622a7b9eb605f" python
+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

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-1.3.2" "https://pypi.python.org/packages/source/s/setuptools/setuptools-1.3.2.tar.gz#441f2e58c0599d31597622a7b9eb605f" python
+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

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

@@ -23,5 +23,5 @@ case "$(uname -s)" in
   ;;
 esac
 
-install_package "setuptools-1.3.2" "https://pypi.python.org/packages/source/s/setuptools/setuptools-1.3.2.tar.gz#441f2e58c0599d31597622a7b9eb605f" python
+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

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-1.3.2" "https://pypi.python.org/packages/source/s/setuptools/setuptools-1.3.2.tar.gz#441f2e58c0599d31597622a7b9eb605f" python
+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

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

@@ -23,5 +23,5 @@ case "$(uname -s)" in
   ;;
 esac
 
-install_package "setuptools-1.3.2" "https://pypi.python.org/packages/source/s/setuptools/setuptools-1.3.2.tar.gz#441f2e58c0599d31597622a7b9eb605f" python
+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

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-1.3.2" "https://pypi.python.org/packages/source/s/setuptools/setuptools-1.3.2.tar.gz#441f2e58c0599d31597622a7b9eb605f" python
+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

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

@@ -29,5 +29,5 @@ case "$(uname -s)" in
   ;;
 esac
 
-install_package "setuptools-1.3.2" "https://pypi.python.org/packages/source/s/setuptools/setuptools-1.3.2.tar.gz#441f2e58c0599d31597622a7b9eb605f" python
+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

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-1.3.2" "https://pypi.python.org/packages/source/s/setuptools/setuptools-1.3.2.tar.gz#441f2e58c0599d31597622a7b9eb605f" python
+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

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

@@ -29,5 +29,5 @@ case "$(uname -s)" in
   ;;
 esac
 
-install_package "setuptools-1.3.2" "https://pypi.python.org/packages/source/s/setuptools/setuptools-1.3.2.tar.gz#441f2e58c0599d31597622a7b9eb605f" python
+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

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-1.3.2" "https://pypi.python.org/packages/source/s/setuptools/setuptools-1.3.2.tar.gz#441f2e58c0599d31597622a7b9eb605f" python
+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

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

@@ -0,0 +1,33 @@
+case "$(uname -s)" in
+"Darwin" )
+  install_package "pypy-2.2.1-osx64" "https://bitbucket.org/pypy/pypy/downloads/pypy-2.2.1-osx64.tar.bz2#040cd25e95f62242c41e9d4e1e1c1166" "pypy" verify_py27
+  ;;
+"Linux" )
+  case "$(uname -m)" in
+  "armel" )
+    install_package "pypy-2.2.1-linux-armel" "https://bitbucket.org/pypy/pypy/downloads/pypy-2.2.1-linux-armel.tar.bz2#0127094c36f985f6c2b4ed82be3fb6c8" "pypy" verify_py27
+  ;;
+  "armhf" )
+    install_package "pypy-2.2.1-linux-armhf-raring" "https://bitbucket.org/pypy/pypy/downloads/pypy-2.2.1-linux-armhf-raring.tar.bz2#278e0ceb961bd0f49af53a01301601d4" "pypy" verify_py27
+  ;;
+  "i386" | "i486" | "i586" | "i686" | "i786" )
+    install_package "pypy-2.2.1-linux" "https://bitbucket.org/pypy/pypy/downloads/pypy-2.2.1-linux.tar.bz2#86ef92a13faf309f4f413e35c01afcab" "pypy" verify_py27
+  ;;
+  "x86_64" )
+    install_package "pypy-2.2.1-linux64" "https://bitbucket.org/pypy/pypy/downloads/pypy-2.2.1-linux64.tar.bz2#96732d12957fa3c8e58ded2939631e5f" "pypy" verify_py27
+  esac
+  ;;
+"CYGWIN"* | "MINGW"* )
+  # FIXME: never tested on Windows
+  install_zip "pypy-2.2.1-win32" "https://bitbucket.org/pypy/pypy/downloads/pypy-2.2.1-win32.zip#213aacf7a06cd531c3457f1c5a73059c" "pypy" verify_py27
+  ;;
+* )
+  { echo "Precompiled binary of pypy-2.2.1 is not available for $(uname -s)-$(uname -m)."
+    echo "To build pypy-2.2.1 from soruce, use 'pypy-2.2.1-src'."
+  } 1>&4 2>&1
+  false
+  ;;
+esac
+
+install_package "setuptools-2.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

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

@@ -0,0 +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

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-1.3.2" "https://pypi.python.org/packages/source/s/setuptools/setuptools-1.3.2.tar.gz#441f2e58c0599d31597622a7b9eb605f" python
+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

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

@@ -29,5 +29,5 @@ case "$(uname -s)" in
   ;;
 esac
 
-install_package "setuptools-1.3.2" "https://pypi.python.org/packages/source/s/setuptools/setuptools-1.3.2.tar.gz#441f2e58c0599d31597622a7b9eb605f" python
+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

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

@@ -1,4 +1,4 @@
 require_gcc
 install_package "pypy3-2.1-beta1-src" "https://bitbucket.org/pypy/pypy/downloads/pypy3-2.1-beta1-src.tar.bz2#bc2013d1927dc1c0c91228e566abd8da" "pypy_builder" verify_py32
-install_package "setuptools-1.3.2" "https://pypi.python.org/packages/source/s/setuptools/setuptools-1.3.2.tar.gz#441f2e58c0599d31597622a7b9eb605f" python
+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

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

@@ -1,4 +1,4 @@
 require_gcc
 install_hg "pypy3-dev" "https://bitbucket.org/pypy/pypy" "py3k" "pypy_builder" verify_py32
-install_package "setuptools-1.3.2" "https://pypi.python.org/packages/source/s/setuptools/setuptools-1.3.2.tar.gz#441f2e58c0599d31597622a7b9eb605f" python
+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

plugins/python-build/share/python-build/stackless-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 "stackless-2.7-dev" "http://hg.python.org/stackless" "2.7-slp" standard verify_py27
-install_package "setuptools-1.3.2" "https://pypi.python.org/packages/source/s/setuptools/setuptools-1.3.2.tar.gz#441f2e58c0599d31597622a7b9eb605f" python
+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

plugins/python-build/share/python-build/stackless-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 "stackless-272-export" "http://www.stackless.com/binaries/stackless-272-export.tar.bz2#79a718db998f2cdd95478d2cb54d56f2" standard verify_py27
-install_package "setuptools-1.3.2" "https://pypi.python.org/packages/source/s/setuptools/setuptools-1.3.2.tar.gz#441f2e58c0599d31597622a7b9eb605f" python
+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

plugins/python-build/share/python-build/stackless-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 "stackless-3.2-dev" "http://hg.python.org/stackless" "3.2-slp" standard verify_py32
-install_package "setuptools-1.3.2" "https://pypi.python.org/packages/source/s/setuptools/setuptools-1.3.2.tar.gz#441f2e58c0599d31597622a7b9eb605f" python
+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

plugins/python-build/share/python-build/stackless-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 "stackless-322-export" "http://www.stackless.com/binaries/stackless-322-export.tar.bz2#3a3edcfb4240bdcc580cec2baea60af4" standard verify_py32
-install_package "setuptools-1.3.2" "https://pypi.python.org/packages/source/s/setuptools/setuptools-1.3.2.tar.gz#441f2e58c0599d31597622a7b9eb605f" python
+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

plugins/python-build/share/python-build/stackless-3.3-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 "stackless-3.3-dev" "http://hg.python.org/stackless" "3.3-slp" standard verify_py33
-install_package "setuptools-1.3.2" "https://pypi.python.org/packages/source/s/setuptools/setuptools-1.3.2.tar.gz#441f2e58c0599d31597622a7b9eb605f" python
+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

plugins/python-build/share/python-build/stackless-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 "stackless-dev" "http://hg.python.org/stackless" "default" standard verify_py33
-install_package "setuptools-1.3.2" "https://pypi.python.org/packages/source/s/setuptools/setuptools-1.3.2.tar.gz#441f2e58c0599d31597622a7b9eb605f" python
+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