v20150404

2025-11-11 04:53:47 -05:00 · 2015-05-04 08:24:23 -04:00
479 changed files with 2168 additions and 10282 deletions
--- a/.agignore
+++ b/.agignore
@@ -1,2 +0,0 @@
-./versions
-./cache
--- a/.gitignore
+++ b/.gitignore
@@ -6,5 +6,4 @@
 /libexec/*.dylib
 /src/Makefile
 /src/*.o
-/bats/
-/default-packages
+bats/
--- a/.travis.yml
+++ b/.travis.yml
@@ -5,13 +5,3 @@ language: c
 env:
  - PYENV_NATIVE_EXT=
  - PYENV_NATIVE_EXT=1
-notifications:
-  email:
-    on_success: never
-deploy:
-  provider: releases
-  api_key:
-    secure: FLWevL09KYp7V1SjJUNEdWzuomuocXwNvPr1DSAFH7mmrjKTtjzwrjINAthSqzjlDrs5B//P47l1VLyHp5byEzy673W+bOmEg8swmqc7E9FrHLRyEByd/yca3DzkZgXEXgGdY/cl7tHhM4V2fYKEgAIWbFV+takmTFMK4WkEtNg=
-  on:
-    repo: pyenv/pyenv
-    tags: true
--- a/.vimrc
+++ b/.vimrc
@@ -1 +0,0 @@
-set wildignore+=versions/*,cache/*
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,296 +1,5 @@
 ## Version History

-## 1.2.2
-
-* python-build: Add PyPy3 5.10.1 (#1084)
-* python-build: Add CPython 3.5.5 (#1090)
-* python-build: Add Anaconda[23]-5.1.0 (#1100)
-* python-build: Fix checksum issue for CPython 3.4.8 (#1094)
-* python-build: Prevent Anaconda from installing a `clear` shim (#1084)
-## 1.2.1
-
-* python-build: Add CPython 3.6.4
-* python-build: Add PyPy[23] 5.10
-
-## 1.2.0
-
-* python-build: Import changes from ruby-build v20171031 (#1026)
-* python-build: Ignore LibreSSL bundled with macOS 10.13 (#1025)
-* python-build: Skip passing `--enable-unicode` to CPython 3.3+ (#912)
-* python-build: Add CPython 3.3.7 (#1053)
-* python-build: Add micropython 1.9.3
-* python-build: Add PyPy 5.9.0
-* python-build: Add Miniconda[23] 4.3.14, 4.3.21, 4.3.27, 4.3.30
-* python-build: Add Anaconda[23] 5.0.1
-* python-build: Update Anaconda[23] 5.0.0 to 5.0.0.1 bugfix release
-
-## v1.1.5
-
-* python-build: Add CPython 3.6.3
-* python-build: Add CPython 3.7.0a1
-* python-build: Add Anaconda[23] 5.0.0
-
-## v1.1.4
-
-* pyenv: Workaround for scripts in `$PATH` which needs to be source'd (#100, #688, #953)
-* python-build: Add support for PyPy3 executables like `libpypy3-c.so` (#955, #956)
-* python-build: Add CPython 2.7.14, 3.4.7, 3.5.4 (#965, #971, #980)
-* python-build: Add Jython 2.7.1 (#973)
-
-## v1.1.3
-
-* python-build: Add CPython 3.6.2 (#951)
-
-## v1.1.2
-
-* pyenv: Fix incorrect `pyenv --version` output in v1.1.1 (#947)
-
-## v1.1.1
-
-* python-build: Update links to Portable Pypy 5.8-1 bugfix release, affects pypy2.7-5.8.0 and pypy3.5-5.8.0 definitions (#939)
-
-## v1.1.0
-
-* python-build: Add PyPy 5.7.1 (#888)
-* pyenv: Merge rbenv master (#927)
-* python-build: Add PyPy 5.8.0 (#932)
-* python-build: Anaconda[23] 4.4.0
-* python-build: Add micropython-dev
-
-## 1.0.10
-
-* python-build: Add Anaconda2/Anaconda3 4.3.1 (#876)
-* python-build: Make miniconda-latest point to miniconda2-latest (#881)
-* python-build: Fix typo in MacOS packages for anaconda2-4.3.0/4.2.0 (#880)
-
-## 1.0.9
-
-* pyenv: Migrate project site from https://github.com/yyuu/pyenv to https://github.com/pyenv/pyenv
-* python-build: Add PyPy2 5.7.0 (#872, #868)
-* python-build: Add PyPy3 5.7.0-beta (#871, #869)
-* python-build: Add CPython 3.6.1 (#873)
-* python-build: Add Pyston 0.6.1 (#859)
-* python-build: Change default mirror site URL from https://yyuu.github.io/pythons to https://pyenv.github.io/pythons
-* python-build: Upgrade OpenSSL from 1.0.2g to 1.0.2k (#850)
-
-## 1.0.8
-
-* pyenv: Fix fish subcommand completion (#831)
-* python-build: Add Anaconda2/Anaconda3 4.3.0  (#824)
-* python-build: Use CPython on GitHub as the source repository of CPython development versions (#836, #837)
-* python-build: Fix checksum verification issue on the platform where OpenSSL isn't available (#840)
-
-## 1.0.7
-
-* python-build: Add CPython 3.5.3 (#811)
-* python-build: Add CPython 3.4.6 (#812)
-* python-build: Fix tar.gz checksum of CPython 3.6.0 (#793)
-* python-build: Jython installer workaround (#800)
-* python-build: Disable optimization (`-O0`) when `--debug` was specified (#808)
-
-## 1.0.6
-
-* python-build: Add CPython 3.6.0 (#787)
-
-## 1.0.5
-
-* python-build: Add CPython 2.7.13 (#782)
-* python-build: Add CPython 3.6.0rc2 (#781)
-* python-build: Add Anaconda 4.2.0 (#774)
-* python-build: Add Anaconda3 4.2.0 (#765)
-* python-build: Add IronPython 2.7.7 (#755)
-
-## 1.0.4
-
-* python-build: Add PyPy 5.6.0 (#751)
-* python-build: Add PyPy3 3.5 nightlies (`pypy3.5-c-jit-latest` #737)
-* python-build: Add Stackless 2.7.12 (#753)
-* python-build: Add Stackless 2.7.11
-* python-build: Add Stackless 2.7.10
-* python-build: Add Pyston 0.6.0
-* python-build: Add CPython 3.6.0b4 (#762)
-
-## 1.0.3
-
-* python-build: Add CPython 3.6.0b3 (#731, #744)
-* python-build: Add PyPy3.3 5.5-alpha (#734, #736)
-* python-build: Stop specifying `--enable-unicode=ucs4` on OS X (#257, #726)
-* python-build: Fix 3.6-dev and add 3.7-dev (#729, #730)
-* python-build: Add a patch for https://bugs.python.org/issue26664 (#725)
-* python-build: Add Pyston 0.5.1 (#718)
-* python-build: Add Stackless 3.4.2 (#720)
-* python-build: Add IronPython 2.7.6.3 (#716)
-* python-build: Add Stackless 2.7.9 (#714)
-
-## 1.0.2
-
-* python-build: Add CPython 3.6.0b1 (#699)
-* python-build: Add anaconda[23] 4.1.1 (#701, #702)
-* python-build: Add miniconda[23] 4.1.11 (#703, #704, #706)
-* python-build: Remove `bin.orig` if exists to fix an issue with `--enable-framework` (#687, #700)
-
-## 1.0.1
-
-* python-build: Add CPython 3.6.0a4 (#673)
-* python-build: Add PyPy2 5.4, 5.4.1 (#683, #684, #695, #697)
-* python-build: Add PyPy Portable 5.4, 5.4.1 (#685, #686, #696)
-* python-build: Make all HTTP source URLs to HTTPS (#680)
-
-## 1.0.0
-
-* pyenv: Import latest changes from rbenv as of Aug 15, 2016 (#669)
-* pyenv: Add workaround for system python at `/bin/python` (#628)
-* python-build: Import changes from ruby-build v20160602 (#668)
-
-## 20160726
-
-* python-build: pypy-5.3.1: Remove stray text (#648)
-* python-build: Add CPython 3.6.0a3 (#657)
-* python-build: Add anaconda[23]-4.1.0
-* pyenv: Keep using `.tar.gz` archives if tar doesn't support `-J` (especially on BSD) (#654, #663)
-* pyenv: Fixed conflict between pyenv-virtualenv's `rehash` hooks of `envs.bash`
-* pyenv: Write help message of `sh-*` commands to stdout properly (#650, #651)
-
-## 20160629
-
-* python-build: Added CPython 2.7.12 (#645)
-* python-build: Added PyPy 3.5.1 (#646)
-* python-build: Added PyPy Portable 5.3.1
-
-## 20160628
-
-* python-build: Added PyPy3.3 5.2-alpha1 (#631)
-* python-build: Added CPython 2.7.12rc1
-* python-build: Added CPython 3.6.0a2 (#630)
-* python-build: Added CPython 3.5.2 (#643)
-* python-build: Added CPython 3.4.5 (#643)
-* python-build: Added PyPy2 5.3 (#626)
-* pyenv: Skip creating shims for system executables bundled with Anaconda rather than ignoring them in `pyenv-which` (#594, #595, #599)
-* python-build: Configured GCC as a requirement to build CPython prior to 2.4.4 (#613)
-* python-build: Use `aria2c` - ultra fast download utility if available (#534)
-
-## 20160509
-
-* python-build: Fixed wrong SHA256 of `pypy-5.1-linux_x86_64-portable.tar.bz2` (#586, #587)
-* python-build: Added miniconda[23]-4.0.5
-* python-build: Added PyPy (Portable) 5.1.1 (#591, #592, #593)
-
-## 20160422
-
-* python-build: Added PyPy 5.1 (#579)
-* python-build: Added PyPy 5.1 Portable
-* python-build: Added PyPy 5.0.1 (#558)
-* python-build: Added PyPy 5.0.1 Portable
-* python-build: Added PyPy 5.0 Portable
-* python-build: Added anaconda[23]-4.0.0 (#572)
-* python-build: Added Jython 2.7.1b3 (#557)
-
-## 20160310
-
-* python-build: Add PyPy-5.0.0 (#555)
-* pyenv: Import recent changes from rbenv 1.0 (#549)
-
-## 20160303
-
-* python-build: Add anaconda[23]-2.5.0 (#543)
-* python-build: Import recent changes from ruby-build 20160130
-* python-build: Compile with `--enable-unicode=ucs4` by default for CPython (#257, #542)
-* python-build: Switch download URL of Continuum products from HTTP to HTTPS (#543)
-* python-build: Added pypy-dev special case in pyenv-install to use py27 (#547)
-* python-build: Upgrade OpenSSL to 1.0.2g (#550)
-
-## 20160202
-
-* pyenv: Run rehash automatically after `conda install`
-* python-build: Add CPython 3.4.4 (#511)
-* python-build: Add anaconda[23]-2.4.1, miniconda[23]-3.19.0
-* python-build: Fix broken build definitions of CPython/Stackless 3.2.x (#531)
-
-### 20151222
-
-* pyenv: Merge recent changes from rbenv as of 2015-12-14 (#504)
-* python-build: Add a `OPENSSL_NO_SSL3` patch for CPython 2.6, 2.7, 3.0, 3.1, 3.2 and 3.3 series (#507, #511)
-* python-build: Stopped using mirror at pyenv.github.io for CPython since http://www.python.org is on fast.ly
-
-### 20151210
-
-* pyenv: Add a default hook for Anaconda to look for original `$PATH` (#491)
-* pyenv: Skip virtualenv aliases on `pyenv versions --skip-aliases` (pyenv/pyenv-virtualenv#126)
-* python-build: Add CPython 2.7.11, 3.5.1 (#494, #498)
-* python-build: Update OpenSSL to 1.0.1q (#496)
-* python-build: Adding SSL patch to build 2.7.3 on Debian (#495)
-
-### 20151124
-
-* pyenv: Import recent changes from rbenv 5fb9c84e14c8123b2591d22e248f045c7f8d8a2c
-* pyenv: List anaconda-style virtual environments as a version in pyenv (#471)
-* python-build: Import recent changes from ruby-build v20151028
-* python-build: Add PyPy 4.0.1 (#489)
-* python-build: Add `miniconda*-3.18.3` (#477)
-* python-build: Add CPython 2.7.11 RC1
-
-### 20151105
-
-* python-build: Add anaconda2-2.4.0 and anacondaa3-2.4.0
-* python-build: Add Portable PyPy 4.0 (#472)
-
-### 20151103
-
-* python-build: Add PyPy 4.0.0 (#463)
-* python-build: Add Jython 2.7.1b2
-* python-build: Add warning about setuptools issues on CPython 3.0.1 on OS X (#456)
-
-### 20151006
-
-* pyenv: Different behaviour when invoking .py script through symlink (#379, #404)
-* pyenv: Enabled Gitter on the project (#436, #444)
-* python-build: Add Jython 2.7.1b1
-* python-build: Install OpenSSL on OS X if no proper version is available (#429)
-
-### 20150913
-
-* python-build: Add CPython 3.5.0
-* python-build: Remove CPython 3.5.0 release candidates
-* python-build: Fixed anaconda3 repo's paths (#439)
-* python-build: Add miniconda-3.16.0 and miniconda3-3.16.0 (#435)
-
-### 20150901
-
-* python-build: Add CPython 3.5.0 release candidates; 3.5.0rc1 and 3.5.0rc2
-* python-build: Disabled `_FORTITY_SOURCE` to fix CPython >= 2.4, <= 2.4.3 builds (#422)
-* python-build: Removed CPython 3.5.0 betas
-* python-build: Add miniconda-3.10.1 and miniconda3-3.10.1 (#414)
-* python-build: Add PyPy 2.6.1 (#433)
-* python-build: Add PyPy-STM 2.3 and 2.5.1 (#428)
-* python-build: Ignore user's site-packages on ensurepip/get-pip (#411)
-* pyenv: Import recent changes from ruby-build v20150818
-
-#### 20150719
-
-* python-build: Add CPython `3.6-dev` (#413)
-* python-build: Add Anaconda/Anaconda3 2.3.0
-* python-build: Fix download URL of portable PyPy 2.6 (fixes #389)
-* python-build: Use custom `MACOSX_DEPLOYMENT_TARGET` if defined (#312)
-* python-build: Use original CPython repository instead of mirror at bitbucket.org as the source of `*-dev` versions (#409)
-* python-build: Pin pip version to 1.5.6 for python 3.1.5 (#351)
-
-#### 20150601
-
-* python-build: Add PyPy 2.6.0
-* python-build: Add PyPy 2.5.1 portable
-* python-build: Add CPython 3.5.0 beta releases; 3.5.0b1 and 3.5.0b2
-* python-build: Removed CPython 3.5.0 alpha releases
-* python-build: Fix inverted condition for `--altinstall` of ensurepip (#255)
-* python-build: Skip installing `setuptools` by `ez_setup.py` explicitly (fixes #381)
-* python-build: Import changes from ruby-build v20150519
-
-#### 20150524
-
-* pyenv: Improve `pyenv version`, if there is one missing (#290)
-* pyenv: Improve pip-rehash to handle versions in command, like `pip2` and `pip3.4` (#368)
-* python-build: Add CPython release; 2.7.10 (#380)
-* python-build: Add Miniconda/Miniconda3 3.9.1 and Anaconda/Anaconda3 2.2.0 (#375, #376)
-
 #### 20150504

 * python-build: Add Jython 2.7.0
@@ -322,12 +31,12 @@
 #### 20150124

 * python-build: Import recent changes from ruby-build v20150112
-* python-build: Prevent adding `/Library/Python/X.X/site-packages` to `sys.path` when `--enable-framework` is enabled on OS X. Thanks @s1341 (#292)
+* python-build: Prevent adding `/Library/Python/X.X/site-packages` to `sys.path` whtn `--enable-framework` is enabled on OS X. Thanks @s1341 (#292)
 * python-build: Add new IronPython release; 2.7.5

 #### 20141211

-* pyenv: Add built-in `pip-rehash` feature. You don't need to install [pyenv-pip-rehash](https://github.com/pyenv/pyenv-pip-rehash) anymore.
+* pyenv: Add bulit-in `pip-rehash` feature. You don't need to install [pyenv-pip-rehash](https://github.com/yyuu/pyenv-pip-rehash) anymore.
 * python-build: Add new CPython release; 2.7.9 (#284)
 * python-build: Add new PyPy releases; pypy3-2.4.0, pypy3-2.4.0-src (#277)
 * python-build: Add build definitions of PyPy nightly build
@@ -437,9 +146,9 @@
 * python-build: Fix build of Tkinter with Tcl/Tk 8.6 (#131)
 * python-build: Fix build problem with Readline 6.3 (#126, #131, #149, #152)
 * python-build: Do not exit with errors even if some of modules are absent (#131)
-* python-build: MacOSX was misspelled as MaxOSX in `anaconda_architecture` (#136)
+* python-build: MacOSX was mispelled as MaxOSX in `anaconda_architecture` (#136)
 * python-build: Use default `cc` as the C Compiler to build CPython (#148, #150)
-* python-build: Display value from `pypy_architecture` and `anaconda_architecture` on errors (pyenv/pyenv-virtualenv#18)
+* python-build: Display value from `pypy_architecture` and `anaconda_architecture` on errors (yyuu/pyenv-virtualenv#18)
 * python-build: Remove old development version; 2.6-dev
 * python-build: Update default setuptools version (3.3 -> 3.4.1)

@@ -493,7 +202,7 @@
 * 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/pyenv/pyenv-version-ext) instead.
+* version-ext-compat: Removed from default plugin. Please use [pyenv-version-ext](https://github.com/yyuu/pyenv-version-ext) instead.

 #### 0.4.0-20131217

--- a/COMMANDS.md
+++ b/COMMANDS.md
@@ -1,7 +1,7 @@
 # Command Reference

 Like `git`, the `pyenv` command delegates to subcommands based on its
-first argument.
+first argument. 

 The most common subcommands are:

@@ -185,15 +185,14 @@ or, if you prefer 3.3.3 over 2.7.6,

 ## `pyenv install`

-Install a Python version (using [`python-build`](https://github.com/pyenv/pyenv/tree/master/plugins/python-build)).
+Install a Python version (using `python-build`).

    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
-      -s/--skip-existing    Skip the installation if the version appears to be installed already
+      -l/--list        List all available versions
+      -f/--force       Install even if the version appears to be installed already

      python-build options:

@@ -203,18 +202,6 @@ Install a Python version (using [`python-build`](https://github.com/pyenv/pyenv/
      -p/--patch       Apply a patch from stdin before building
      -g/--debug       Build a debug version

-To list the all available versions of Python, including Anaconda, Jython, pypy, and stackless, use:
-
-    $ pyenv install --list
-
-Then install the desired versions:
-
-    $ pyenv install 2.7.6
-    $ pyenv install 2.6.8
-    $ pyenv versions
-      system
-      2.6.8
-    * 2.7.6 (set by /home/yyuu/.pyenv/version)

 ## `pyenv uninstall`

@@ -276,3 +263,24 @@ Lists all Python versions with the given command installed.
    2.6.8
    2.7.6
    3.3.3
+
+
+## `pyenv install`
+
+Part of [Python-build](https://github.com/yyuu/pyenv/tree/master/plugins/python-build), this installs versions of python
+
+    $ pyenv install 2.7.6
+    $ pyenv install 2.6.8
+    $ pyenv versions
+      system
+      2.6.8
+    * 2.7.6 (set by /home/yyuu/.pyenv/version)
+
+
+## `pyenv install --list`
+
+List available remote versions of Python, including Anaconda, Jython, pypy, and stackless
+
+    $ pyenv install --list
+
+
--- a/CONDUCT.md
+++ b/CONDUCT.md
@@ -1,80 +0,0 @@
-# Contributor Covenant Code of Conduct
-
-## Our Pledge
-
-In the interest of fostering an open and welcoming environment, we as
-contributors and maintainers pledge to making participation in our project and
-our community a harassment-free experience for everyone, regardless of age, body
-size, disability, ethnicity, gender identity and expression, level of experience,
-nationality, personal appearance, race, religion, or sexual identity and
-orientation.
-
-## Our Standards
-
-Examples of behavior that contributes to creating a positive environment
-include:
-
-* Using welcoming and inclusive language
-* Being respectful of differing viewpoints and experiences
-* Gracefully accepting constructive criticism
-* Focusing on what is best for the community
-* Showing empathy towards other community members
-
-Examples of unacceptable behavior by participants include:
-
-* The use of sexualized language or imagery and unwelcome sexual attention or
-advances
-* Trolling, insulting/derogatory comments, and personal or political attacks
-* Public or private harassment
-* Publishing others' private information, such as a physical or electronic
-  address, without explicit permission
-* Other conduct which could reasonably be considered inappropriate in a
-  professional setting
-
-## Our Responsibilities
-
-Project maintainers are responsible for clarifying the standards of acceptable
-behavior and are expected to take appropriate and fair corrective action in
-response to any instances of unacceptable behavior.
-
-Project maintainers have the right and responsibility to remove, edit, or
-reject comments, commits, code, wiki edits, issues, and other contributions
-that are not aligned to this Code of Conduct, or to ban temporarily or
-permanently any contributor for other behaviors that they deem inappropriate,
-threatening, offensive, or harmful.
-
-## Scope
-
-This Code of Conduct applies both within project spaces and in public spaces
-when an individual is representing the project or its community. Examples of
-representing a project or community include using an official project e-mail
-address, posting via an official social media account, or acting as an appointed
-representative at an online or offline event. Representation of a project may be
-further defined and clarified by project maintainers.
-
-## Enforcement
-
-Instances of abusive, harassing, or otherwise unacceptable behavior may be
-reported by contacting one of the project maintainers listed below. All
-complaints will be reviewed and investigated and will result in a response that
-is deemed necessary and appropriate to the circumstances. The project team is
-obligated to maintain confidentiality with regard to the reporter of an incident.
-Further details of specific enforcement policies may be posted separately.
-
-Project maintainers who do not follow or enforce the Code of Conduct in good
-faith may face temporary or permanent repercussions as determined by other
-members of the project's leadership.
-
-## Project Maintainers
-
-* Sam Stephenson <<sstephenson@gmail.com>>
-* Mislav Marohnić <<mislav.marohnic@gmail.com>>
-* Erik Michaels-Ober <<sferik@gmail.com>>
-
-## Attribution
-
-This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
-available at [http://contributor-covenant.org/version/1/4][version]
-
-[homepage]: http://contributor-covenant.org
-[version]: http://contributor-covenant.org/version/1/4/
--- a/2
+++ b/2
@@ -9,4 +9,4 @@ test: bats
 	cd plugins/python-build && $(PWD)/bats/bin/bats $${CI:+--tap} test

 bats:
-	git clone --depth 1 https://github.com/sstephenson/bats.git
+	git clone https://github.com/sstephenson/bats.git
--- a/README.md
+++ b/README.md
@@ -1,17 +1,15 @@
 # Simple Python Version Management: pyenv

-[![Join the chat at https://gitter.im/yyuu/pyenv](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/yyuu/pyenv?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
-
-[![Build Status](https://travis-ci.org/pyenv/pyenv.svg?branch=master)](https://travis-ci.org/pyenv/pyenv)
+[![Build Status](https://travis-ci.org/yyuu/pyenv.svg)](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.

-This project was forked from [rbenv](https://github.com/rbenv/rbenv) and
-[ruby-build](https://github.com/rbenv/ruby-build), and modified for Python.
+This project was forked from [rbenv](https://github.com/sstephenson/rbenv) and
+[ruby-build](https://github.com/sstephenson/ruby-build), and modified for Python.

-![Terminal output example](/terminal_output.png)
+<img src="http://gyazo.com/9c829fafdf5e58880c820349c4e9197e.png?1346414267" width="849" height="454" />


 ### pyenv _does..._
@@ -21,7 +19,7 @@ This project was forked from [rbenv](https://github.com/rbenv/rbenv) and
 * Allow you to **override the Python version** with an environment
  variable.
 * Search commands from **multiple versions of Python at a time**.
-  This may be helpful to test across Python versions with [tox](https://pypi.python.org/pypi/tox).
+  This may be helpful to test across Python versions with [tox](http://pypi.python.org/pypi/tox).


 ### In contrast with pythonbrew and pythonz, pyenv _does not..._
@@ -30,8 +28,8 @@ This project was forked from [rbenv](https://github.com/rbenv/rbenv) and
    There is no bootstrap problem of Python.
 * **Need to be loaded into your shell.** Instead, pyenv's shim
    approach works by adding a directory to your `$PATH`.
-* **Manage virtualenv.** Of course, you can create [virtualenv](https://pypi.python.org/pypi/virtualenv)
-    yourself, or [pyenv-virtualenv](https://github.com/pyenv/pyenv-virtualenv)
+* **Manage virtualenv.** Of course, you can create [virtualenv](http://pypi.python.org/pypi/virtualenv)
+    yourself, or [pyenv-virtualenv](https://github.com/yyuu/pyenv-virtualenv)
    to automate the process.


@@ -49,7 +47,7 @@ This project was forked from [rbenv](https://github.com/rbenv/rbenv) and
  * [Basic GitHub Checkout](#basic-github-checkout)
    * [Upgrading](#upgrading)
    * [Homebrew on Mac OS X](#homebrew-on-mac-os-x)
-    * [Advanced Configuration](#advanced-configuration)
+    * [Neckbeard Configuration](#neckbeard-configuration)
    * [Uninstalling Python Versions](#uninstalling-python-versions)
 * **[Command Reference](#command-reference)**
 * **[Development](#development)**
@@ -67,6 +65,7 @@ executables injected into your `PATH`, determines which Python version
 has been specified by your application, and passes your commands along
 to the correct Python installation.

+
 ### Understanding PATH

 When you run a command like `python` or `pip`, your operating system
@@ -82,12 +81,13 @@ precedence over another one at the end. In this example, the
 `/usr/local/bin` directory will be searched first, then `/usr/bin`,
 then `/bin`.

+
 ### Understanding Shims

 pyenv works by inserting a directory of _shims_ at the front of your
 `PATH`:

-    $(pyenv root)/shims:/usr/local/bin:/usr/bin:/bin
+    ~/.pyenv/shims:/usr/local/bin:/usr/bin:/bin

 Through a process called _rehashing_, pyenv maintains shims in that
 directory to match every Python command across every installed version
@@ -102,30 +102,31 @@ operating system will do the following:
 * Run the shim named `pip`, which in turn passes the command along to
  pyenv

+
 ### Choosing the Python Version

 When you execute a shim, pyenv determines which Python version to use by
 reading it from the following sources, in this order:

 1. The `PYENV_VERSION` environment variable (if specified). You can use
-   the [`pyenv shell`](https://github.com/pyenv/pyenv/blob/master/COMMANDS.md#pyenv-shell) command to set this environment
+   the [`pyenv shell`](#pyenv-shell) command to set this environment
   variable in your current shell session.

 2. The application-specific `.python-version` file in the current
   directory (if present). You can modify the current directory's
-   `.python-version` file with the [`pyenv local`](https://github.com/pyenv/pyenv/blob/master/COMMANDS.md#pyenv-local)
+   `.python-version` file with the [`pyenv local`](#pyenv-local)
   command.

 3. The first `.python-version` file found (if any) by searching each parent
   directory, until reaching the root of your filesystem.

-4. The global `$(pyenv root)/version` file. You can modify this file using
-   the [`pyenv global`](https://github.com/pyenv/pyenv/blob/master/COMMANDS.md#pyenv-global) command. If the global version
+4. The global `~/.pyenv/version` file. You can modify this file using
+   the [`pyenv global`](#pyenv-global) command. If the global version
   file is not present, pyenv assumes you want to use the "system"
   Python. (In other words, whatever version would run if pyenv weren't in your
   `PATH`.)

-**NOTE:** You can activate multiple versions at the same time, including multiple
+**NOTE:** You can activate multiple versions at the same time, including mulitple
 versions of Python2 or Python3 simultaneously. This allows for parallel usage of
 Python2 and Python3, and is required with tools like `tox`. For example, to set
 your path to first use your `system` Python and Python3 (set to 2.7.9 and 3.4.2
@@ -133,9 +134,8 @@ in this example), but also have Python 3.3.6, 3.2, and 2.5 available on your
 `PATH`, one would first `pyenv install` the missing versions, then set `pyenv
 global system 3.3.6 3.2 2.5`. At this point, one should be able to find the full
 executable path to each of these using `pyenv which`, e.g. `pyenv which python2.5`
-(should display `$(pyenv root)/versions/2.5/bin/python2.5`), or `pyenv which
-python3.4` (should display path to system Python3). You can also specify multiple
-versions in a `.python-version` file, separated by newlines or any whitespace.
+(should display `$PYENV_ROOT/versions/2.5/bin/python2.5`), or `pyenv which
+python3.4` (should display path to system Python3).

 ### Locating the Python Installation

@@ -144,22 +144,16 @@ specified, it passes the command along to the corresponding Python
 installation.

 Each Python version is installed into its own directory under
-`$(pyenv root)/versions`.
+`~/.pyenv/versions`.

 For example, you might have these versions installed:

-* `$(pyenv root)/versions/2.7.8/`
-* `$(pyenv root)/versions/3.4.2/`
-* `$(pyenv root)/versions/pypy-2.4.0/`
+* `~/.pyenv/versions/2.7.8/`
+* `~/.pyenv/versions/3.4.2/`
+* `~/.pyenv/versions/pypy-2.4.0/`

 As far as pyenv is concerned, version names are simply the directories in
-`$(pyenv root)/versions`.
-
-### Managing Virtual Environments
-
-There is a pyenv plugin named [pyenv-virtualenv](https://github.com/pyenv/pyenv-virtualenv) which comes with various features to help pyenv users to manage virtual environments created by virtualenv or Anaconda.
-Because the `activate` script of those virtual environments are relying on mutating `$PATH` variable of user's interactive shell, it will intercept pyenv's shim style command execution hooks.
-We'd recommend to install pyenv-virtualenv as well if you have some plan to play with those virtual environments.
+`~/.pyenv/versions`.


 ----
@@ -173,7 +167,7 @@ If you're on Mac OS X, consider [installing with Homebrew](#homebrew-on-mac-os-x
 ### The automatic installer

 Visit my other project:
-https://github.com/pyenv/pyenv-installer
+https://github.com/yyuu/pyenv-installer


 ### Basic GitHub Checkout
@@ -184,55 +178,60 @@ easy to fork and contribute any changes back upstream.
 1. **Check out pyenv where you want it installed.**
   A good place to choose is `$HOME/.pyenv` (but you can install it somewhere else).

-        $ git clone https://github.com/pyenv/pyenv.git ~/.pyenv
+        $ git clone https://github.com/yyuu/pyenv.git ~/.pyenv


 2. **Define environment variable `PYENV_ROOT`** to point to the path where
   pyenv repo is cloned and add `$PYENV_ROOT/bin` to your `$PATH` for access
   to the `pyenv` command-line utility.

-    ```sh
-    $ echo 'export PYENV_ROOT="$HOME/.pyenv"' >> ~/.bash_profile
-    $ echo 'export PATH="$PYENV_ROOT/bin:$PATH"' >> ~/.bash_profile
-    ```
+        $ echo 'export PYENV_ROOT="$HOME/.pyenv"' >> ~/.bash_profile
+        $ echo 'export PATH="$PYENV_ROOT/bin:$PATH"' >> ~/.bash_profile
+
    **Zsh note**: Modify your `~/.zshenv` file instead of `~/.bash_profile`.
-    **Ubuntu and Fedora note**: Modify your `~/.bashrc` file instead of `~/.bash_profile`.
-    **Proxy note**: If you use a proxy, export `http_proxy` and `HTTPS_PROXY` too.
+    **Ubuntu note**: Modify your `~/.bashrc` file instead of `~/.bash_profile`.

 3. **Add `pyenv init` to your shell** to enable shims and autocompletion.
-   Please make sure `eval "$(pyenv init -)"` is placed toward the end of the shell
+   Please make sure `eval "$(pyenv init -)"` is placed toward the end of shell
   configuration file since it manipulates `PATH` during the initialization.
-    ```sh
-    $ echo -e 'if command -v pyenv 1>/dev/null 2>&1; then\n  eval "$(pyenv init -)"\nfi' >> ~/.bash_profile
-    ```
-    **Zsh note**: Modify your `~/.zshenv` file instead of `~/.bash_profile`.
-    **Ubuntu and Fedora note**: Modify your `~/.bashrc` file instead of `~/.bash_profile`.

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

 4. **Restart your shell so the path changes take effect.**
   You can now begin using pyenv.
-    ```sh
-    $ exec "$SHELL"
-    ```
-5. **Install Python versions into `$(pyenv root)/versions`.**
-   For example, to download and install Python 2.7.8, run:
-    ```sh
-    $ pyenv install 2.7.8
-    ```
+
+        $ exec $SHELL
+
+5. **Install Python versions into `$PYENV_ROOT/versions`.**
+   For example, to install Python 2.7.8, download and unpack the source, then run:
+
+        $ pyenv install 2.7.8
+
   **NOTE:** If you need to pass configure option to build, please use
   ```CONFIGURE_OPTS``` environment variable.

-   **NOTE:** If you want to use proxy to download, please use `http_proxy` and `https_proxy`
-   environment variable.
-
   **NOTE:** If you are having trouble installing a python version,
   please visit the wiki page about
-   [Common Build Problems](https://github.com/pyenv/pyenv/wiki/Common-build-problems)
+   [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.
+   (Examples: installing a new Python version, or installing a package that provides a binary.)
+
+        $ pyenv rehash
+
+   This can be automated for pip using
+   [pyenv-pip-rehash](https://github.com/yyuu/pyenv-pip-rehash), which invokes
+   `pyenv rehash` after (un)installing packages using pip.


 #### Upgrading
@@ -242,44 +241,17 @@ upgrade your installation at any time using git.

 To upgrade to the latest development version of pyenv, use `git pull`:

-```sh
-$ cd $(pyenv root)
-$ git pull
-```
+    $ cd ~/.pyenv
+    $ git pull

 To upgrade to a specific release of pyenv, check out the corresponding tag:

-```sh
-$ cd $(pyenv root)
-$ git fetch
-$ git tag
-v0.1.0
-$ git checkout v0.1.0
-```
+    $ cd ~/.pyenv
+    $ git fetch
+    $ git tag
+    v0.1.0
+    $ git checkout v0.1.0

-### Uninstalling pyenv
-
-The simplicity of pyenv makes it easy to temporarily disable it, or
-uninstall from the system.
-
-1. To **disable** pyenv managing your Python versions, simply remove the
-  `pyenv init` line from your shell startup configuration. This will
-  remove pyenv shims directory from PATH, and future invocations like
-  `python` will execute the system Python version, as before pyenv.
-
-  `pyenv` will still be accessible on the command line, but your Python
-  apps won't be affected by version switching.
-
-2. To completely **uninstall** pyenv, perform step (1) and then remove
-   its root directory. This will **delete all Python versions** that were
-   installed under `` $(pyenv root)/versions/ `` directory:
-    ```sh
-    rm -rf $(pyenv root)
-    ```
-   If you've installed pyenv using a package manager, as a final step
-   perform the pyenv package removal. For instance, for Homebrew:
-
-        brew uninstall pyenv

 ### Homebrew on Mac OS X

@@ -290,11 +262,14 @@ package manager for Mac OS X.
    $ brew install pyenv


-To upgrade pyenv in the future, use `upgrade` instead of `install`.
+To upgrade pyenv in the future, just use `upgrade` instead of `install`.

-Then follow the rest of the post-installation steps under [Basic GitHub Checkout](https://github.com/pyenv/pyenv#basic-github-checkout) above, starting with #3 ("Add `pyenv init` to your shell to enable shims and autocompletion").
+After installation, you'll still need to add `eval "$(pyenv init -)"` to your
+profile (as stated in the caveats). You'll only ever have to do this
+once.

-### Advanced Configuration
+
+### Neckbeard Configuration

 Skip this section unless you must know what every line in your shell
 profile is doing.
@@ -305,11 +280,11 @@ opposed to this idea. Here's what `pyenv init` actually does:

 1. **Sets up your shims path.** This is the only requirement for pyenv to
   function properly. You can do this by hand by prepending
-   `$(pyenv root)/shims` to your `$PATH`.
+   `~/.pyenv/shims` to your `$PATH`.

 2. **Installs autocompletion.** This is entirely optional but pretty
-   useful. Sourcing `$(pyenv root)/completions/pyenv.bash` will set that
-   up. There is also a `$(pyenv root)/completions/pyenv.zsh` for Zsh
+   useful. Sourcing `~/.pyenv/completions/pyenv.bash` will set that
+   up. There is also a `~/.pyenv/completions/pyenv.zsh` for Zsh
   users.

 3. **Rehashes shims.** From time to time you'll need to rebuild your
@@ -329,7 +304,7 @@ To see exactly what happens under the hood for yourself, run `pyenv init -`.
 ### Uninstalling Python Versions

 As time goes on, you will accumulate Python versions in your
-`$(pyenv root)/versions` directory.
+`~/.pyenv/versions` directory.

 To remove old Python versions, `pyenv uninstall` command to automate
 the removal process.
@@ -349,35 +324,43 @@ See [COMMANDS.md](COMMANDS.md).

 ----

-## Environment variables
-
-You can affect how pyenv operates with the following settings:
-
-name | default | description
-----|---------|------------
-`PYENV_VERSION` | | Specifies the Python version to be used.<br>Also see [`pyenv shell`](https://github.com/pyenv/pyenv/blob/master/COMMANDS.md#pyenv-shell)
-`PYENV_ROOT` | `~/.pyenv` | Defines the directory under which Python versions and shims reside.<br>Also see `pyenv root`
-`PYENV_DEBUG` | | Outputs debug information.<br>Also as: `pyenv --debug <subcommand>`
-`PYENV_HOOK_PATH` | [_see wiki_][hooks] | Colon-separated list of paths searched for pyenv hooks.
-`PYENV_DIR` | `$PWD` | Directory to start searching for `.python-version` files.
-`PYTHON_BUILD_ARIA2_OPTS` | | Used to pass additional parameters to [`aria2`](https://aria2.github.io/).<br>if `aria2c` binary is available on PATH, pyenv use `aria2c` instead of `curl` or `wget` to download the Python Source code. If you have an unstable internet connection, you can use this variable to instruct `aria2` to accelerate the download.<br>In most cases, you will only need to use `-x 10 -k 1M` as value to `PYTHON_BUILD_ARIA2_OPTS` environment variable
-
-

 ## Development

-The pyenv source code is [hosted on
-GitHub](https://github.com/pyenv/pyenv).  It's clean, modular,
-and easy to understand, even if you're not a shell hacker.
+The pyenv source code is [hosted on GitHub](https://github.com/yyuu/pyenv).
+It's clean, modular, and easy to understand--even if you're not a shell hacker.

-Tests are executed using [Bats](https://github.com/sstephenson/bats):
-
-    $ bats test
-    $ bats/test/<file>.bats
-
-Please feel free to submit pull requests and file bugs on the [issue
-tracker](https://github.com/pyenv/pyenv/issues).
+Please feel free to submit Pull Requests and report bugs on the
+[issue tracker](https://github.com/yyuu/pyenv/issues).


-  [pyenv-virtualenv]: https://github.com/pyenv/pyenv-virtualenv#readme
-  [hooks]: https://github.com/pyenv/pyenv/wiki/Authoring-plugins#pyenv-hooks
+### Version History
+
+See [CHANGELOG.md](CHANGELOG.md).
+
+
+### License
+
+(The MIT license)
+
+* Copyright (c) 2013 Yamashita, Yuu
+* Copyright (c) 2013 Sam Stephenson
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
--- a/bin/python-local-exec
+++ b/bin/python-local-exec
@@ -0,0 +1,23 @@
+#!/usr/bin/env bash
+#
+# `python-local-exec` is a drop-in replacement for the standard Python
+# shebang line:
+#
+#    #!/usr/bin/env python-local-exec
+#
+# Use it for scripts inside a project with an `.pyenv-version`
+# file. When you run the scripts, they'll use the project-specified
+# Python version, regardless of what directory they're run from. Useful
+# for e.g. running project tasks in cron scripts without needing to
+# `cd` into the project first.
+
+set -e
+export PYENV_DIR="${1%/*}"
+
+[ -n "$PYENV_SILENCE_WARNINGS" ] || {
+  echo "pyenv: \`python-local-exec' is deprecated and will be removed in the next release."
+  echo "       To upgrade: https://github.com/yyuu/pyenv/wiki/python-local-exec"
+  echo
+} >&2
+
+exec python "$@"
--- a/completions/pyenv.fish
+++ b/completions/pyenv.fish
@@ -18,6 +18,5 @@ end

 complete -f -c pyenv -n '__fish_pyenv_needs_command' -a '(pyenv commands)'
 for cmd in (pyenv commands)
-  complete -f -c pyenv -n "__fish_pyenv_using_command $cmd" -a \
-    "(pyenv completions (commandline -opc)[2..-1])"
+  complete -f -c pyenv -n "__fish_pyenv_using_command $cmd" -a "(pyenv completions $cmd)"
 end
--- a/libexec/pyenv
+++ b/libexec/pyenv
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 set -e
-unset CDPATH
+export -n CDPATH

 if [ "$1" = "--debug" ]; then
  export PYENV_DEBUG=1
@@ -12,43 +12,39 @@ if [ -n "$PYENV_DEBUG" ]; then
  set -x
 fi

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

-  READLINK=$(type -p greadlink readlink | head -1)
-  [ -n "$READLINK" ] || abort "cannot find readlink - are you missing GNU coreutils?"
+resolve_link() {
+  $READLINK "$1"
+}

-  resolve_link() {
-    $READLINK "$1"
-  }
+abs_dirname() {
+  local cwd="$(pwd)"
+  local path="$1"

-  abs_dirname() {
-    local path="$1"
+  while [ -n "$path" ]; do
+    cd "${path%/*}"
+    local name="${path##*/}"
+    path="$(resolve_link "$name" || true)"
+  done

-    # Use a subshell to avoid changing the current path
-    (
-    while [ -n "$path" ]; do
-      cd "${path%/*}"
-      local name="${path##*/}"
-      path="$(resolve_link "$name" || true)"
-    done
-
-    pwd
-    )
-  }
+  pwd
+  cd "$cwd"
+}
 fi

 if [ -z "${PYENV_ROOT}" ]; then
@@ -58,28 +54,16 @@ else
 fi
 export PYENV_ROOT

-# Transfer PYENV_FILE_ARG (from shims) into PYENV_DIR.
 if [ -z "${PYENV_DIR}" ]; then
-  if [ -n "${PYENV_FILE_ARG}" ]; then
-    if [ -L "${PYENV_FILE_ARG}" ]; then
-      PYENV_DIR="$(abs_dirname "${PYENV_FILE_ARG}")"
-    else
-      PYENV_DIR="${PYENV_FILE_ARG%/*}"
-    fi
-    export PYENV_DIR
-    unset PYENV_FILE_ARG
-  fi
+  PYENV_DIR="$(pwd)"
+else
+  cd "$PYENV_DIR" 2>/dev/null || {
+    echo "pyenv: cannot change working directory to \`$PYENV_DIR'"
+    exit 1
+  } >&2
+  PYENV_DIR="$(pwd)"
+  cd "$OLDPWD"
 fi
-
-if [ -z "${PYENV_DIR}" ]; then
-  PYENV_DIR="$PWD"
-fi
-
-if [ ! -d "$PYENV_DIR" ] || [ ! -e "$PYENV_DIR" ]; then
-  abort "cannot change working directory to \`$PYENV_DIR'"
-fi
-
-PYENV_DIR=$(cd "$PYENV_DIR" && echo "$PWD")
 export PYENV_DIR


@@ -100,7 +84,6 @@ PYENV_HOOK_PATH="${PYENV_HOOK_PATH}:/usr/local/etc/pyenv.d:/etc/pyenv.d:/usr/lib
 for plugin_hook in "${PYENV_ROOT}/plugins/"*/etc/pyenv.d; do
  PYENV_HOOK_PATH="${PYENV_HOOK_PATH}:${plugin_hook}"
 done
-PYENV_HOOK_PATH="${PYENV_HOOK_PATH#:}"
 export PYENV_HOOK_PATH

 shopt -u nullglob
@@ -108,30 +91,20 @@ shopt -u nullglob

 command="$1"
 case "$command" in
-"" )
-  { pyenv---version
-    pyenv-help
-  } | abort
+"" | "-h" | "--help" )
+  echo -e "$(pyenv---version)\n$(pyenv-help)" >&2
  ;;
-v | --version )
+"-v" )
  exec pyenv---version
  ;;
-h | --help )
-  exec pyenv-help
-  ;;
 * )
  command_path="$(command -v "pyenv-$command" || true)"
-  [ -n "$command_path" ] || abort "no such command \`$command'"
+  if [ -z "$command_path" ]; then
+    echo "pyenv: no such command \`$command'" >&2
+    exit 1
+  fi

  shift 1
-  if [ "$1" = --help ]; then
-    if [[ "$command" == "sh-"* ]]; then
-      echo "pyenv help \"$command\""
-    else
-      exec pyenv-help "$command"
-    fi
-  else
-    exec "$command_path" "$@"
-  fi
+  exec "$command_path" "$@"
  ;;
 esac
--- a/libexec/pyenv---version
+++ b/libexec/pyenv---version
@@ -12,10 +12,9 @@
 set -e
 [ -n "$PYENV_DEBUG" ] && set -x

-version="1.2.2"
-git_revision=""
+version="20150404"

-if cd "${BASH_SOURCE%/*}" 2>/dev/null && git remote -v 2>/dev/null | grep -q pyenv; then
+if cd "$PYENV_ROOT" 2>/dev/null; then
  git_revision="$(git describe --tags HEAD 2>/dev/null || true)"
  git_revision="${git_revision#v}"
 fi
--- a/libexec/pyenv-completions
+++ b/libexec/pyenv-completions
@@ -10,16 +10,7 @@ if [ -z "$COMMAND" ]; then
  exit 1
 fi

-# Provide pyenv completions
-if [ "$COMMAND" = "--complete" ]; then
-  exec pyenv-commands
-fi
-
 COMMAND_PATH="$(command -v "pyenv-$COMMAND" || command -v "pyenv-sh-$COMMAND")"
-
-# --help is provided automatically
-echo --help
-
 if grep -iE "^([#%]|--|//) provide pyenv completions" "$COMMAND_PATH" >/dev/null; then
  shift
  exec "$COMMAND_PATH" --complete "$@"
--- a/libexec/pyenv-exec
+++ b/libexec/pyenv-exec
@@ -42,6 +42,6 @@ done

 shift 1
 # CPython's `sys.executable` requires the `PYENV_BIN_PATH` to be at the top of the `PATH`.
-# https://github.com/pyenv/pyenv/issues/98
+# https://github.com/yyuu/pyenv/issues/98
 export PATH="${PYENV_BIN_PATH}:${PATH}"
 exec -a "$PYENV_COMMAND" "$PYENV_COMMAND_PATH" "$@"
--- a/libexec/pyenv-help
+++ b/libexec/pyenv-help
@@ -15,12 +15,6 @@
 set -e
 [ -n "$PYENV_DEBUG" ] && set -x

-# Provide pyenv completions
-if [ "$1" = "--complete" ]; then
-  echo --usage
-  exec pyenv-commands
-fi
-
 command_path() {
  local command="$1"
  command -v pyenv-"$command" || command -v pyenv-sh-"$command" || true
@@ -152,7 +146,7 @@ if [ -z "$1" ] || [ "$1" == "pyenv" ]; then
  print_summaries commands local global shell install uninstall rehash version versions which whence
  echo
  echo "See \`pyenv help <command>' for information on a specific command."
-  echo "For full documentation, see: https://github.com/pyenv/pyenv#readme"
+  echo "For full documentation, see: https://github.com/yyuu/pyenv#readme"
 else
  command="$1"
  if [ -n "$(command_path "$command")" ]; then
--- a/libexec/pyenv-hooks
+++ b/libexec/pyenv-hooks
@@ -9,8 +9,6 @@ set -e
 if [ "$1" = "--complete" ]; then
  echo exec
  echo rehash
-  echo version-name
-  echo version-origin
  echo which
  exit
 fi
@@ -37,18 +35,17 @@ resolve_link() {
 }

 realpath() {
+  local cwd="$(pwd)"
  local path="$1"
-  local name
-  # Use a subshell to avoid changing the current path
-  (
+
  while [ -n "$path" ]; do
-    name="${path##*/}"
-    [ "$name" = "$path" ] || cd "${path%/*}"
+    cd "${path%/*}"
+    local name="${path##*/}"
    path="$(resolve_link "$name" || true)"
  done

-  echo "${PWD}/$name"
-  )
+  echo "$(pwd)/$name"
+  cd "$cwd"
 }
 fi

--- a/libexec/pyenv-init
+++ b/libexec/pyenv-init
@@ -5,17 +5,6 @@
 set -e
 [ -n "$PYENV_DEBUG" ] && set -x

-# Provide pyenv completions
-if [ "$1" = "--complete" ]; then
-  echo -
-  echo --no-rehash
-  echo bash
-  echo fish
-  echo ksh
-  echo zsh
-  exit
-fi
-
 print=""
 no_rehash=""
 for args in "$@"
@@ -33,11 +22,10 @@ done

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

 root="${0%/*}/.."
@@ -45,11 +33,7 @@ root="${0%/*}/.."
 if [ -z "$print" ]; then
  case "$shell" in
  bash )
-    if [ -f "${HOME}/.bashrc" ] && [ ! -f "${HOME}/.bash_profile" ]; then
-      profile='~/.bashrc'
-    else
-      profile='~/.bash_profile'
-    fi
+    profile='~/.bash_profile'
    ;;
  zsh )
    profile='~/.zshrc'
@@ -65,12 +49,12 @@ if [ -z "$print" ]; then
    ;;
  esac

-  { echo "# Load pyenv automatically by appending"
-    echo "# the following to ${profile}:"
+  { echo "# Load pyenv automatically by adding"
+    echo "# the following to the end of ${profile}:"
    echo
    case "$shell" in
    fish )
-      echo 'status --is-interactive; and source (pyenv init -|psub)'
+      echo 'status --is-interactive; and . (pyenv init -|psub)'
      ;;
    * )
      echo 'eval "$(pyenv init -)"'
@@ -86,8 +70,8 @@ mkdir -p "${PYENV_ROOT}/"{shims,versions}

 case "$shell" in
 fish )
-  echo "set -gx PATH '${PYENV_ROOT}/shims' \$PATH"
-  echo "set -gx PYENV_SHELL $shell"
+  echo "setenv PATH '${PYENV_ROOT}/shims' \$PATH"
+  echo "setenv PYENV_SHELL $shell"
 ;;
 * )
  echo 'export PATH="'${PYENV_ROOT}'/shims:${PATH}"'
@@ -97,11 +81,14 @@ esac

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

 if [ -z "$no_rehash" ]; then
-  echo 'command pyenv rehash 2>/dev/null'
+  echo 'pyenv rehash 2>/dev/null'
 fi

 commands=(`pyenv-commands --sh`)
@@ -114,7 +101,7 @@ function pyenv

  switch "\$command"
  case ${commands[*]}
-    source (pyenv "sh-\$command" \$argv|psub)
+    eval (pyenv "sh-\$command" \$argv)
  case '*'
    command pyenv "\$command" \$argv
  end
@@ -145,7 +132,7 @@ cat <<EOS

  case "\$command" in
  ${commands[*]})
-    eval "\$(pyenv "sh-\$command" "\$@")";;
+    eval "\`pyenv "sh-\$command" "\$@"\`";;
  *)
    command pyenv "\$command" "\$@";;
  esac
--- a/libexec/pyenv-local
+++ b/libexec/pyenv-local
@@ -15,6 +15,10 @@
 # `PYENV_VERSION' environment variable takes precedence over local
 # and global versions.
 #
+# For backwards compatibility, pyenv will also read version
+# specifications from `.pyenv-version' files, but a `.python-version'
+# file in the same directory takes precedence.
+#
 # <version> should be a string matching a Python version known to pyenv.
 # The special version string `system' will use your default system Python.
 # Run `pyenv versions' for a list of available Python versions.
@@ -32,17 +36,27 @@ fi
 versions=("$@")

 if [ "$versions" = "--unset" ]; then
-  rm -f .python-version
+  rm -f .python-version .pyenv-version
 elif [ -n "$versions" ]; then
+  previous_file="$(PYENV_VERSION= pyenv-version-origin || true)"
  pyenv-version-file-write .python-version "${versions[@]}"
-else
-  if version_file="$(pyenv-version-file "$PWD")"; then
-    IFS=: versions=($(pyenv-version-file-read "$version_file"))
-    for version in "${versions[@]}"; do
-      echo "$version"
-    done
-  else
-    echo "pyenv: no local version configured for this directory" >&2
-    exit 1
+  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
+else
+  OLDIFS="$IFS"
+  IFS=: versions=($(
+    pyenv-version-file-read .python-version ||
+    pyenv-version-file-read .pyenv-version ||
+    { echo "pyenv: no local version configured for this directory"
+      exit 1
+    } >&2
+  ))
+  IFS="$OLDIFS"
+  for version in "${versions[@]}"; do
+    echo "$version"
+  done
 fi
--- a/libexec/pyenv-prefix
+++ b/libexec/pyenv-prefix
@@ -30,9 +30,8 @@ OLDIFS="$IFS"
 { IFS=:
  for version in ${PYENV_VERSION}; do
    if [ "$version" = "system" ]; then
-      if PYTHON_PATH="$(PYENV_VERSION="${version}" pyenv-which python 2>/dev/null)"; then
+      if PYTHON_PATH="$(pyenv-which python 2>/dev/null)"; then
        PYENV_PREFIX_PATH="${PYTHON_PATH%/bin/*}"
-        PYENV_PREFIX_PATH="${PYENV_PREFIX_PATH:-/}"
      else
        echo "pyenv: system version not found in PATH" >&2
        exit 1
--- a/libexec/pyenv-rehash
+++ b/libexec/pyenv-rehash
@@ -46,13 +46,13 @@ set -e
 [ -n "\$PYENV_DEBUG" ] && set -x

 program="\${0##*/}"
-if [[ "\$program" = "python"* ]]; then
+if [ "\$program" = "python" ]; then
  for arg; do
    case "\$arg" in
    -c* | -- ) break ;;
    */* )
      if [ -f "\$arg" ]; then
-        export PYENV_FILE_ARG="\$arg"
+        export PYENV_DIR="\${arg%/*}"
        break
      fi
      ;;
@@ -81,12 +81,9 @@ remove_outdated_shims() {

 # List basenames of executables for every Python version
 list_executable_names() {
-  local version file
-  pyenv-versions --bare --skip-aliases | \
-  while read version; do
-    for file in "${PYENV_ROOT}/versions/${version}/bin/"*; do
-      echo "${file##*/}"
-    done
+  local file
+  for file in "$PYENV_ROOT"/versions/*/bin/*; do
+    echo "${file##*/}"
  done
 }

@@ -113,7 +110,7 @@ install_registered_shims() {
  local shim file
  for shim in $registered_shims; do
    file="${SHIM_PATH}/${shim}"
-    [ -e "$file" ] || cp "$PROTOTYPE_SHIM_PATH" "$file"
+    [ -e "$file" ] || ln -f "$PROTOTYPE_SHIM_PATH" "$file"
  done
 }

--- a/libexec/pyenv-sh-shell
+++ b/libexec/pyenv-sh-shell
@@ -2,8 +2,7 @@
 #
 # Summary: Set or show the shell-specific Python version
 #
-# Usage: pyenv shell <version>...
-#        pyenv shell -
+# Usage: pyenv shell <version>
 #        pyenv shell --unset
 #
 # Sets a shell-specific Python version by setting the `PYENV_VERSION'
@@ -13,11 +12,6 @@
 # <version> should be a string matching a Python version known to pyenv.
 # The special version string `system' will use your default system Python.
 # Run `pyenv versions' for a list of available Python versions.
-#
-# When `-` is passed instead of the version string, the previously set
-# version will be restored. With `--unset`, the `PYENV_VERSION`
-# environment variable gets unset, restoring the environment to the
-# state before the first `pyenv shell` call.

 set -e
 [ -n "$PYENV_DEBUG" ] && set -x
@@ -37,7 +31,7 @@ if [ -z "$versions" ]; then
    echo "pyenv: no shell-specific version configured" >&2
    exit 1
  else
-    echo 'echo "$PYENV_VERSION"'
+    echo "echo \"\$PYENV_VERSION\""
    exit
  fi
 fi
@@ -45,76 +39,28 @@ fi
 if [ "$versions" = "--unset" ]; then
  case "$shell" in
  fish )
-    echo 'set -gu PYENV_VERSION_OLD "$PYENV_VERSION"'
    echo "set -e PYENV_VERSION"
    ;;
  * )
-    echo 'PYENV_VERSION_OLD="$PYENV_VERSION"'
    echo "unset PYENV_VERSION"
    ;;
  esac
  exit
 fi

-if [ "$versions" = "-" ]; then
-  case "$shell" in
-  fish )
-    cat <<EOS
-if set -q PYENV_VERSION_OLD
-  if [ -n "\$PYENV_VERSION_OLD" ]
-    set PYENV_VERSION_OLD_ "\$PYENV_VERSION"
-    set -gx PYENV_VERSION "\$PYENV_VERSION_OLD"
-    set -gu PYENV_VERSION_OLD "\$PYENV_VERSION_OLD_"
-    set -e PYENV_VERSION_OLD_
-  else
-    set -gu PYENV_VERSION_OLD "\$PYENV_VERSION"
-    set -e PYENV_VERSION
-  end
-else
-  echo "pyenv: PYENV_VERSION_OLD is not set" >&2
-  false
-end
-EOS
-    ;;
-  * )
-    cat <<EOS
-if [ -n "\${PYENV_VERSION_OLD+x}" ]; then
-  if [ -n "\$PYENV_VERSION_OLD" ]; then
-    PYENV_VERSION_OLD_="\$PYENV_VERSION"
-    export PYENV_VERSION="\$PYENV_VERSION_OLD"
-    PYENV_VERSION_OLD="\$PYENV_VERSION_OLD_"
-    unset PYENV_VERSION_OLD_
-  else
-    PYENV_VERSION_OLD="\$PYENV_VERSION"
-    unset PYENV_VERSION
-  fi
-else
-  echo "pyenv: PYENV_VERSION_OLD is not set" >&2
-  false
-fi
-EOS
-    ;;
-  esac
-  exit
-fi
-
 # Make sure the specified version is installed.
 if pyenv-prefix "${versions[@]}" >/dev/null; then
  OLDIFS="$IFS"
  IFS=: version="${versions[*]}"
  IFS="$OLDIFS"
-  if [ "$version" != "$PYENV_VERSION" ]; then
-    case "$shell" in
-    fish )
-      echo 'set -gu PYENV_VERSION_OLD "$PYENV_VERSION"'
-      echo "set -gx PYENV_VERSION \"$version\""
-      ;;
-    * )
-      echo 'PYENV_VERSION_OLD="$PYENV_VERSION"'
-      echo "export PYENV_VERSION=\"${version}\""
-      ;;
-    esac
-  fi
+  case "$shell" in
+  fish )
+    echo "setenv PYENV_VERSION \"${version}\""
+    ;;
+  * )
+    echo "export PYENV_VERSION=\"${version}\""
+    ;;
+  esac
 else
  echo "false"
  exit 1
--- a/libexec/pyenv-version
+++ b/libexec/pyenv-version
@@ -8,13 +8,10 @@
 set -e
 [ -n "$PYENV_DEBUG" ] && set -x

-exitcode=0
 OLDIFS="$IFS"
-IFS=: PYENV_VERSION_NAMES=($(pyenv-version-name)) || exitcode=$?
+IFS=: PYENV_VERSION_NAMES=($(pyenv-version-name))
 IFS="$OLDIFS"

 for PYENV_VERSION_NAME in "${PYENV_VERSION_NAMES[@]}"; do
  echo "$PYENV_VERSION_NAME (set by $(pyenv-version-origin))"
 done
-
-exit $exitcode
--- a/libexec/pyenv-version-file
+++ b/libexec/pyenv-version-file
@@ -1,28 +1,34 @@
 #!/usr/bin/env bash
-# Usage: pyenv version-file [<dir>]
 # Summary: Detect the file that sets the current pyenv version
 set -e
 [ -n "$PYENV_DEBUG" ] && set -x

-target_dir="$1"
-
 find_local_version_file() {
  local root="$1"
-  while ! [[ "$root" =~ ^//[^/]*$ ]]; do
-    if [ -f "${root}/.python-version" ]; then
+  while [ -n "$root" ]; do
+    if [ -e "${root}/.python-version" ]; then
      echo "${root}/.python-version"
-      return 0
+      exit
+    elif [ -e "${root}/.pyenv-version" ]; then
+      echo "${root}/.pyenv-version"
+      exit
    fi
-    [ -n "$root" ] || break
+    [ "${root}" = "${root%/*}" ] && break
    root="${root%/*}"
  done
-  return 1
 }

-if [ -n "$target_dir" ]; then
-  find_local_version_file "$target_dir"
+find_local_version_file "$PYENV_DIR"
+[ "$PYENV_DIR" = "$PWD" ] || find_local_version_file "$PWD"
+
+global_version_file="${PYENV_ROOT}/version"
+
+if [ -e "$global_version_file" ]; then
+  echo "$global_version_file"
+elif [ -e "${PYENV_ROOT}/global" ]; then
+  echo "${PYENV_ROOT}/global"
+elif [ -e "${PYENV_ROOT}/default" ]; then
+  echo "${PYENV_ROOT}/default"
 else
-  find_local_version_file "$PYENV_DIR" || {
-    [ "$PYENV_DIR" != "$PWD" ] && find_local_version_file "$PWD"
-  } || echo "${PYENV_ROOT}/version"
+  echo "$global_version_file"
 fi
--- a/libexec/pyenv-version-file-read
+++ b/libexec/pyenv-version-file-read
@@ -9,7 +9,7 @@ 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.
  IFS="${IFS}"$'\r'
-  words=($(cut -b 1-1024 "$VERSION_FILE" | sed 's/^\s*\(\S\+\).*/\1/'))
+  words=( $(cut -b 1-1024 "$VERSION_FILE" | $(type -p gawk awk | head -1) '{ print($1) }') )
  versions=("${words[@]}")

  if [ -n "$versions" ]; then
--- a/libexec/pyenv-version-name
+++ b/libexec/pyenv-version-name
@@ -8,13 +8,6 @@ if [ -z "$PYENV_VERSION" ]; then
  PYENV_VERSION="$(pyenv-version-file-read "$PYENV_VERSION_FILE" || true)"
 fi

-OLDIFS="$IFS"
-IFS=$'\n' scripts=(`pyenv-hooks version-name`)
-IFS="$OLDIFS"
-for script in "${scripts[@]}"; do
-  source "$script"
-done
-
 if [ -z "$PYENV_VERSION" ] || [ "$PYENV_VERSION" = "system" ]; then
  echo "system"
  exit
@@ -28,15 +21,14 @@ version_exists() {
 versions=()
 OLDIFS="$IFS"
 { IFS=:
-  any_not_installed=0
  for version in ${PYENV_VERSION}; do
    if version_exists "$version" || [ "$version" = "system" ]; then
      versions=("${versions[@]}" "${version}")
    elif version_exists "${version#python-}"; then
      versions=("${versions[@]}" "${version#python-}")
    else
-      echo "pyenv: version \`$version' is not installed (set by $(pyenv-version-origin))" >&2
-      any_not_installed=1
+      echo "pyenv: version \`$version' is not installed" >&2
+      exit 1
    fi
  done
 }
@@ -47,7 +39,3 @@ OLDIFS="$IFS"
  echo "${versions[*]}"
 }
 IFS="$OLDIFS"
-
-if [ "$any_not_installed" = 1 ]; then
-  exit 1
-fi
--- a/libexec/pyenv-version-origin
+++ b/libexec/pyenv-version-origin
@@ -3,18 +3,7 @@
 set -e
 [ -n "$PYENV_DEBUG" ] && set -x

-unset PYENV_VERSION_ORIGIN
-
-OLDIFS="$IFS"
-IFS=$'\n' scripts=(`pyenv-hooks version-origin`)
-IFS="$OLDIFS"
-for script in "${scripts[@]}"; do
-  source "$script"
-done
-
-if [ -n "$PYENV_VERSION_ORIGIN" ]; then
-  echo "$PYENV_VERSION_ORIGIN"
-elif [ -n "$PYENV_VERSION" ]; then
+if [ -n "$PYENV_VERSION" ]; then
  echo "PYENV_VERSION environment variable"
 else
  pyenv-version-file
--- a/libexec/pyenv-versions
+++ b/libexec/pyenv-versions
@@ -1,70 +1,13 @@
 #!/usr/bin/env bash
 # Summary: List all Python versions available to pyenv
-# Usage: pyenv versions [--bare] [--skip-aliases]
+# Usage: pyenv versions [--bare]
 #
 # Lists all Python versions found in `$PYENV_ROOT/versions/*'.

 set -e
 [ -n "$PYENV_DEBUG" ] && set -x

-unset bare
-unset skip_aliases
-# Provide pyenv completions
-for arg; do
-  case "$arg" in
-  --complete )
-    echo --bare
-    echo --skip-aliases
-    exit ;;
-  --bare ) bare=1 ;;
-  --skip-aliases ) skip_aliases=1 ;;
-  * )
-    pyenv-help --usage versions >&2
-    exit 1
-    ;;
-  esac
-done
-
-versions_dir="${PYENV_ROOT}/versions"
-
-if ! enable -f "${BASH_SOURCE%/*}"/pyenv-realpath.dylib realpath 2>/dev/null; then
-  if [ -n "$PYENV_NATIVE_EXT" ]; then
-    echo "pyenv: failed to load \`realpath' builtin" >&2
-    exit 1
-  fi
-
-  READLINK=$(type -p greadlink readlink | head -1)
-  if [ -z "$READLINK" ]; then
-    echo "pyenv: cannot find readlink - are you missing GNU coreutils?" >&2
-    exit 1
-  fi
-
-  resolve_link() {
-    $READLINK "$1"
-  }
-
-  realpath() {
-    local path="$1"
-    local name
-
-    # Use a subshell to avoid changing the current path
-    (
-    while [ -n "$path" ]; do
-      name="${path##*/}"
-      [ "$name" = "$path" ] || cd "${path%/*}"
-      path="$(resolve_link "$name" || true)"
-    done
-
-    echo "${PWD}/$name"
-    )
-  }
-fi
-
-if [ -d "$versions_dir" ]; then
-  versions_dir="$(realpath "$versions_dir")"
-fi
-
-if [ -n "$bare" ]; then
+if [ "$1" = "--bare" ]; then
  hit_prefix=""
  miss_prefix=""
  current_versions=()
@@ -107,20 +50,9 @@ if [ -n "$include_system" ] && PYENV_VERSION=system pyenv-which python >/dev/nul
 fi

 shopt -s nullglob
-for path in "$versions_dir"/*; do
+for path in "${PYENV_ROOT}/versions/"*; do
  if [ -d "$path" ]; then
-    if [ -n "$skip_aliases" ] && [ -L "$path" ]; then
-      target="$(realpath "$path")"
-      [ "${target%/*}" != "$versions_dir" ] || continue
-      [ "${target%/*/envs/*}" != "$versions_dir" ] || continue
-    fi
    print_version "${path##*/}"
-    # virtual environments created by anaconda/miniconda
-    for env_path in "${path}/envs/"*; do
-      if [ -d "${env_path}" ]; then
-        print_version "${env_path#${PYENV_ROOT}/versions/}"
-      fi
-    done
  fi
 done
 shopt -u nullglob
--- a/libexec/pyenv-which
+++ b/libexec/pyenv-which
@@ -18,13 +18,12 @@ fi
 remove_from_path() {
  local path_to_remove="$1"
  local path_before
-  local result=":${PATH//\~/$HOME}:"
+  local result=":$PATH:"
  while [ "$path_before" != "$result" ]; do
    path_before="$result"
    result="${result//:$path_to_remove:/:}"
  done
-  result="${result%:}"
-  echo "${result#:}"
+  echo "${result%:}"
 }

 PYENV_COMMAND="$1"
@@ -66,7 +65,7 @@ else
      continue
    fi
    if ! [ -d "${PYENV_ROOT}/versions/${version}" ]; then
-      echo "pyenv: version \`$version' is not installed (set by $(pyenv-version-origin))" >&2
+      echo "pyenv: version \`$version' is not installed" >&2
      any_not_installed=1
    fi
  done
--- a/plugins/python-build/LICENSE
+++ b/plugins/python-build/LICENSE
@@ -1,20 +0,0 @@
-Copyright (c) 2013 Yamashita, Yuu
-Copyright (c) 2012-2013 Sam Stephenson
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the "Software"), to deal in
-the Software without restriction, including without limitation the rights to
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
-of the Software, and to permit persons to whom the Software is furnished to do
-so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-SOFTWARE.
--- a/plugins/python-build/README.md
+++ b/plugins/python-build/README.md
@@ -1,222 +1,213 @@
 # python-build

-python-build is a [pyenv](https://github.com/pyenv/pyenv) plugin that
-provides a `pyenv install` command to compile and install different versions
-of Python on UNIX-like systems.
+python-build is a [pyenv](https://github.com/yyuu/pyenv) plugin
+that provides a `pyenv install` command to compile and install
+different versions of Python on UNIX-like systems.

-You can also use python-build without pyenv in environments where you need
-precise control over Python version installation.
-
-See the [list of releases](https://github.com/pyenv/pyenv/releases)
-for changes in each version.
+You can also use python-build without pyenv in environments where you
+need precise control over Python version installation.


 ## Installation

-### Installing as a pyenv plugin (recommended)
+### Installing as an pyenv plugin (recommended)

 You need nothing to do since python-build is bundled with pyenv by
 default.

 ### Installing as a standalone program (advanced)

-Installing python-build as a standalone program will give you access to the
-`python-build` command for precise control over Python version installation. If you
-have pyenv installed, you will also be able to use the `pyenv install` command.
+Installing python-build as a standalone program will give you access to
+the `python-build` command for precise control over Python version
+installation. If you have pyenv installed, you will also be able to
+use the `pyenv install` command.

-    git clone git://github.com/pyenv/pyenv.git
+    git clone git://github.com/yyuu/pyenv.git
    cd pyenv/plugins/python-build
    ./install.sh

-This will install python-build into `/usr/local`. If you do not have write
-permission to `/usr/local`, you will need to run `sudo ./install.sh` instead.
-You can install to a different prefix by setting the `PREFIX` environment
-variable.
+This will install python-build into `/usr/local`. If you do not have
+write permission to `/usr/local`, you will need to run `sudo
+./install.sh` instead. You can install to a different prefix by
+setting the `PREFIX` environment variable.

-To update python-build after it has been installed, run `git pull` in your cloned
-copy of the repository, then re-run the install script.
-
-### Installing with Homebrew (for OS X users)
-
-Mac OS X users can install python-build with the [Homebrew](http://brew.sh)
-package manager. This will give you access to the `python-build` command. If you
-have pyenv installed, you will also be able to use the `pyenv install` command.
-
-*This is the recommended method of installation if you installed pyenv with
-Homebrew.*
-
-    brew install pyenv
-
-Or, if you would like to install the latest development release:
-
-    brew install --HEAD pyenv
+To update python-build after it has been installed, run `git pull` in
+your cloned copy of the repository, then re-run the install script.


 ## Usage

-Before you begin, you should ensure that your build environment has the proper
-system dependencies for compiling the wanted Python Version (see our [recommendations](https://github.com/pyenv/pyenv/wiki#suggested-build-environment)).
-
 ### Using `pyenv install` with pyenv

 To install a Python version for use with pyenv, run `pyenv install` with
-exact name of the version you want to install. For example,
+the exact name of the version you want to install. For example,

    pyenv install 2.7.4

-Python versions will be installed into a directory of the same name under
-`~/.pyenv/versions`.
+Python versions will be installed into a directory of the same name
+under `~/.pyenv/versions`.

-To see a list of all available Python versions, run `pyenv install --list`. You
-may also tab-complete available Python versions if your pyenv installation is
-properly configured.
+To see a list of all available Python versions, run `pyenv install --list`.
+You may also tab-complete available Python
+versions if your pyenv installation is properly configured.

 ### Using `python-build` standalone

-If you have installed python-build as a standalone program, you can use the
-`python-build` command to compile and install Python versions into specific
-locations.
+If you have installed python-build as a standalone program, you can use
+the `python-build` command to compile and install Python versions into
+specific locations.

-Run the `python-build` command with the exact name of the version you want to
-install and the full path where you want to install it. For example,
+Run the `python-build` command with the exact name of the version you
+want to install and the full path where you want to install it. For
+example,

    python-build 2.7.4 ~/local/python-2.7.4

-To see a list of all available Python versions, run `python-build --definitions`.
+To see a list of all available Python versions, run `python-build
+--definitions`.

-Pass the `-v` or `--verbose` flag to `python-build` as the first argument to see
-what's happening under the hood.
+Pass the `-v` or `--verbose` flag to `python-build` as the first
+argument to see what's happening under the hood.

 ### Custom definitions

-Both `pyenv install` and `python-build` accept a path to a custom definition file
-in place of a version name. Custom definitions let you develop and install
-versions of Python that are not yet supported by python-build.
+Both `pyenv install` and `python-build` accept a path to a custom
+definition file in place of a version name. Custom definitions let you
+develop and install versions of Python that are not yet supported by
+python-build.

-See the [python-build built-in definitions](https://github.com/pyenv/pyenv/tree/master/plugins/python-build/share/python-build) as a starting point for
-custom definition files.
-
-[definitions]: https://github.com/pyenv/pyenv/tree/master/plugins/python-build/share/python-build
+See the [python-build built-in
+definitions](https://github.com/yyuu/pyenv/tree/master/plugins/python-build/share/python-build)
+as a starting point for custom definition files.

 ### Special environment variables

-You can set certain environment variables to control the build process.
+You can set certain environment variables to control the build
+process.

 * `TMPDIR` sets the location where python-build stores temporary files.
-* `PYTHON_BUILD_BUILD_PATH` sets the location in which sources are downloaded and
-  built. By default, this is a subdirectory of `TMPDIR`.
-* `PYTHON_BUILD_CACHE_PATH`, if set, specifies a directory to use for caching
-  downloaded package files.
-* `PYTHON_BUILD_MIRROR_URL` overrides the default mirror URL root to one of your
-  choosing.
-* `PYTHON_BUILD_SKIP_MIRROR`, if set, forces python-build to download packages from
-  their original source URLs instead of using a mirror.
-* `PYTHON_BUILD_ROOT` overrides the default location from where build definitions
-  in `share/python-build/` are looked up.
-* `PYTHON_BUILD_DEFINITIONS` can be a list of colon-separated paths that get
-  additionally searched when looking up build definitions.
+* `PYTHON_BUILD_BUILD_PATH` sets the location in which sources are
+  downloaded and built. By default, this is a subdirectory of
+  `TMPDIR`.
+* `PYTHON_BUILD_CACHE_PATH`, if set, specifies a directory to use for
+  caching downloaded package files.
+* `PYTHON_BUILD_MIRROR_URL` overrides the default mirror URL root to one
+  of your choosing.
+* `PYTHON_BUILD_SKIP_MIRROR`, if set, forces python-build to download
+  packages from their original source URLs instead of using a mirror.
 * `CC` sets the path to the C compiler.
-* `PYTHON_CFLAGS` lets you pass additional options to the default `CFLAGS`. Use
-  this to override, for instance, the `-O3` option.
 * `CONFIGURE_OPTS` lets you pass additional options to `./configure`.
-* `MAKE` lets you override the command to use for `make`. Useful for specifying
-  GNU make (`gmake`) on some systems.
-* `MAKE_OPTS` (or `MAKEOPTS`) lets you pass additional options to `make`.
-* `MAKE_INSTALL_OPTS` lets you pass additional options to `make install`.
-* `PYTHON_CONFIGURE_OPTS` and `PYTHON_MAKE_OPTS` and `PYTHON_MAKE_INSTALL_OPTS` allow
-  you to specify configure and make options for building CPython. These variables
-  will be passed to Python only, not any dependent packages (e.g. libyaml).
+* `MAKE` lets you override the command to use for `make`. Useful for
+  specifying GNU make (`gmake`) on some systems.
+* `MAKE_OPTS` (or `MAKEOPTS`) lets you pass additional options to
+  `make`.
+* `PYTHON_CONFIGURE_OPTS` and `PYTHON_MAKE_OPTS` allow you to specify
+  configure and make options for buildling CPython. These variables will
+  be passed to Python only, not any dependent packages (e.g. libyaml).

-### Applying patches to Python before compiling
-
-Both `pyenv install` and `python-build` support the `--patch` (`-p`) flag that
-signals that a patch from stdin should be applied to Python, Jython or PyPy
-source code before the `./configure` and compilation steps.
-
-Example usage:
-
-```sh
-# applying a single patch
-$ pyenv install --patch 2.7.10 < /path/to/python.patch
-
-# applying a patch from HTTP
-$ pyenv install --patch 2.7.10 < <(curl -sSL http://git.io/python.patch)
-
-# applying multiple patches
-$ cat fix1.patch fix2.patch | pyenv install --patch 2.7.10
-```
-
-
-### Building with `--enable-shared`
+### Building as `--enable-shared`

 You can build CPython with `--enable-shared` to install a version with
 shared object.

-If `--enable-shared` was found in `PYTHON_CONFIGURE_OPTS` or `CONFIGURE_OPTS`,
+If `--enabled-shared` was found in `PYTHON_CONFIGURE_OPTS` or `CONFIGURE_OPTS`,
 `python-build` will automatically set `RPATH` to the pyenv's prefix directory.
 This means you don't have to set `LD_LIBRARY_PATH` or `DYLD_LIBRARY_PATH` for
 the version(s) installed with `--enable-shared`.

 ```sh
-$ env PYTHON_CONFIGURE_OPTS="--enable-shared" pyenv install 2.7.9
+$ env PYTHON_CONFIGURE_OPTS="--enable-shared` pyenv install 2.7.9
 ```

 ### Checksum verification

-If you have the `shasum`, `openssl`, or `sha256sum` tool installed, python-build will
-automatically verify the SHA2 checksum of each downloaded package before
-installing it.
+If you have the `shasum`, `openssl`, or `sha256sum` tool installed,
+python-build will automatically verify the SHA2 checksum of each
+downloaded package before installing it.

-Checksums are optional and specified as anchors on the package URL in each
-definition. (All bundled definitions include checksums.)
+Checksums are optional and specified as anchors on the package URL in
+each definition. (All bundled definitions include checksums.)

 ### Package download mirrors

-python-build will first attempt to download package files from a mirror hosted on
-GitHub Pages. If a package is not available on the mirror, if the mirror
-is down, or if the download is corrupt, python-build will fall back to the
-official URL specified in the definition file.
+python-build will first attempt to download package files from a mirror
+hosted on Amazon CloudFront. If a package is not available on the
+mirror, if the mirror is down, or if the download is corrupt,
+python-build will fall back to the official URL specified in the
+defintion file.

 You can point python-build to another mirror by specifying the
-`PYTHON_BUILD_MIRROR_URL` environment variable--useful if you'd like to run your
-own local mirror, for example. Package mirror URLs are constructed by joining
-this variable with the SHA2 checksum of the package file.
+`PYTHON_BUILD_MIRROR_URL` environment variable--useful if you'd like to
+run your own local mirror, for example. Package mirror URLs are
+constructed by joining this variable with the SHA2 checksum of the
+package file.

-If you don't have an SHA2 program installed, python-build will skip the download
-mirror and use official URLs instead. You can force python-build to bypass the
-mirror by setting the `PYTHON_BUILD_SKIP_MIRROR` environment variable.
+If you don't have an SHA2 program installed, python-build will skip the
+download mirror and use official URLs instead. You can force
+python-build to bypass the mirror by setting the
+`PYTHON_BUILD_SKIP_MIRROR` environment variable.

-The official python-build download mirror is provided by
-[GitHub Pages](http://yyuu.github.io/pythons/).
+The official python-build download mirror is provided by [Git Hub Pages](http://yyuu.github.io/pythons/).

 ### Package download caching

-You can instruct python-build to keep a local cache of downloaded package files
-by setting the `PYTHON_BUILD_CACHE_PATH` environment variable. When set, package
-files will be kept in this directory after the first successful download and
-reused by subsequent invocations of `python-build` and `pyenv install`.
+You can instruct python-build to keep a local cache of downloaded
+package files by setting the `PYTHON_BUILD_CACHE_PATH` environment
+variable. When set, package files will be kept in this directory after
+the first successful download and reused by subsequent invocations of
+`python-build` and `pyenv install`.

-The `pyenv install` command defaults this path to `~/.pyenv/cache`, so in most
-cases you can enable download caching simply by creating that directory.
+The `pyenv install` command defaults this path to `~/.pyenv/cache`, so
+in most cases you can enable download caching simply by creating that
+directory.

 ### Keeping the build directory after installation

-Both `python-build` and `pyenv install` accept the `-k` or `--keep` flag, which
-tells python-build to keep the downloaded source after installation. This can be
-useful if you need to use `gdb` and `memprof` with Python.
+Both `python-build` and `pyenv install` accept the `-k` or `--keep`
+flag, which tells python-build to keep the downloaded source after
+installation. This can be useful if you need to use `gdb` and
+`memprof` with Python.

-Source code will be kept in a parallel directory tree `~/.pyenv/sources` when
-using `--keep` with the `pyenv install` command. You should specify the
-location of the source code with the `PYTHON_BUILD_BUILD_PATH` environment
-variable when using `--keep` with `python-build`.
+Source code will be kept in a parallel directory tree
+`~/.pyenv/sources` when using `--keep` with the `pyenv install`
+command. You should specify the location of the source code with the
+`PYTHON_BUILD_BUILD_PATH` environment variable when using `--keep` with
+`python-build`.


 ## Getting Help

-Please see the [pyenv wiki](https://github.com/pyenv/pyenv/wiki) for solutions to common problems.
-
-[wiki]: https://github.com/pyenv/pyenv/wiki
+Please see the [python-build
+wiki](https://github.com/yyuu/pyenv/wiki) for solutions to
+common problems.

 If you can't find an answer on the wiki, open an issue on the [issue
-tracker](https://github.com/pyenv/pyenv/issues). Be sure to include
-the full build log for build failures.
+tracker](https://github.com/yyuu/pyenv/issues). Be sure to
+include the full build log for build failures.
+
+
+### License
+
+(The MIT License)
+
+* Copyright (c) 2013 Yamashita, Yuu
+* Copyright (c) 2012 Sam Stephenson
+
+Permission is hereby granted, free of charge, to any person obtaining
+a copy of this software and associated documentation files (the
+"Software"), to deal in the Software without restriction, including
+without limitation the rights to use, copy, modify, merge, publish,
+distribute, sublicense, and/or sell copies of the Software, and to
+permit persons to whom the Software is furnished to do so, subject to
+the following conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
--- a/plugins/python-build/bin/pyenv-install
+++ b/plugins/python-build/bin/pyenv-install
@@ -5,7 +5,6 @@
 # Usage: pyenv install [-f] [-kvp] <version>
 #        pyenv install [-f] [-kvp] <definition-file>
 #        pyenv install -l|--list
-#        pyenv install --version
 #
 #   -l/--list          List all available versions
 #   -f/--force         Install even if the version appears to be installed already
@@ -15,18 +14,21 @@
 #
 #   -k/--keep          Keep source tree in $PYENV_BUILD_ROOT after installation
 #                      (defaults to $PYENV_ROOT/sources)
-#   -p/--patch         Apply a patch from stdin before building
 #   -v/--verbose       Verbose mode: print compilation status to stdout
-#   --version          Show version of python-build
+#   -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
-# compilation, see: https://github.com/pyenv/pyenv#readme
+# compilation, see: https://github.com/yyuu/pyenv#readme
 #
 set -e
 [ -n "$PYENV_DEBUG" ] && set -x

+if [ -z "$PYENV_ROOT" ]; then
+  PYENV_ROOT="${HOME}/.pyenv"
+fi
+
 # Add `share/python-build/` directory from each pyenv plugin to the list of
 # paths where build definitions are looked up.
 shopt -s nullglob
@@ -38,14 +40,6 @@ shopt -u nullglob

 # Provide pyenv completions
 if [ "$1" = "--complete" ]; then
-  echo --list
-  echo --force
-  echo --skip-existing
-  echo --keep
-  echo --patch
-  echo --verbose
-  echo --version
-  echo --debug
  exec python-build --definitions
 fi

@@ -53,7 +47,8 @@ fi
 eval "$(python-build --lib)"

 usage() {
-  pyenv-help install 2>/dev/null
+  # We can remove the sed fallback once pyenv 0.4.0 is widely available.
+  pyenv-help install 2>/dev/null || sed -ne '/^#/!q;s/.//;s/.//;1,4d;p' < "$0"
  [ -z "$1" ] || exit "$1"
 }

@@ -106,7 +101,7 @@ for option in "${OPTIONS[@]}"; do
    exec python-build --version
    ;;
  * )
-    usage 1 >&2
+    usage 1
    ;;
  esac
 done
@@ -183,52 +178,40 @@ if [ -z "${PYTHON_BUILD_CACHE_PATH}" ] && [ -d "${PYENV_ROOT}/cache" ]; then
  export PYTHON_BUILD_CACHE_PATH="${PYENV_ROOT}/cache"
 fi

-if [ -z "${PYENV_BOOTSTRAP_VERSION}" ]; then
-  case "${VERSION_NAME}" in
-  [23]"."* )
-    # 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
-    # fail.)
-    for version_info in "${VERSION_NAME%-dev}" "${VERSION_NAME%.*}" "${VERSION_NAME%%.*}"; do
-      # Anaconda's `curl` doesn't work on platform where `/etc/pki/tls/certs/ca-bundle.crt` isn't available (e.g. Debian)
-      for version in $(pyenv-whence "python${version_info}" 2>/dev/null || true); do
-        if [[ "${version}" != "anaconda"* ]] && [[ "${version}" != "miniconda"* ]]; then
-          PYENV_BOOTSTRAP_VERSION="${version}"
-          break 2
-        fi
-      done
-    done
-    ;;
-  "pypy"*"-dev" | "pypy"*"-src" )
-    # PyPy/PyPy3 requires existing Python 2.7 to build
-    if [ -n "${PYENV_RPYTHON_VERSION}" ]; then
-      PYENV_BOOTSTRAP_VERSION="${PYENV_RPYTHON_VERSION}"
-    else
-      for version in $(pyenv-versions --bare | sort -r); do
-        if [[ "${version}" == "2.7"* ]]; then
-          PYENV_BOOTSTRAP_VERSION="$version"
-          break
-        fi
-      done
+# 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
+# fail.)
+if [[ "${VERSION_NAME}" == [23]"."* ]]; then
+  for version in "${VERSION_NAME%-dev}" "${VERSION_NAME%.*}" "${VERSION_NAME%%.*}"; do
+    PYENV_VERSION="$(pyenv-whence "python${version}" 2>/dev/null | tail -n 1 || true)"
+    if [ -n "${PYENV_VERSION}" ]; then
+      export PYENV_VERSION
+      break
    fi
-    if [ -n "$PYENV_BOOTSTRAP_VERSION" ]; then
-      for dep in curses genc pycparser; do
-        if ! PYENV_VERSION="$PYENV_BOOTSTRAP_VERSION" pyenv-exec python -c "import ${dep}" 1>/dev/null 2>&1; then
-          echo "pyenv-install: $VERSION_NAME: PyPy requires \`${dep}' in $PYENV_BOOTSTRAP_VERSION to build from source." >&2
-          exit 1
-        fi
-      done
-    else
-      echo "pyenv-install: $VERSION_NAME: PyPy requires Python 2.7 to build from source." >&2
-      exit 1
-    fi
-    ;;
-  esac
+  done
 fi

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

 # Execute `before_install` hooks.
@@ -263,7 +246,7 @@ if [ "$STATUS" == "2" ]; then
      echo "  brew update && brew upgrade pyenv"
    elif [ -d "${here}/.git" ]; then
      printf ":\n\n"
-      echo "  cd ${here} && git pull && cd -"
+      echo "  cd ${here} && git pull"
    else
      printf ".\n"
    fi
--- a/plugins/python-build/bin/pyenv-uninstall
+++ b/plugins/python-build/bin/pyenv-uninstall
@@ -14,15 +14,19 @@ set -e

 # Provide pyenv completions
 if [ "$1" = "--complete" ]; then
-  echo --force
  exec pyenv versions --bare
 fi

 usage() {
-  pyenv-help uninstall 2>/dev/null
+  # We can remove the sed fallback once pyenv 0.4.0 is widely available
+  pyenv-help uninstall 2>/dev/null || sed -ne '/^#/!q;s/.//;s/.//;1,4d;p' < "$0"
  [ -z "$1" ] || exit "$1"
 }

+if [ -z "$PYENV_ROOT" ]; then
+  PYENV_ROOT="${HOME}/.pyenv"
+fi
+
 if [ "$1" = "-h" ] || [ "$1" = "--help" ]; then
  usage 0
 fi
--- a/plugins/python-build/bin/python-build
+++ b/plugins/python-build/bin/python-build
--- a/plugins/python-build/share/python-build/2.1.3
+++ b/plugins/python-build/share/python-build/2.1.3
@@ -1,5 +1,5 @@
-require_gcc
-install_package "readline-6.2" "https://ftpmirror.gnu.org/readline/readline-6.2.tar.gz#79a696070a058c233c72dd6ac697021cc64abd5ed51e59db867d66d196a89381" standard --if has_broken_mac_readline
-install_package "Python-2.1.3" "https://www.python.org/ftp/python/2.1.3/Python-2.1.3.tgz#1bcb5bb587948bc38f36db60e15c376009c56c66570e563a08a82bf7f227afb9" ldflags_dirs standard verify_py21
-#install_package "setuptools-1.4.2" "https://pypi.python.org/packages/source/s/setuptools/setuptools-1.4.2.tar.gz#263986a60a83aba790a5bffc7d009ac88114ba4e908e5c90e453b3bf2155dbbd" python
-#install_package "pip-1.1" "https://pypi.python.org/packages/source/p/pip/pip-1.1.tar.gz#993804bb947d18508acee02141281c77d27677f8c14eaa64d6287a1c53ef01c8" python
+#require_gcc
+install_package "readline-6.2" "http://ftpmirror.gnu.org/readline/readline-6.2.tar.gz#67948acb2ca081f23359d0256e9a271c" standard --if has_broken_mac_readline
+install_package "Python-2.1.3" "http://www.python.org/ftp/python/2.1.3/Python-2.1.3.tgz#1bcb5bb587948bc38f36db60e15c376009c56c66570e563a08a82bf7f227afb9" ldflags_dirs standard verify_py21
+#install_package "setuptools-1.4.2" "https://pypi.python.org/packages/source/s/setuptools/setuptools-1.4.2.tar.gz#13951be6711438073fbe50843e7f141f" python
+#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.2.3
+++ b/plugins/python-build/share/python-build/2.2.3
@@ -1,5 +1,5 @@
-require_gcc
-install_package "readline-6.2" "https://ftpmirror.gnu.org/readline/readline-6.2.tar.gz#79a696070a058c233c72dd6ac697021cc64abd5ed51e59db867d66d196a89381" standard --if has_broken_mac_readline
-install_package "Python-2.2.3" "https://www.python.org/ftp/python/2.2.3/Python-2.2.3.tgz#a8f92e6b89d47359fff0d1fbfe47f104afc77fd1cd5143e7332758b7bc100188" ldflags_dirs standard verify_py22
-#install_package "setuptools-1.4.2" "https://pypi.python.org/packages/source/s/setuptools/setuptools-1.4.2.tar.gz#263986a60a83aba790a5bffc7d009ac88114ba4e908e5c90e453b3bf2155dbbd" python
-#install_package "pip-1.1" "https://pypi.python.org/packages/source/p/pip/pip-1.1.tar.gz#993804bb947d18508acee02141281c77d27677f8c14eaa64d6287a1c53ef01c8" python
+#require_gcc
+install_package "readline-6.2" "http://ftpmirror.gnu.org/readline/readline-6.2.tar.gz#67948acb2ca081f23359d0256e9a271c" standard --if has_broken_mac_readline
+install_package "Python-2.2.3" "http://www.python.org/ftp/python/2.2.3/Python-2.2.3.tgz#a8f92e6b89d47359fff0d1fbfe47f104afc77fd1cd5143e7332758b7bc100188" ldflags_dirs standard verify_py22
+#install_package "setuptools-1.4.2" "https://pypi.python.org/packages/source/s/setuptools/setuptools-1.4.2.tar.gz#13951be6711438073fbe50843e7f141f" python
+#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.3.7
+++ b/plugins/python-build/share/python-build/2.3.7
@@ -1,5 +1,5 @@
-require_gcc
-install_package "readline-6.2" "https://ftpmirror.gnu.org/readline/readline-6.2.tar.gz#79a696070a058c233c72dd6ac697021cc64abd5ed51e59db867d66d196a89381" standard --if has_broken_mac_readline
-install_package "Python-2.3.7" "https://www.python.org/ftp/python/2.3.7/Python-2.3.7.tgz#969a9891dce9f50b13e54f9890acaf2be66715a5895bf9b11111f320c205b90e" ldflags_dirs standard verify_py23
-#install_package "setuptools-1.4.2" "https://pypi.python.org/packages/source/s/setuptools/setuptools-1.4.2.tar.gz#263986a60a83aba790a5bffc7d009ac88114ba4e908e5c90e453b3bf2155dbbd" python
-#install_package "pip-1.1" "https://pypi.python.org/packages/source/p/pip/pip-1.1.tar.gz#993804bb947d18508acee02141281c77d27677f8c14eaa64d6287a1c53ef01c8" python
+#require_gcc
+install_package "readline-6.2" "http://ftpmirror.gnu.org/readline/readline-6.2.tar.gz#67948acb2ca081f23359d0256e9a271c" standard --if has_broken_mac_readline
+install_package "Python-2.3.7" "http://python.org/ftp/python/2.3.7/Python-2.3.7.tgz#969a9891dce9f50b13e54f9890acaf2be66715a5895bf9b11111f320c205b90e" ldflags_dirs standard verify_py23
+#install_package "setuptools-1.4.2" "https://pypi.python.org/packages/source/s/setuptools/setuptools-1.4.2.tar.gz#13951be6711438073fbe50843e7f141f" python
+#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
+++ b/plugins/python-build/share/python-build/2.4
@@ -1,5 +1,5 @@
-require_gcc
-install_package "readline-6.3" "https://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43" standard --if has_broken_mac_readline
-install_package "Python-2.4" "https://www.python.org/ftp/python/2.4/Python-2.4.tgz#ff746de0fae8691c082414b42a2bb172da8797e6e8ff66c9a39d2e452f7034e9" ldflags_dirs standard verify_py24
+#require_gcc
+install_package "readline-6.3" "http://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43" standard --if has_broken_mac_readline
+install_package "Python-2.4" "http://python.org/ftp/python/2.4/Python-2.4.tgz#ff746de0fae8691c082414b42a2bb172da8797e6e8ff66c9a39d2e452f7034e9" ldflags_dirs standard verify_py24
 install_package "setuptools-1.4.2" "https://pypi.python.org/packages/source/s/setuptools/setuptools-1.4.2.tar.gz#263986a60a83aba790a5bffc7d009ac88114ba4e908e5c90e453b3bf2155dbbd" python
 install_package "pip-1.1" "https://pypi.python.org/packages/source/p/pip/pip-1.1.tar.gz#993804bb947d18508acee02141281c77d27677f8c14eaa64d6287a1c53ef01c8" 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.3" "https://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43" standard --if has_broken_mac_readline
-install_package "Python-2.4.1" "https://www.python.org/ftp/python/2.4.1/Python-2.4.1.tgz#f449c3b167389324c525ad99d02376c518ac11e163dbbbc13bc88a5c7101fd00" ldflags_dirs standard verify_py24
+#require_gcc
+install_package "readline-6.3" "http://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43" standard --if has_broken_mac_readline
+install_package "Python-2.4.1" "http://python.org/ftp/python/2.4.1/Python-2.4.1.tgz#f449c3b167389324c525ad99d02376c518ac11e163dbbbc13bc88a5c7101fd00" ldflags_dirs standard verify_py24
 install_package "setuptools-1.4.2" "https://pypi.python.org/packages/source/s/setuptools/setuptools-1.4.2.tar.gz#263986a60a83aba790a5bffc7d009ac88114ba4e908e5c90e453b3bf2155dbbd" python
 install_package "pip-1.1" "https://pypi.python.org/packages/source/p/pip/pip-1.1.tar.gz#993804bb947d18508acee02141281c77d27677f8c14eaa64d6287a1c53ef01c8" 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.3" "https://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43" standard --if has_broken_mac_readline
-install_package "Python-2.4.2" "https://www.python.org/ftp/python/2.4.2/Python-2.4.2.tgz#2653e1846e87fd9b3ee287fefc965c80c54646548b4913a22265b0dd54493adf" ldflags_dirs standard verify_py24
+#require_gcc
+install_package "readline-6.3" "http://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43" standard --if has_broken_mac_readline
+install_package "Python-2.4.2" "http://python.org/ftp/python/2.4.2/Python-2.4.2.tgz#2653e1846e87fd9b3ee287fefc965c80c54646548b4913a22265b0dd54493adf" ldflags_dirs standard verify_py24
 install_package "setuptools-1.4.2" "https://pypi.python.org/packages/source/s/setuptools/setuptools-1.4.2.tar.gz#263986a60a83aba790a5bffc7d009ac88114ba4e908e5c90e453b3bf2155dbbd" python
 install_package "pip-1.1" "https://pypi.python.org/packages/source/p/pip/pip-1.1.tar.gz#993804bb947d18508acee02141281c77d27677f8c14eaa64d6287a1c53ef01c8" 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.3" "https://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43" standard --if has_broken_mac_readline
-install_package "Python-2.4.3" "https://www.python.org/ftp/python/2.4.3/Python-2.4.3.tgz#985a413932f5e31e6280b37da6b285a3a0b2748c6786643989ed9b23de97e2d5" ldflags_dirs standard verify_py24
+#require_gcc
+install_package "readline-6.3" "http://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43" standard --if has_broken_mac_readline
+install_package "Python-2.4.3" "http://python.org/ftp/python/2.4.3/Python-2.4.3.tgz#985a413932f5e31e6280b37da6b285a3a0b2748c6786643989ed9b23de97e2d5" ldflags_dirs standard verify_py24
 install_package "setuptools-1.4.2" "https://pypi.python.org/packages/source/s/setuptools/setuptools-1.4.2.tar.gz#263986a60a83aba790a5bffc7d009ac88114ba4e908e5c90e453b3bf2155dbbd" python
 install_package "pip-1.1" "https://pypi.python.org/packages/source/p/pip/pip-1.1.tar.gz#993804bb947d18508acee02141281c77d27677f8c14eaa64d6287a1c53ef01c8" 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.3" "https://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43" standard --if has_broken_mac_readline
-install_package "Python-2.4.4" "https://www.python.org/ftp/python/2.4.4/Python-2.4.4.tgz#92be6e20cbc3111d9dd0c016d72ef7914c23b879dc52df7ba28df97afbf12e2e" ldflags_dirs standard verify_py24
+#require_gcc
+install_package "readline-6.3" "http://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43" standard --if has_broken_mac_readline
+install_package "Python-2.4.4" "http://python.org/ftp/python/2.4.4/Python-2.4.4.tgz#92be6e20cbc3111d9dd0c016d72ef7914c23b879dc52df7ba28df97afbf12e2e" ldflags_dirs standard verify_py24
 install_package "setuptools-1.4.2" "https://pypi.python.org/packages/source/s/setuptools/setuptools-1.4.2.tar.gz#263986a60a83aba790a5bffc7d009ac88114ba4e908e5c90e453b3bf2155dbbd" python
 install_package "pip-1.1" "https://pypi.python.org/packages/source/p/pip/pip-1.1.tar.gz#993804bb947d18508acee02141281c77d27677f8c14eaa64d6287a1c53ef01c8" 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.3" "https://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43" standard --if has_broken_mac_readline
-install_package "Python-2.4.5" "https://www.python.org/ftp/python/2.4.5/Python-2.4.5.tgz#6ae6f67a388a7f70ed3a20eebab5aae995ee433089d1f1724095c62f4b7389a1" ldflags_dirs standard verify_py24
+#require_gcc
+install_package "readline-6.3" "http://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43" standard --if has_broken_mac_readline
+install_package "Python-2.4.5" "http://python.org/ftp/python/2.4.5/Python-2.4.5.tgz#6ae6f67a388a7f70ed3a20eebab5aae995ee433089d1f1724095c62f4b7389a1" ldflags_dirs standard verify_py24
 install_package "setuptools-1.4.2" "https://pypi.python.org/packages/source/s/setuptools/setuptools-1.4.2.tar.gz#263986a60a83aba790a5bffc7d009ac88114ba4e908e5c90e453b3bf2155dbbd" python
 install_package "pip-1.1" "https://pypi.python.org/packages/source/p/pip/pip-1.1.tar.gz#993804bb947d18508acee02141281c77d27677f8c14eaa64d6287a1c53ef01c8" 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.3" "https://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43" standard --if has_broken_mac_readline
-install_package "Python-2.4.6" "https://www.python.org/ftp/python/2.4.6/Python-2.4.6.tgz#b03f269e826927f05c966cf4f4414f3c93ee2314960859e7f8375e24e82f8b02" ldflags_dirs standard verify_py24
+#require_gcc
+install_package "readline-6.3" "http://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43" standard --if has_broken_mac_readline
+install_package "Python-2.4.6" "http://python.org/ftp/python/2.4.6/Python-2.4.6.tgz#b03f269e826927f05c966cf4f4414f3c93ee2314960859e7f8375e24e82f8b02" ldflags_dirs standard verify_py24
 install_package "setuptools-1.4.2" "https://pypi.python.org/packages/source/s/setuptools/setuptools-1.4.2.tar.gz#263986a60a83aba790a5bffc7d009ac88114ba4e908e5c90e453b3bf2155dbbd" python
 install_package "pip-1.1" "https://pypi.python.org/packages/source/p/pip/pip-1.1.tar.gz#993804bb947d18508acee02141281c77d27677f8c14eaa64d6287a1c53ef01c8" 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.3" "https://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43" standard --if has_broken_mac_readline
-install_package "Python-2.5" "https://www.python.org/ftp/python/2.5/Python-2.5.tgz#d7bbf42e36003c6065cd19f3e67d283521858515ee923220f654131cebe1d8f2" ldflags_dirs standard verify_py25
+install_package "readline-6.3" "http://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43" standard --if has_broken_mac_readline
+install_package "Python-2.5" "http://python.org/ftp/python/2.5/Python-2.5.tgz#d7bbf42e36003c6065cd19f3e67d283521858515ee923220f654131cebe1d8f2" ldflags_dirs standard verify_py25
 install_package "setuptools-1.4.2" "https://pypi.python.org/packages/source/s/setuptools/setuptools-1.4.2.tar.gz#263986a60a83aba790a5bffc7d009ac88114ba4e908e5c90e453b3bf2155dbbd" python
 install_package "pip-1.3.1" "https://pypi.python.org/packages/source/p/pip/pip-1.3.1.tar.gz#145eaa5d1ea1b062663da1f3a97780d7edea4c63c68a37c463b1deedf7bb4957" 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.3" "https://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43" standard --if has_broken_mac_readline
-install_package "Python-2.5.1" "https://www.python.org/ftp/python/2.5.1/Python-2.5.1.tgz#1f5caee846049ca30d996f9403eefdb996295c4af664867e35dcc5eb36e4e7e8" ldflags_dirs standard verify_py25
+install_package "readline-6.3" "http://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43" standard --if has_broken_mac_readline
+install_package "Python-2.5.1" "http://python.org/ftp/python/2.5.1/Python-2.5.1.tgz#1f5caee846049ca30d996f9403eefdb996295c4af664867e35dcc5eb36e4e7e8" ldflags_dirs standard verify_py25
 install_package "setuptools-1.4.2" "https://pypi.python.org/packages/source/s/setuptools/setuptools-1.4.2.tar.gz#263986a60a83aba790a5bffc7d009ac88114ba4e908e5c90e453b3bf2155dbbd" python
 install_package "pip-1.3.1" "https://pypi.python.org/packages/source/p/pip/pip-1.3.1.tar.gz#145eaa5d1ea1b062663da1f3a97780d7edea4c63c68a37c463b1deedf7bb4957" 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.3" "https://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43" standard --if has_broken_mac_readline
-install_package "Python-2.5.2" "https://www.python.org/ftp/python/2.5.2/Python-2.5.2.tgz#834afe8a88adaf623b05ac5dd6700dd5bb5d0d5553fc74ad529359a3496e4ae3" ldflags_dirs standard verify_py25
+install_package "readline-6.3" "http://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43" standard --if has_broken_mac_readline
+install_package "Python-2.5.2" "http://python.org/ftp/python/2.5.2/Python-2.5.2.tgz#834afe8a88adaf623b05ac5dd6700dd5bb5d0d5553fc74ad529359a3496e4ae3" ldflags_dirs standard verify_py25
 install_package "setuptools-1.4.2" "https://pypi.python.org/packages/source/s/setuptools/setuptools-1.4.2.tar.gz#263986a60a83aba790a5bffc7d009ac88114ba4e908e5c90e453b3bf2155dbbd" python
 install_package "pip-1.3.1" "https://pypi.python.org/packages/source/p/pip/pip-1.3.1.tar.gz#145eaa5d1ea1b062663da1f3a97780d7edea4c63c68a37c463b1deedf7bb4957" 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.3" "https://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43" standard --if has_broken_mac_readline
-install_package "Python-2.5.3" "https://www.python.org/ftp/python/2.5.3/Python-2.5.3.tgz#c3fee607d20a77dfb72ea2e627eb4d95d25c735603435abde62c57015a0445bd" ldflags_dirs standard verify_py25
+install_package "readline-6.3" "http://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43" standard --if has_broken_mac_readline
+install_package "Python-2.5.3" "http://python.org/ftp/python/2.5.3/Python-2.5.3.tgz#c3fee607d20a77dfb72ea2e627eb4d95d25c735603435abde62c57015a0445bd" ldflags_dirs standard verify_py25
 install_package "setuptools-1.4.2" "https://pypi.python.org/packages/source/s/setuptools/setuptools-1.4.2.tar.gz#263986a60a83aba790a5bffc7d009ac88114ba4e908e5c90e453b3bf2155dbbd" python
 install_package "pip-1.3.1" "https://pypi.python.org/packages/source/p/pip/pip-1.3.1.tar.gz#145eaa5d1ea1b062663da1f3a97780d7edea4c63c68a37c463b1deedf7bb4957" 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.3" "https://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43" standard --if has_broken_mac_readline
-install_package "Python-2.5.4" "https://www.python.org/ftp/python/2.5.4/Python-2.5.4.tgz#3d3b205611ee503a38a9433d5645a571668420bb219242c7f51af85f05664da6" ldflags_dirs standard verify_py25
+install_package "readline-6.3" "http://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43" standard --if has_broken_mac_readline
+install_package "Python-2.5.4" "http://python.org/ftp/python/2.5.4/Python-2.5.4.tgz#3d3b205611ee503a38a9433d5645a571668420bb219242c7f51af85f05664da6" ldflags_dirs standard verify_py25
 install_package "setuptools-1.4.2" "https://pypi.python.org/packages/source/s/setuptools/setuptools-1.4.2.tar.gz#263986a60a83aba790a5bffc7d009ac88114ba4e908e5c90e453b3bf2155dbbd" python
 install_package "pip-1.3.1" "https://pypi.python.org/packages/source/p/pip/pip-1.3.1.tar.gz#145eaa5d1ea1b062663da1f3a97780d7edea4c63c68a37c463b1deedf7bb4957" 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.3" "https://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43" standard --if has_broken_mac_readline
-install_package "Python-2.5.5" "https://www.python.org/ftp/python/2.5.5/Python-2.5.5.tgz#03be1019c4fe93daeb53ba9e4294bf22a8ed4cb854cbd57e24e16f6bf63e2392" ldflags_dirs standard verify_py25
+install_package "readline-6.3" "http://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43" standard --if has_broken_mac_readline
+install_package "Python-2.5.5" "http://python.org/ftp/python/2.5.5/Python-2.5.5.tgz#03be1019c4fe93daeb53ba9e4294bf22a8ed4cb854cbd57e24e16f6bf63e2392" ldflags_dirs standard verify_py25
 install_package "setuptools-1.4.2" "https://pypi.python.org/packages/source/s/setuptools/setuptools-1.4.2.tar.gz#263986a60a83aba790a5bffc7d009ac88114ba4e908e5c90e453b3bf2155dbbd" python
 install_package "pip-1.3.1" "https://pypi.python.org/packages/source/p/pip/pip-1.3.1.tar.gz#145eaa5d1ea1b062663da1f3a97780d7edea4c63c68a37c463b1deedf7bb4957" 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.3" "https://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43" standard --if has_broken_mac_readline
-install_package "Python-2.5.6" "https://www.python.org/ftp/python/2.5.6/Python-2.5.6.tgz#c2e4377597241b1065677d23327c04d0f41945d370c61a491cc88be367234c5d" ldflags_dirs standard verify_py25
+install_package "readline-6.3" "http://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43" standard --if has_broken_mac_readline
+install_package "Python-2.5.6" "http://python.org/ftp/python/2.5.6/Python-2.5.6.tgz#c2e4377597241b1065677d23327c04d0f41945d370c61a491cc88be367234c5d" ldflags_dirs standard verify_py25
 install_package "setuptools-1.4.2" "https://pypi.python.org/packages/source/s/setuptools/setuptools-1.4.2.tar.gz#263986a60a83aba790a5bffc7d009ac88114ba4e908e5c90e453b3bf2155dbbd" python
 install_package "pip-1.3.1" "https://pypi.python.org/packages/source/p/pip/pip-1.3.1.tar.gz#145eaa5d1ea1b062663da1f3a97780d7edea4c63c68a37c463b1deedf7bb4957" python
--- a/plugins/python-build/share/python-build/2.6.6
+++ b/plugins/python-build/share/python-build/2.6.6
@@ -1,4 +1,3 @@
 #require_gcc
-install_package "openssl-1.0.2k" "https://www.openssl.org/source/openssl-1.0.2k.tar.gz#6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0" mac_openssl --if has_broken_mac_openssl
-install_package "readline-6.3" "https://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43" standard --if has_broken_mac_readline
-install_package "Python-2.6.6" "https://www.python.org/ftp/python/2.6.6/Python-2.6.6.tgz#372f66db46d773214e4619df1794a26449158f626138d4d2141a64c2f017fae1" ldflags_dirs standard verify_py26 ensurepip
+install_package "readline-6.3" "http://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43" standard --if has_broken_mac_readline
+install_package "Python-2.6.6" "http://python.org/ftp/python/2.6.6/Python-2.6.6.tgz#372f66db46d773214e4619df1794a26449158f626138d4d2141a64c2f017fae1" ldflags_dirs standard verify_py26 ensurepip
--- a/plugins/python-build/share/python-build/2.6.7
+++ b/plugins/python-build/share/python-build/2.6.7
@@ -1,4 +1,3 @@
 #require_gcc
-install_package "openssl-1.0.2k" "https://www.openssl.org/source/openssl-1.0.2k.tar.gz#6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0" mac_openssl --if has_broken_mac_openssl
-install_package "readline-6.3" "https://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43" standard --if has_broken_mac_readline
-install_package "Python-2.6.7" "https://www.python.org/ftp/python/2.6.7/Python-2.6.7.tgz#a8093eace4cfd3e06b05f0deb5d765e3c6cec65908048640a8cadd7a948b3826" ldflags_dirs standard verify_py26 ensurepip
+install_package "readline-6.3" "http://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43" standard --if has_broken_mac_readline
+install_package "Python-2.6.7" "http://python.org/ftp/python/2.6.7/Python-2.6.7.tgz#a8093eace4cfd3e06b05f0deb5d765e3c6cec65908048640a8cadd7a948b3826" ldflags_dirs standard verify_py26 ensurepip
--- a/plugins/python-build/share/python-build/2.6.8
+++ b/plugins/python-build/share/python-build/2.6.8
@@ -1,4 +1,3 @@
 #require_gcc
-install_package "openssl-1.0.2k" "https://www.openssl.org/source/openssl-1.0.2k.tar.gz#6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0" mac_openssl --if has_broken_mac_openssl
-install_package "readline-6.3" "https://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43" standard --if has_broken_mac_readline
-install_package "Python-2.6.8" "https://www.python.org/ftp/python/2.6.8/Python-2.6.8.tgz#5bf02a75ffa2fcaa5a3cabb8201998519b045541975622316888ea468d9512f7" ldflags_dirs standard verify_py26 ensurepip
+install_package "readline-6.3" "http://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43" standard --if has_broken_mac_readline
+install_package "Python-2.6.8" "http://python.org/ftp/python/2.6.8/Python-2.6.8.tgz#5bf02a75ffa2fcaa5a3cabb8201998519b045541975622316888ea468d9512f7" ldflags_dirs standard verify_py26 ensurepip
--- a/plugins/python-build/share/python-build/2.6.9
+++ b/plugins/python-build/share/python-build/2.6.9
@@ -1,4 +1,3 @@
 #require_gcc
-install_package "openssl-1.0.2k" "https://www.openssl.org/source/openssl-1.0.2k.tar.gz#6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0" mac_openssl --if has_broken_mac_openssl
-install_package "readline-6.3" "https://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43" standard --if has_broken_mac_readline
-install_package "Python-2.6.9" "https://www.python.org/ftp/python/2.6.9/Python-2.6.9.tgz#7277b1285d8a82f374ef6ebaac85b003266f7939b3f2a24a3af52f9523ac94db" ldflags_dirs standard verify_py26 ensurepip
+install_package "readline-6.3" "http://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43" standard --if has_broken_mac_readline
+install_package "Python-2.6.9" "http://python.org/ftp/python/2.6.9/Python-2.6.9.tgz#7277b1285d8a82f374ef6ebaac85b003266f7939b3f2a24a3af52f9523ac94db" ldflags_dirs standard verify_py26 ensurepip
--- a/plugins/python-build/share/python-build/2.7
+++ b/plugins/python-build/share/python-build/2.7
@@ -1,4 +1,3 @@
 #require_gcc
-install_package "openssl-1.0.2k" "https://www.openssl.org/source/openssl-1.0.2k.tar.gz#6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0" mac_openssl --if has_broken_mac_openssl
-install_package "readline-6.3" "https://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43" standard --if has_broken_mac_readline
-install_package "Python-2.7" "https://www.python.org/ftp/python/2.7/Python-2.7.tgz#5670dd6c0c93b0b529781d070852f7b51ce6855615b16afcd318341af2910fb5" ldflags_dirs standard verify_py27 ensurepip
+install_package "readline-6.3" "http://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43" standard --if has_broken_mac_readline
+install_package "Python-2.7" "http://python.org/ftp/python/2.7/Python-2.7.tgz#5670dd6c0c93b0b529781d070852f7b51ce6855615b16afcd318341af2910fb5" ldflags_dirs standard verify_py27 ensurepip
--- a/plugins/python-build/share/python-build/2.7-dev
+++ b/plugins/python-build/share/python-build/2.7-dev
@@ -1,4 +1,3 @@
 #require_gcc
-install_package "openssl-1.0.2k" "https://www.openssl.org/source/openssl-1.0.2k.tar.gz#6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0" mac_openssl --if has_broken_mac_openssl
-install_package "readline-6.3" "https://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43" standard --if has_broken_mac_readline
-install_git "Python-2.7-dev" "https://github.com/python/cpython" "2.7" standard verify_py27 ensurepip
+install_package "readline-6.3" "http://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43" standard --if has_broken_mac_readline
+install_hg "Python-2.7-dev" "https://bitbucket.org/mirror/cpython" "2.7" standard verify_py27 ensurepip
--- a/plugins/python-build/share/python-build/2.7.1
+++ b/plugins/python-build/share/python-build/2.7.1
@@ -1,4 +1,3 @@
 #require_gcc
-install_package "openssl-1.0.2k" "https://www.openssl.org/source/openssl-1.0.2k.tar.gz#6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0" mac_openssl --if has_broken_mac_openssl
-install_package "readline-6.3" "https://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43" standard --if has_broken_mac_readline
-install_package "Python-2.7.1" "https://www.python.org/ftp/python/2.7.1/Python-2.7.1.tgz#ca13e7b1860821494f70de017202283ad73b1fb7bd88586401c54ef958226ec8" ldflags_dirs standard verify_py27 ensurepip
+install_package "readline-6.3" "http://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43" standard --if has_broken_mac_readline
+install_package "Python-2.7.1" "http://python.org/ftp/python/2.7.1/Python-2.7.1.tgz#ca13e7b1860821494f70de017202283ad73b1fb7bd88586401c54ef958226ec8" ldflags_dirs standard verify_py27 ensurepip
--- a/plugins/python-build/share/python-build/2.7.10
+++ b/plugins/python-build/share/python-build/2.7.10
@@ -1,8 +0,0 @@
-#require_gcc
-install_package "openssl-1.0.2k" "https://www.openssl.org/source/openssl-1.0.2k.tar.gz#6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0" mac_openssl --if has_broken_mac_openssl
-install_package "readline-6.3" "https://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43" standard --if has_broken_mac_readline
-if has_tar_xz_support; then
-  install_package "Python-2.7.10" "https://www.python.org/ftp/python/2.7.10/Python-2.7.10.tar.xz#1cd3730781b91caf0fa1c4d472dc29274186480161a150294c42ce9b5c5effc0" ldflags_dirs standard verify_py27 ensurepip
-else
-  install_package "Python-2.7.10" "https://www.python.org/ftp/python/2.7.10/Python-2.7.10.tgz#eda8ce6eec03e74991abb5384170e7c65fcd7522e409b8e83d7e6372add0f12a" ldflags_dirs standard verify_py27 ensurepip
-fi
--- a/plugins/python-build/share/python-build/2.7.11
+++ b/plugins/python-build/share/python-build/2.7.11
@@ -1,8 +0,0 @@
-#require_gcc
-install_package "openssl-1.0.2k" "https://www.openssl.org/source/openssl-1.0.2k.tar.gz#6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0" mac_openssl --if has_broken_mac_openssl
-install_package "readline-6.3" "https://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43" standard --if has_broken_mac_readline
-if has_tar_xz_support; then
-  install_package "Python-2.7.11" "https://www.python.org/ftp/python/2.7.11/Python-2.7.11.tar.xz#962b4c45af50124ea61f11a30deb4342fc0bc21126790fa1d7f6c79809413f46" ldflags_dirs standard verify_py27 ensurepip
-else
-  install_package "Python-2.7.11" "https://www.python.org/ftp/python/2.7.11/Python-2.7.11.tgz#82929b96fd6afc8da838b149107078c02fa1744b7e60999a8babbc0d3fa86fc6" ldflags_dirs standard verify_py27 ensurepip
-fi
--- a/plugins/python-build/share/python-build/2.7.12
+++ b/plugins/python-build/share/python-build/2.7.12
@@ -1,8 +0,0 @@
-#require_gcc
-install_package "openssl-1.0.2k" "https://www.openssl.org/source/openssl-1.0.2k.tar.gz#6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0" mac_openssl --if has_broken_mac_openssl
-install_package "readline-6.3" "https://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43" standard --if has_broken_mac_readline
-if has_tar_xz_support; then
-  install_package "Python-2.7.12" "https://www.python.org/ftp/python/2.7.12/Python-2.7.12.tar.xz#d7837121dd5652a05fef807c361909d255d173280c4e1a4ded94d73d80a1f978" ldflags_dirs standard verify_py27 ensurepip
-else
-  install_package "Python-2.7.12" "https://www.python.org/ftp/python/2.7.12/Python-2.7.12.tgz#3cb522d17463dfa69a155ab18cffa399b358c966c0363d6c8b5b3bf1384da4b6" ldflags_dirs standard verify_py27 ensurepip
-fi
--- a/plugins/python-build/share/python-build/2.7.13
+++ b/plugins/python-build/share/python-build/2.7.13
@@ -1,8 +0,0 @@
-#require_gcc
-install_package "openssl-1.0.2k" "https://www.openssl.org/source/openssl-1.0.2k.tar.gz#6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0" mac_openssl --if has_broken_mac_openssl
-install_package "readline-6.3" "https://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43" standard --if has_broken_mac_readline
-if has_tar_xz_support; then
-  install_package "Python-2.7.13" "https://www.python.org/ftp/python/2.7.13/Python-2.7.13.tar.xz#35d543986882f78261f97787fd3e06274bfa6df29fac9b4a94f73930ff98f731" ldflags_dirs standard verify_py27 ensurepip
-else
-  install_package "Python-2.7.13" "https://www.python.org/ftp/python/2.7.13/Python-2.7.13.tgz#a4f05a0720ce0fd92626f0278b6b433eee9a6173ddf2bced7957dfb599a5ece1" ldflags_dirs standard verify_py27 ensurepip
-fi
--- a/plugins/python-build/share/python-build/2.7.14
+++ b/plugins/python-build/share/python-build/2.7.14
@@ -1,8 +0,0 @@
-#require_gcc
-install_package "openssl-1.0.2k" "https://www.openssl.org/source/openssl-1.0.2k.tar.gz#6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0" mac_openssl --if has_broken_mac_openssl
-install_package "readline-6.3" "https://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43" standard --if has_broken_mac_readline
-if has_tar_xz_support; then
-  install_package "Python-2.7.14" "https://www.python.org/ftp/python/2.7.14/Python-2.7.14.tar.xz#71ffb26e09e78650e424929b2b457b9c912ac216576e6bd9e7d204ed03296a66" ldflags_dirs standard verify_py27 ensurepip
-else
-  install_package "Python-2.7.14" "https://www.python.org/ftp/python/2.7.14/Python-2.7.14.tgz#304c9b202ea6fbd0a4a8e0ad3733715fbd4749f2204a9173a58ec53c32ea73e8" ldflags_dirs standard verify_py27 ensurepip
-fi
--- a/plugins/python-build/share/python-build/2.7.2
+++ b/plugins/python-build/share/python-build/2.7.2
@@ -1,4 +1,3 @@
 #require_gcc
-install_package "openssl-1.0.2k" "https://www.openssl.org/source/openssl-1.0.2k.tar.gz#6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0" mac_openssl --if has_broken_mac_openssl
-install_package "readline-6.3" "https://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43" standard --if has_broken_mac_readline
-install_package "Python-2.7.2" "https://www.python.org/ftp/python/2.7.2/Python-2.7.2.tgz#1d54b7096c17902c3f40ffce7e5b84e0072d0144024184fff184a84d563abbb3" ldflags_dirs standard verify_py27 ensurepip
+install_package "readline-6.3" "http://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43" standard --if has_broken_mac_readline
+install_package "Python-2.7.2" "http://python.org/ftp/python/2.7.2/Python-2.7.2.tgz#1d54b7096c17902c3f40ffce7e5b84e0072d0144024184fff184a84d563abbb3" ldflags_dirs standard verify_py27 ensurepip
--- a/plugins/python-build/share/python-build/2.7.3
+++ b/plugins/python-build/share/python-build/2.7.3
@@ -1,4 +1,3 @@
 #require_gcc
-install_package "openssl-1.0.2k" "https://www.openssl.org/source/openssl-1.0.2k.tar.gz#6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0" mac_openssl --if has_broken_mac_openssl
-install_package "readline-6.3" "https://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43" standard --if has_broken_mac_readline
-install_package "Python-2.7.3" "https://www.python.org/ftp/python/2.7.3/Python-2.7.3.tgz#d4c20f2b5faf95999fd5fecb3f7d32071b0820516224a6d2b72932ab47a1cb8e" ldflags_dirs standard verify_py27 ensurepip
+install_package "readline-6.3" "http://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43" standard --if has_broken_mac_readline
+install_package "Python-2.7.3" "http://python.org/ftp/python/2.7.3/Python-2.7.3.tgz#d4c20f2b5faf95999fd5fecb3f7d32071b0820516224a6d2b72932ab47a1cb8e" ldflags_dirs standard verify_py27 ensurepip
--- a/plugins/python-build/share/python-build/2.7.4
+++ b/plugins/python-build/share/python-build/2.7.4
@@ -1,4 +1,3 @@
 #require_gcc
-install_package "openssl-1.0.2k" "https://www.openssl.org/source/openssl-1.0.2k.tar.gz#6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0" mac_openssl --if has_broken_mac_openssl
-install_package "readline-6.3" "https://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43" standard --if has_broken_mac_readline
-install_package "Python-2.7.4" "https://www.python.org/ftp/python/2.7.4/Python-2.7.4.tgz#98c5eb9c8e65effcc0122112ba17a0bce880aa23ecb560af56b55eb55632b81a" ldflags_dirs standard verify_py27 ensurepip
+install_package "readline-6.3" "http://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43" standard --if has_broken_mac_readline
+install_package "Python-2.7.4" "http://python.org/ftp/python/2.7.4/Python-2.7.4.tgz#98c5eb9c8e65effcc0122112ba17a0bce880aa23ecb560af56b55eb55632b81a" ldflags_dirs standard verify_py27 ensurepip
--- a/plugins/python-build/share/python-build/2.7.5
+++ b/plugins/python-build/share/python-build/2.7.5
@@ -1,4 +1,3 @@
 #require_gcc
-install_package "openssl-1.0.2k" "https://www.openssl.org/source/openssl-1.0.2k.tar.gz#6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0" mac_openssl --if has_broken_mac_openssl
-install_package "readline-6.3" "https://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43" standard --if has_broken_mac_readline
-install_package "Python-2.7.5" "https://www.python.org/ftp/python/2.7.5/Python-2.7.5.tgz#8e1b5fa87b91835afb376a9c0d319d41feca07ffebc0288d97ab08d64f48afbf" ldflags_dirs standard verify_py27 ensurepip
+install_package "readline-6.3" "http://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43" standard --if has_broken_mac_readline
+install_package "Python-2.7.5" "http://python.org/ftp/python/2.7.5/Python-2.7.5.tgz#8e1b5fa87b91835afb376a9c0d319d41feca07ffebc0288d97ab08d64f48afbf" ldflags_dirs standard verify_py27 ensurepip
--- a/plugins/python-build/share/python-build/2.7.6
+++ b/plugins/python-build/share/python-build/2.7.6
@@ -1,4 +1,3 @@
 #require_gcc
-install_package "openssl-1.0.2k" "https://www.openssl.org/source/openssl-1.0.2k.tar.gz#6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0" mac_openssl --if has_broken_mac_openssl
-install_package "readline-6.3" "https://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43" standard --if has_broken_mac_readline
-install_package "Python-2.7.6" "https://www.python.org/ftp/python/2.7.6/Python-2.7.6.tgz#99c6860b70977befa1590029fae092ddb18db1d69ae67e8b9385b66ed104ba58" ldflags_dirs standard verify_py27 ensurepip
+install_package "readline-6.3" "http://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43" standard --if has_broken_mac_readline
+install_package "Python-2.7.6" "http://python.org/ftp/python/2.7.6/Python-2.7.6.tgz#99c6860b70977befa1590029fae092ddb18db1d69ae67e8b9385b66ed104ba58" ldflags_dirs standard verify_py27 ensurepip
--- a/plugins/python-build/share/python-build/2.7.7
+++ b/plugins/python-build/share/python-build/2.7.7
@@ -1,8 +1,3 @@
 #require_gcc
-install_package "openssl-1.0.2k" "https://www.openssl.org/source/openssl-1.0.2k.tar.gz#6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0" mac_openssl --if has_broken_mac_openssl
-install_package "readline-6.3" "https://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43" standard --if has_broken_mac_readline
-if has_tar_xz_support; then
-  install_package "Python-2.7.7" "https://www.python.org/ftp/python/2.7.7/Python-2.7.7.tar.xz#2983e3cd089b30c50e2b2234f07c2ac4fb8a5df230ab8f2e1133a1d8b208da78" ldflags_dirs standard verify_py27 ensurepip
-else
-  install_package "Python-2.7.7" "https://www.python.org/ftp/python/2.7.7/Python-2.7.7.tgz#7f49c0a6705ad89d925181e27d0aaa025ee4731ce0de64776c722216c3e66c42" ldflags_dirs standard verify_py27 ensurepip
-fi
+install_package "readline-6.3" "http://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43" standard --if has_broken_mac_readline
+install_package "Python-2.7.7" "https://www.python.org/ftp/python/2.7.7/Python-2.7.7.tgz#7f49c0a6705ad89d925181e27d0aaa025ee4731ce0de64776c722216c3e66c42" ldflags_dirs standard verify_py27 ensurepip
--- a/plugins/python-build/share/python-build/2.7.8
+++ b/plugins/python-build/share/python-build/2.7.8
@@ -1,8 +1,3 @@
 #require_gcc
-install_package "openssl-1.0.2k" "https://www.openssl.org/source/openssl-1.0.2k.tar.gz#6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0" mac_openssl --if has_broken_mac_openssl
-install_package "readline-6.3" "https://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43" standard --if has_broken_mac_readline
-if has_tar_xz_support; then
-  install_package "Python-2.7.8" "https://www.python.org/ftp/python/2.7.8/Python-2.7.8.tar.xz#edde10a0cb7d14e2735e682882d5b287028d1485c456758154c19573db68075a" ldflags_dirs standard verify_py27 ensurepip
-else
-  install_package "Python-2.7.8" "https://www.python.org/ftp/python/2.7.8/Python-2.7.8.tgz#74d70b914da4487aa1d97222b29e9554d042f825f26cb2b93abd20fdda56b557" ldflags_dirs standard verify_py27 ensurepip
-fi
+install_package "readline-6.3" "http://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43" standard --if has_broken_mac_readline
+install_package "Python-2.7.8" "https://www.python.org/ftp/python/2.7.8/Python-2.7.8.tgz#74d70b914da4487aa1d97222b29e9554d042f825f26cb2b93abd20fdda56b557" ldflags_dirs standard verify_py27 ensurepip
--- a/plugins/python-build/share/python-build/2.7.9
+++ b/plugins/python-build/share/python-build/2.7.9
@@ -1,8 +1,3 @@
 #require_gcc
-install_package "openssl-1.0.2k" "https://www.openssl.org/source/openssl-1.0.2k.tar.gz#6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0" mac_openssl --if has_broken_mac_openssl
-install_package "readline-6.3" "https://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43" standard --if has_broken_mac_readline
-if has_tar_xz_support; then
-  install_package "Python-2.7.9" "https://www.python.org/ftp/python/2.7.9/Python-2.7.9.tar.xz#90d27e14ea7e03570026850e2e50ba71ad20b7eb31035aada1cf3def8f8d4916" ldflags_dirs standard verify_py27 ensurepip
-else
-  install_package "Python-2.7.9" "https://www.python.org/ftp/python/2.7.9/Python-2.7.9.tgz#c8bba33e66ac3201dabdc556f0ea7cfe6ac11946ec32d357c4c6f9b018c12c5b" ldflags_dirs standard verify_py27 ensurepip
-fi
+install_package "readline-6.3" "http://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43" standard --if has_broken_mac_readline
+install_package "Python-2.7.9" "https://www.python.org/ftp/python/2.7.9/Python-2.7.9.tgz#c8bba33e66ac3201dabdc556f0ea7cfe6ac11946ec32d357c4c6f9b018c12c5b" ldflags_dirs standard verify_py27 ensurepip
--- a/plugins/python-build/share/python-build/3.0.1
+++ b/plugins/python-build/share/python-build/3.0.1
@@ -1,15 +1,5 @@
 #require_gcc
-install_package "openssl-1.0.2k" "https://www.openssl.org/source/openssl-1.0.2k.tar.gz#6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0" mac_openssl --if has_broken_mac_openssl
-install_package "readline-6.3" "https://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43" standard --if has_broken_mac_readline
-install_package "Python-3.0.1" "https://www.python.org/ftp/python/3.0.1/Python-3.0.1.tgz#7d5f2feae9035f1d3d9e6bb7f092dbf374d6bb4b25abd0d2d11f13bba1cb04de" ldflags_dirs standard verify_py30
-if [[ "Darwin" == "$(uname -s)" ]]; then
-  # https://github.com/pyenv/pyenv/issues/456
-  { echo
-    colorize 1 "WARNING"
-    echo ": pyenv cannot install setuptools-1.4.2 to CPython 3.0.1 on OS X."
-    echo "setuptools and pip will not be available until you install them manually."
-  } >&2
-else
-  install_package "setuptools-1.4.2" "https://pypi.python.org/packages/source/s/setuptools/setuptools-1.4.2.tar.gz#263986a60a83aba790a5bffc7d009ac88114ba4e908e5c90e453b3bf2155dbbd" python
-  install_package "pip-1.3.1" "https://pypi.python.org/packages/source/p/pip/pip-1.3.1.tar.gz#145eaa5d1ea1b062663da1f3a97780d7edea4c63c68a37c463b1deedf7bb4957" python
-fi
+install_package "readline-6.3" "http://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43" standard --if has_broken_mac_readline
+install_package "Python-3.0.1" "http://python.org/ftp/python/3.0.1/Python-3.0.1.tgz#7d5f2feae9035f1d3d9e6bb7f092dbf374d6bb4b25abd0d2d11f13bba1cb04de" ldflags_dirs standard verify_py30
+install_package "setuptools-1.4.2" "https://pypi.python.org/packages/source/s/setuptools/setuptools-1.4.2.tar.gz#263986a60a83aba790a5bffc7d009ac88114ba4e908e5c90e453b3bf2155dbbd" python
+install_package "pip-1.3.1" "https://pypi.python.org/packages/source/p/pip/pip-1.3.1.tar.gz#145eaa5d1ea1b062663da1f3a97780d7edea4c63c68a37c463b1deedf7bb4957" python
--- a/plugins/python-build/share/python-build/3.1
+++ b/plugins/python-build/share/python-build/3.1
@@ -1,6 +1,4 @@
 #require_gcc
-install_package "openssl-1.0.2k" "https://www.openssl.org/source/openssl-1.0.2k.tar.gz#6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0" mac_openssl --if has_broken_mac_openssl
-install_package "readline-6.3" "https://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43" standard --if has_broken_mac_readline
-install_package "Python-3.1" "https://www.python.org/ftp/python/3.1/Python-3.1.tgz#99a034cf574ea3c26412b0a0728126d7fd6ea9593d099d807a25d216ed031e6a" ldflags_dirs standard verify_py31
-install_package "setuptools-17.1.1" "https://pypi.python.org/packages/source/s/setuptools/setuptools-17.1.1.tar.gz#5bf42dbf406fd58a41029f53cffff1c90db5de1c5e0e560b5545cf2ec949c431" python
+install_package "readline-6.3" "http://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43" standard --if has_broken_mac_readline
+install_package "Python-3.1" "http://python.org/ftp/python/3.1/Python-3.1.tgz#99a034cf574ea3c26412b0a0728126d7fd6ea9593d099d807a25d216ed031e6a" ldflags_dirs standard verify_py31 ez_setup
 install_package "pip-1.5.6" "https://pypi.python.org/packages/source/p/pip/pip-1.5.6.tar.gz#b1a4ae66baf21b7eb05a5e4f37c50c2706fa28ea1f8780ce8efe14dcd9f1726c" python
--- a/plugins/python-build/share/python-build/3.1-dev
+++ b/plugins/python-build/share/python-build/3.1-dev
@@ -0,0 +1,3 @@
+#require_gcc
+install_package "readline-6.3" "http://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43" standard --if has_broken_mac_readline
+install_hg "Python-3.1-dev" "https://bitbucket.org/mirror/cpython" "3.1" standard verify_py31 ensurepip
--- a/plugins/python-build/share/python-build/3.1.1
+++ b/plugins/python-build/share/python-build/3.1.1
@@ -1,6 +1,4 @@
 #require_gcc
-install_package "openssl-1.0.2k" "https://www.openssl.org/source/openssl-1.0.2k.tar.gz#6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0" mac_openssl --if has_broken_mac_openssl
-install_package "readline-6.3" "https://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43" standard --if has_broken_mac_readline
-install_package "Python-3.1.1" "https://www.python.org/ftp/python/3.1.1/Python-3.1.1.tgz#5d85d7bff11c4db44920af99f64f4227c816f897f6bfa9dd8a2611165ca5f0a1" ldflags_dirs standard verify_py31
-install_package "setuptools-17.1.1" "https://pypi.python.org/packages/source/s/setuptools/setuptools-17.1.1.tar.gz#5bf42dbf406fd58a41029f53cffff1c90db5de1c5e0e560b5545cf2ec949c431" python
+install_package "readline-6.3" "http://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43" standard --if has_broken_mac_readline
+install_package "Python-3.1.1" "http://python.org/ftp/python/3.1.1/Python-3.1.1.tgz#5d85d7bff11c4db44920af99f64f4227c816f897f6bfa9dd8a2611165ca5f0a1" ldflags_dirs standard verify_py31 ez_setup
 install_package "pip-1.5.6" "https://pypi.python.org/packages/source/p/pip/pip-1.5.6.tar.gz#b1a4ae66baf21b7eb05a5e4f37c50c2706fa28ea1f8780ce8efe14dcd9f1726c" python
--- a/plugins/python-build/share/python-build/3.1.2
+++ b/plugins/python-build/share/python-build/3.1.2
@@ -1,6 +1,4 @@
 #require_gcc
-install_package "openssl-1.0.2k" "https://www.openssl.org/source/openssl-1.0.2k.tar.gz#6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0" mac_openssl --if has_broken_mac_openssl
-install_package "readline-6.3" "https://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43" standard --if has_broken_mac_readline
-install_package "Python-3.1.2" "https://www.python.org/ftp/python/3.1.2/Python-3.1.2.tgz#dffbc0561a161a4a576c6059e6990a9859a0be16ba9b5736eabe4abbb2700d1c" ldflags_dirs standard verify_py31
-install_package "setuptools-17.1.1" "https://pypi.python.org/packages/source/s/setuptools/setuptools-17.1.1.tar.gz#5bf42dbf406fd58a41029f53cffff1c90db5de1c5e0e560b5545cf2ec949c431" python
+install_package "readline-6.3" "http://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43" standard --if has_broken_mac_readline
+install_package "Python-3.1.2" "http://python.org/ftp/python/3.1.2/Python-3.1.2.tgz#dffbc0561a161a4a576c6059e6990a9859a0be16ba9b5736eabe4abbb2700d1c" ldflags_dirs standard verify_py31 ez_setup
 install_package "pip-1.5.6" "https://pypi.python.org/packages/source/p/pip/pip-1.5.6.tar.gz#b1a4ae66baf21b7eb05a5e4f37c50c2706fa28ea1f8780ce8efe14dcd9f1726c" python
--- a/plugins/python-build/share/python-build/3.1.3
+++ b/plugins/python-build/share/python-build/3.1.3
@@ -1,6 +1,4 @@
 #require_gcc
-install_package "openssl-1.0.2k" "https://www.openssl.org/source/openssl-1.0.2k.tar.gz#6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0" mac_openssl --if has_broken_mac_openssl
-install_package "readline-6.3" "https://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43" standard --if has_broken_mac_readline
-install_package "Python-3.1.3" "https://www.python.org/ftp/python/3.1.3/Python-3.1.3.tgz#6311823aeda8be6a7a2b67caaeff48abce6626c9940ba7ed81f9c978666a36bd" ldflags_dirs standard verify_py31
-install_package "setuptools-17.1.1" "https://pypi.python.org/packages/source/s/setuptools/setuptools-17.1.1.tar.gz#5bf42dbf406fd58a41029f53cffff1c90db5de1c5e0e560b5545cf2ec949c431" python
+install_package "readline-6.3" "http://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43" standard --if has_broken_mac_readline
+install_package "Python-3.1.3" "http://python.org/ftp/python/3.1.3/Python-3.1.3.tgz#6311823aeda8be6a7a2b67caaeff48abce6626c9940ba7ed81f9c978666a36bd" ldflags_dirs standard verify_py31 ez_setup
 install_package "pip-1.5.6" "https://pypi.python.org/packages/source/p/pip/pip-1.5.6.tar.gz#b1a4ae66baf21b7eb05a5e4f37c50c2706fa28ea1f8780ce8efe14dcd9f1726c" python
--- a/plugins/python-build/share/python-build/3.1.4
+++ b/plugins/python-build/share/python-build/3.1.4
@@ -1,6 +1,4 @@
 #require_gcc
-install_package "openssl-1.0.2k" "https://www.openssl.org/source/openssl-1.0.2k.tar.gz#6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0" mac_openssl --if has_broken_mac_openssl
-install_package "readline-6.3" "https://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43" standard --if has_broken_mac_readline
-install_package "Python-3.1.4" "https://www.python.org/ftp/python/3.1.4/Python-3.1.4.tgz#fadc05ea6d05360cff189944a85ecd2180bbc308784d168b350450e70bbdd846" ldflags_dirs standard verify_py31
-install_package "setuptools-17.1.1" "https://pypi.python.org/packages/source/s/setuptools/setuptools-17.1.1.tar.gz#5bf42dbf406fd58a41029f53cffff1c90db5de1c5e0e560b5545cf2ec949c431" python
+install_package "readline-6.3" "http://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43" standard --if has_broken_mac_readline
+install_package "Python-3.1.4" "http://python.org/ftp/python/3.1.4/Python-3.1.4.tgz#fadc05ea6d05360cff189944a85ecd2180bbc308784d168b350450e70bbdd846" ldflags_dirs standard verify_py31 ez_setup
 install_package "pip-1.5.6" "https://pypi.python.org/packages/source/p/pip/pip-1.5.6.tar.gz#b1a4ae66baf21b7eb05a5e4f37c50c2706fa28ea1f8780ce8efe14dcd9f1726c" python
--- a/plugins/python-build/share/python-build/3.1.5
+++ b/plugins/python-build/share/python-build/3.1.5
@@ -1,6 +1,3 @@
 #require_gcc
-install_package "openssl-1.0.2k" "https://www.openssl.org/source/openssl-1.0.2k.tar.gz#6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0" mac_openssl --if has_broken_mac_openssl
-install_package "readline-6.3" "https://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43" standard --if has_broken_mac_readline
-install_package "Python-3.1.5" "https://www.python.org/ftp/python/3.1.5/Python-3.1.5.tgz#d12dae6d06f52ef6bf1271db4d5b4d14b5dd39813e324314e72b648ef1bc0103" ldflags_dirs standard verify_py31
-install_package "setuptools-17.1.1" "https://pypi.python.org/packages/source/s/setuptools/setuptools-17.1.1.tar.gz#5bf42dbf406fd58a41029f53cffff1c90db5de1c5e0e560b5545cf2ec949c431" python
-install_package "pip-1.5.6" "https://pypi.python.org/packages/source/p/pip/pip-1.5.6.tar.gz#b1a4ae66baf21b7eb05a5e4f37c50c2706fa28ea1f8780ce8efe14dcd9f1726c" python
+install_package "readline-6.3" "http://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43" standard --if has_broken_mac_readline
+install_package "Python-3.1.5" "http://python.org/ftp/python/3.1.5/Python-3.1.5.tgz#d12dae6d06f52ef6bf1271db4d5b4d14b5dd39813e324314e72b648ef1bc0103" ldflags_dirs standard verify_py31 ensurepip
--- a/plugins/python-build/share/python-build/3.2
+++ b/plugins/python-build/share/python-build/3.2
@@ -1,6 +1,3 @@
 #require_gcc
-install_package "openssl-1.0.2k" "https://www.openssl.org/source/openssl-1.0.2k.tar.gz#6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0" mac_openssl --if has_broken_mac_openssl
-install_package "readline-6.3" "https://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43" standard --if has_broken_mac_readline
-install_package "Python-3.2" "https://www.python.org/ftp/python/3.2/Python-3.2.tgz#27b35bfcbbf01de9564c0265d72b58ba3ff3d56df0615765372f2aa09dc20da9" ldflags_dirs standard verify_py32
-install_package "setuptools-17.1.1" "https://pypi.python.org/packages/source/s/setuptools/setuptools-17.1.1.tar.gz#5bf42dbf406fd58a41029f53cffff1c90db5de1c5e0e560b5545cf2ec949c431" python
-install_package "pip-7.1.2" "https://pypi.python.org/packages/source/p/pip/pip-7.1.2.tar.gz#ca047986f0528cfa975a14fb9f7f106271d4e0c3fe1ddced6c1db2e7ae57a477" python
+install_package "readline-6.3" "http://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43" standard --if has_broken_mac_readline
+install_package "Python-3.2" "http://python.org/ftp/python/3.2/Python-3.2.tgz#27b35bfcbbf01de9564c0265d72b58ba3ff3d56df0615765372f2aa09dc20da9" ldflags_dirs standard verify_py32 ensurepip
--- a/plugins/python-build/share/python-build/3.2-dev
+++ b/plugins/python-build/share/python-build/3.2-dev
@@ -0,0 +1,3 @@
+#require_gcc
+install_package "readline-6.3" "http://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43" standard --if has_broken_mac_readline
+install_hg "Python-3.2-dev" "https://bitbucket.org/mirror/cpython" "3.2" standard verify_py32 ensurepip
--- a/plugins/python-build/share/python-build/3.2.1
+++ b/plugins/python-build/share/python-build/3.2.1
@@ -1,6 +1,3 @@
 #require_gcc
-install_package "openssl-1.0.2k" "https://www.openssl.org/source/openssl-1.0.2k.tar.gz#6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0" mac_openssl --if has_broken_mac_openssl
-install_package "readline-6.3" "https://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43" standard --if has_broken_mac_readline
-install_package "Python-3.2.1" "https://www.python.org/ftp/python/3.2.1/Python-3.2.1.tgz#7cff29d984696d9fe8c7bea54da5b9ad36acef33ff5cf0d3e37e4d12fb21c572" ldflags_dirs standard verify_py32
-install_package "setuptools-17.1.1" "https://pypi.python.org/packages/source/s/setuptools/setuptools-17.1.1.tar.gz#5bf42dbf406fd58a41029f53cffff1c90db5de1c5e0e560b5545cf2ec949c431" python
-install_package "pip-7.1.2" "https://pypi.python.org/packages/source/p/pip/pip-7.1.2.tar.gz#ca047986f0528cfa975a14fb9f7f106271d4e0c3fe1ddced6c1db2e7ae57a477" python
+install_package "readline-6.3" "http://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43" standard --if has_broken_mac_readline
+install_package "Python-3.2.1" "http://python.org/ftp/python/3.2.1/Python-3.2.1.tgz#7cff29d984696d9fe8c7bea54da5b9ad36acef33ff5cf0d3e37e4d12fb21c572" ldflags_dirs standard verify_py32 ensurepip
--- a/plugins/python-build/share/python-build/3.2.2
+++ b/plugins/python-build/share/python-build/3.2.2
@@ -1,6 +1,3 @@
 #require_gcc
-install_package "openssl-1.0.2k" "https://www.openssl.org/source/openssl-1.0.2k.tar.gz#6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0" mac_openssl --if has_broken_mac_openssl
-install_package "readline-6.3" "https://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43" standard --if has_broken_mac_readline
-install_package "Python-3.2.2" "https://www.python.org/ftp/python/3.2.2/Python-3.2.2.tgz#acc6a13cb4fed0b7e86716324a8437e326645b8076177eede5a0cad99ec0313c" ldflags_dirs standard verify_py32
-install_package "setuptools-17.1.1" "https://pypi.python.org/packages/source/s/setuptools/setuptools-17.1.1.tar.gz#5bf42dbf406fd58a41029f53cffff1c90db5de1c5e0e560b5545cf2ec949c431" python
-install_package "pip-7.1.2" "https://pypi.python.org/packages/source/p/pip/pip-7.1.2.tar.gz#ca047986f0528cfa975a14fb9f7f106271d4e0c3fe1ddced6c1db2e7ae57a477" python
+install_package "readline-6.3" "http://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43" standard --if has_broken_mac_readline
+install_package "Python-3.2.2" "http://python.org/ftp/python/3.2.2/Python-3.2.2.tgz#acc6a13cb4fed0b7e86716324a8437e326645b8076177eede5a0cad99ec0313c" ldflags_dirs standard verify_py32 ensurepip
--- a/plugins/python-build/share/python-build/3.2.3
+++ b/plugins/python-build/share/python-build/3.2.3
@@ -1,6 +1,3 @@
 #require_gcc
-install_package "openssl-1.0.2k" "https://www.openssl.org/source/openssl-1.0.2k.tar.gz#6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0" mac_openssl --if has_broken_mac_openssl
-install_package "readline-6.3" "https://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43" standard --if has_broken_mac_readline
-install_package "Python-3.2.3" "https://www.python.org/ftp/python/3.2.3/Python-3.2.3.tgz#74c33e165edef7532cef95fd9a325a06878b5bfc8a5d038161573f283eaf9809" ldflags_dirs standard verify_py32
-install_package "setuptools-17.1.1" "https://pypi.python.org/packages/source/s/setuptools/setuptools-17.1.1.tar.gz#5bf42dbf406fd58a41029f53cffff1c90db5de1c5e0e560b5545cf2ec949c431" python
-install_package "pip-7.1.2" "https://pypi.python.org/packages/source/p/pip/pip-7.1.2.tar.gz#ca047986f0528cfa975a14fb9f7f106271d4e0c3fe1ddced6c1db2e7ae57a477" python
+install_package "readline-6.3" "http://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43" standard --if has_broken_mac_readline
+install_package "Python-3.2.3" "http://python.org/ftp/python/3.2.3/Python-3.2.3.tgz#74c33e165edef7532cef95fd9a325a06878b5bfc8a5d038161573f283eaf9809" ldflags_dirs standard verify_py32 ensurepip
--- a/plugins/python-build/share/python-build/3.2.4
+++ b/plugins/python-build/share/python-build/3.2.4
@@ -1,6 +1,3 @@
 #require_gcc
-install_package "openssl-1.0.2k" "https://www.openssl.org/source/openssl-1.0.2k.tar.gz#6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0" mac_openssl --if has_broken_mac_openssl
-install_package "readline-6.3" "https://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43" standard --if has_broken_mac_readline
-install_package "Python-3.2.4" "https://www.python.org/ftp/python/3.2.4/Python-3.2.4.tgz#71c3139908ccc1c544ba1e331a3c22b3f1c09f562438a054fd6f4e2628de8b9a" ldflags_dirs standard verify_py32
-install_package "setuptools-17.1.1" "https://pypi.python.org/packages/source/s/setuptools/setuptools-17.1.1.tar.gz#5bf42dbf406fd58a41029f53cffff1c90db5de1c5e0e560b5545cf2ec949c431" python
-install_package "pip-7.1.2" "https://pypi.python.org/packages/source/p/pip/pip-7.1.2.tar.gz#ca047986f0528cfa975a14fb9f7f106271d4e0c3fe1ddced6c1db2e7ae57a477" python
+install_package "readline-6.3" "http://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43" standard --if has_broken_mac_readline
+install_package "Python-3.2.4" "http://python.org/ftp/python/3.2.4/Python-3.2.4.tgz#71c3139908ccc1c544ba1e331a3c22b3f1c09f562438a054fd6f4e2628de8b9a" ldflags_dirs standard verify_py32 ensurepip
--- a/plugins/python-build/share/python-build/3.2.5
+++ b/plugins/python-build/share/python-build/3.2.5
@@ -1,6 +1,3 @@
 #require_gcc
-install_package "openssl-1.0.2k" "https://www.openssl.org/source/openssl-1.0.2k.tar.gz#6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0" mac_openssl --if has_broken_mac_openssl
-install_package "readline-6.3" "https://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43" standard --if has_broken_mac_readline
-install_package "Python-3.2.5" "https://www.python.org/ftp/python/3.2.5/Python-3.2.5.tgz#5eae0ab92a0bb9e3a1bf9c7cd046bc3de58996b049bd894d095978b6b085099f" ldflags_dirs standard verify_py32
-install_package "setuptools-17.1.1" "https://pypi.python.org/packages/source/s/setuptools/setuptools-17.1.1.tar.gz#5bf42dbf406fd58a41029f53cffff1c90db5de1c5e0e560b5545cf2ec949c431" python
-install_package "pip-7.1.2" "https://pypi.python.org/packages/source/p/pip/pip-7.1.2.tar.gz#ca047986f0528cfa975a14fb9f7f106271d4e0c3fe1ddced6c1db2e7ae57a477" python
+install_package "readline-6.3" "http://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43" standard --if has_broken_mac_readline
+install_package "Python-3.2.5" "http://python.org/ftp/python/3.2.5/Python-3.2.5.tgz#5eae0ab92a0bb9e3a1bf9c7cd046bc3de58996b049bd894d095978b6b085099f" ldflags_dirs standard verify_py32 ensurepip
--- a/plugins/python-build/share/python-build/3.2.6
+++ b/plugins/python-build/share/python-build/3.2.6
@@ -1,10 +1,3 @@
 #require_gcc
-install_package "openssl-1.0.2k" "https://www.openssl.org/source/openssl-1.0.2k.tar.gz#6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0" mac_openssl --if has_broken_mac_openssl
-install_package "readline-6.3" "https://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43" standard --if has_broken_mac_readline
-if has_tar_xz_support; then
-  install_package "Python-3.2.6" "https://www.python.org/ftp/python/3.2.6/Python-3.2.6.tar.xz#1d12b501819fd26afafbf8459be1aa279b56f032b4c15412de0a713ce0de7bdc" ldflags_dirs standard verify_py32
-else
-  install_package "Python-3.2.6" "https://www.python.org/ftp/python/3.2.6/Python-3.2.6.tgz#fc1e41296e29d476f696303acae293ae7a2310f0f9d0d637905e722a3f16163e" ldflags_dirs standard verify_py32
-fi
-install_package "setuptools-17.1.1" "https://pypi.python.org/packages/source/s/setuptools/setuptools-17.1.1.tar.gz#5bf42dbf406fd58a41029f53cffff1c90db5de1c5e0e560b5545cf2ec949c431" python
-install_package "pip-7.1.2" "https://pypi.python.org/packages/source/p/pip/pip-7.1.2.tar.gz#ca047986f0528cfa975a14fb9f7f106271d4e0c3fe1ddced6c1db2e7ae57a477" python
+install_package "readline-6.3" "http://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43" standard --if has_broken_mac_readline
+install_package "Python-3.2.6" "https://www.python.org/ftp/python/3.2.6/Python-3.2.6.tgz#fc1e41296e29d476f696303acae293ae7a2310f0f9d0d637905e722a3f16163e" ldflags_dirs standard verify_py32 ensurepip
--- a/plugins/python-build/share/python-build/3.3-dev
+++ b/plugins/python-build/share/python-build/3.3-dev
@@ -0,0 +1,3 @@
+#require_gcc
+install_package "readline-6.3" "http://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43" standard --if has_broken_mac_readline
+install_hg "Python-3.3-dev" "https://bitbucket.org/mirror/cpython" "3.3" standard verify_py33 ensurepip
--- a/plugins/python-build/share/python-build/3.3.0
+++ b/plugins/python-build/share/python-build/3.3.0
@@ -1,4 +1,3 @@
 #require_gcc
-install_package "openssl-1.0.2k" "https://www.openssl.org/source/openssl-1.0.2k.tar.gz#6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0" mac_openssl --if has_broken_mac_openssl
-install_package "readline-6.3" "https://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43" standard --if has_broken_mac_readline
-install_package "Python-3.3.0" "https://www.python.org/ftp/python/3.3.0/Python-3.3.0.tgz#cfe531eaace2503e13a74addc7f4a89482e99f8b8fca51b469ae5c83f450604e" ldflags_dirs standard verify_py33 ensurepip
+install_package "readline-6.3" "http://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43" standard --if has_broken_mac_readline
+install_package "Python-3.3.0" "http://python.org/ftp/python/3.3.0/Python-3.3.0.tgz#cfe531eaace2503e13a74addc7f4a89482e99f8b8fca51b469ae5c83f450604e" ldflags_dirs standard verify_py33 ensurepip
--- a/plugins/python-build/share/python-build/3.3.1
+++ b/plugins/python-build/share/python-build/3.3.1
@@ -1,4 +1,3 @@
 #require_gcc
-install_package "openssl-1.0.2k" "https://www.openssl.org/source/openssl-1.0.2k.tar.gz#6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0" mac_openssl --if has_broken_mac_openssl
-install_package "readline-6.3" "https://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43" standard --if has_broken_mac_readline
-install_package "Python-3.3.1" "https://www.python.org/ftp/python/3.3.1/Python-3.3.1.tgz#671dc3632f311e63c6733703aa0a1ad90c99277ddc8299d39e487718a50319bd" ldflags_dirs standard verify_py33 ensurepip
+install_package "readline-6.3" "http://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43" standard --if has_broken_mac_readline
+install_package "Python-3.3.1" "http://python.org/ftp/python/3.3.1/Python-3.3.1.tgz#671dc3632f311e63c6733703aa0a1ad90c99277ddc8299d39e487718a50319bd" ldflags_dirs standard verify_py33 ensurepip
--- a/plugins/python-build/share/python-build/3.3.2
+++ b/plugins/python-build/share/python-build/3.3.2
@@ -1,4 +1,3 @@
 #require_gcc
-install_package "openssl-1.0.2k" "https://www.openssl.org/source/openssl-1.0.2k.tar.gz#6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0" mac_openssl --if has_broken_mac_openssl
-install_package "readline-6.3" "https://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43" standard --if has_broken_mac_readline
-install_package "Python-3.3.2" "https://www.python.org/ftp/python/3.3.2/Python-3.3.2.tgz#de664fca3b8e0ab20fb42bfed1a36e26f116f1853e88ada12dbc938761036172" ldflags_dirs standard verify_py33 ensurepip
+install_package "readline-6.3" "http://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43" standard --if has_broken_mac_readline
+install_package "Python-3.3.2" "http://python.org/ftp/python/3.3.2/Python-3.3.2.tgz#de664fca3b8e0ab20fb42bfed1a36e26f116f1853e88ada12dbc938761036172" ldflags_dirs standard verify_py33 ensurepip
--- a/plugins/python-build/share/python-build/3.3.3
+++ b/plugins/python-build/share/python-build/3.3.3
@@ -1,4 +1,3 @@
 #require_gcc
-install_package "openssl-1.0.2k" "https://www.openssl.org/source/openssl-1.0.2k.tar.gz#6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0" mac_openssl --if has_broken_mac_openssl
-install_package "readline-6.3" "https://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43" standard --if has_broken_mac_readline
-install_package "Python-3.3.3" "https://www.python.org/ftp/python/3.3.3/Python-3.3.3.tgz#30b60839bfe0ae8a2dba11e909328459bb8ee4a258afe7494b06b2ceda080efc" ldflags_dirs standard verify_py33 ensurepip
+install_package "readline-6.3" "http://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43" standard --if has_broken_mac_readline
+install_package "Python-3.3.3" "http://python.org/ftp/python/3.3.3/Python-3.3.3.tgz#30b60839bfe0ae8a2dba11e909328459bb8ee4a258afe7494b06b2ceda080efc" ldflags_dirs standard verify_py33 ensurepip
--- a/plugins/python-build/share/python-build/3.3.4
+++ b/plugins/python-build/share/python-build/3.3.4
@@ -1,4 +1,3 @@
 #require_gcc
-install_package "openssl-1.0.2k" "https://www.openssl.org/source/openssl-1.0.2k.tar.gz#6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0" mac_openssl --if has_broken_mac_openssl
-install_package "readline-6.3" "https://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43" standard --if has_broken_mac_readline
-install_package "Python-3.3.4" "https://www.python.org/ftp/python/3.3.4/Python-3.3.4.tgz#ea055db9dd004a6ecd7690abc9734573763686dd768122316bae2dfd026412af" ldflags_dirs standard verify_py33 ensurepip
+install_package "readline-6.3" "http://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43" standard --if has_broken_mac_readline
+install_package "Python-3.3.4" "http://python.org/ftp/python/3.3.4/Python-3.3.4.tgz#ea055db9dd004a6ecd7690abc9734573763686dd768122316bae2dfd026412af" ldflags_dirs standard verify_py33 ensurepip
--- a/plugins/python-build/share/python-build/3.3.5
+++ b/plugins/python-build/share/python-build/3.3.5
@@ -1,4 +1,3 @@
 #require_gcc
-install_package "openssl-1.0.2k" "https://www.openssl.org/source/openssl-1.0.2k.tar.gz#6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0" mac_openssl --if has_broken_mac_openssl
-install_package "readline-6.3" "https://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43" standard --if has_broken_mac_readline
-install_package "Python-3.3.5" "https://www.python.org/ftp/python/3.3.5/Python-3.3.5.tgz#916bc57dd8524dc27429bebae7b39d6942742cf9699b875b2b496a3d960c7168" ldflags_dirs standard verify_py33 ensurepip
+install_package "readline-6.3" "http://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43" standard --if has_broken_mac_readline
+install_package "Python-3.3.5" "http://python.org/ftp/python/3.3.5/Python-3.3.5.tgz#916bc57dd8524dc27429bebae7b39d6942742cf9699b875b2b496a3d960c7168" ldflags_dirs standard verify_py33 ensurepip
--- a/plugins/python-build/share/python-build/3.3.6
+++ b/plugins/python-build/share/python-build/3.3.6
@@ -1,8 +1,3 @@
 #require_gcc
-install_package "openssl-1.0.2k" "https://www.openssl.org/source/openssl-1.0.2k.tar.gz#6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0" mac_openssl --if has_broken_mac_openssl
-install_package "readline-6.3" "https://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43" standard --if has_broken_mac_readline
-if has_tar_xz_support; then
-  install_package "Python-3.3.6" "https://www.python.org/ftp/python/3.3.6/Python-3.3.6.tar.xz#5226e4bf7a530c3ff2bcde0c94e0e09e59a8bcde0114fe0268bc925bdabb5d3f" ldflags_dirs standard verify_py33 ensurepip
-else
-  install_package "Python-3.3.6" "https://www.python.org/ftp/python/3.3.6/Python-3.3.6.tgz#0a58ad1f1def4ecc90b18b0c410a3a0e1a48cf7692c75d1f83d0af080e5d2034" ldflags_dirs standard verify_py33 ensurepip
-fi
+install_package "readline-6.3" "http://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43" standard --if has_broken_mac_readline
+install_package "Python-3.3.6" "https://www.python.org/ftp/python/3.3.6/Python-3.3.6.tgz#0a58ad1f1def4ecc90b18b0c410a3a0e1a48cf7692c75d1f83d0af080e5d2034" ldflags_dirs standard verify_py33 ensurepip
--- a/plugins/python-build/share/python-build/3.3.7
+++ b/plugins/python-build/share/python-build/3.3.7
@@ -1,8 +0,0 @@
-#require_gcc
-install_package "openssl-1.0.2k" "https://www.openssl.org/source/openssl-1.0.2k.tar.gz#6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0" mac_openssl --if has_broken_mac_openssl
-install_package "readline-6.3" "https://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43" standard --if has_broken_mac_readline
-if has_tar_xz_support; then
-  install_package "Python-3.3.7" "https://www.python.org/ftp/python/3.3.7/Python-3.3.7.tar.xz#85f60c327501c36bc18c33370c14d472801e6af2f901dafbba056f61685429fe" ldflags_dirs standard verify_py33 ensurepip
-else
-  install_package "Python-3.3.7" "https://www.python.org/ftp/python/3.3.7/Python-3.3.7.tgz#992461a9598e85a45323512d4e60fa6c1d5aaef0956bf9db98733cc5aa9b05e1" ldflags_dirs standard verify_py33 ensurepip
-fi
--- a/plugins/python-build/share/python-build/3.4-dev
+++ b/plugins/python-build/share/python-build/3.4-dev
@@ -1,4 +1,3 @@
 #require_gcc
-install_package "openssl-1.0.2k" "https://www.openssl.org/source/openssl-1.0.2k.tar.gz#6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0" mac_openssl --if has_broken_mac_openssl
-install_package "readline-6.3" "https://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43" standard --if has_broken_mac_readline
-install_git "Python-3.4-dev" "https://github.com/python/cpython" "3.4" standard verify_py34 ensurepip
+install_package "readline-6.3" "http://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43" standard --if has_broken_mac_readline
+install_hg "Python-3.4-dev" "https://bitbucket.org/mirror/cpython" "3.4" standard verify_py34 ensurepip
--- a/plugins/python-build/share/python-build/3.4.0
+++ b/plugins/python-build/share/python-build/3.4.0
@@ -1,8 +1,3 @@
 #require_gcc
-install_package "openssl-1.0.2k" "https://www.openssl.org/source/openssl-1.0.2k.tar.gz#6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0" mac_openssl --if has_broken_mac_openssl
-install_package "readline-6.3" "https://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43" standard --if has_broken_mac_readline
-if has_tar_xz_support; then
-  install_package "Python-3.4.0" "https://www.python.org/ftp/python/3.4.0/Python-3.4.0.tar.xz#f13686c0a2d45e7146759e9d5d1cbd8097a0606483c0cf7730e1e13f58b14cbe" ldflags_dirs standard verify_py34 ensurepip
-else
-  install_package "Python-3.4.0" "https://www.python.org/ftp/python/3.4.0/Python-3.4.0.tgz#d2c83ea0217769a73e8b1ee33ffbca814903f8568e30f8d13e68e3d1f743449c" ldflags_dirs standard verify_py34 ensurepip
-fi
+install_package "readline-6.3" "http://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43" standard --if has_broken_mac_readline
+install_package "Python-3.4.0" "https://www.python.org/ftp/python/3.4.0/Python-3.4.0.tgz#d2c83ea0217769a73e8b1ee33ffbca814903f8568e30f8d13e68e3d1f743449c" ldflags_dirs standard verify_py34 ensurepip
--- a/plugins/python-build/share/python-build/3.4.1
+++ b/plugins/python-build/share/python-build/3.4.1
@@ -1,8 +1,3 @@
 #require_gcc
-install_package "openssl-1.0.2k" "https://www.openssl.org/source/openssl-1.0.2k.tar.gz#6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0" mac_openssl --if has_broken_mac_openssl
-install_package "readline-6.3" "https://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43" standard --if has_broken_mac_readline
-if has_tar_xz_support; then
-  install_package "Python-3.4.1" "https://www.python.org/ftp/python/3.4.1/Python-3.4.1.tar.xz#c595a163104399041fcbe1c5c04db4c1da94f917b82ce89e8944c8edff7aedc4" ldflags_dirs standard verify_py34 ensurepip
-else
-  install_package "Python-3.4.1" "https://www.python.org/ftp/python/3.4.1/Python-3.4.1.tgz#8d007e3ef80b128a292be101201e75dec5480e5632e994771e7c231d17720b66" ldflags_dirs standard verify_py34 ensurepip
-fi
+install_package "readline-6.3" "http://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43" standard --if has_broken_mac_readline
+install_package "Python-3.4.1" "https://www.python.org/ftp/python/3.4.1/Python-3.4.1.tgz#8d007e3ef80b128a292be101201e75dec5480e5632e994771e7c231d17720b66" ldflags_dirs standard verify_py34 ensurepip
--- a/plugins/python-build/share/python-build/3.4.2
+++ b/plugins/python-build/share/python-build/3.4.2
@@ -1,8 +1,3 @@
 #require_gcc
-install_package "openssl-1.0.2k" "https://www.openssl.org/source/openssl-1.0.2k.tar.gz#6b3977c61f2aedf0f96367dcfb5c6e578cf37e7b8d913b4ecb6643c3cb88d8c0" mac_openssl --if has_broken_mac_openssl
-install_package "readline-6.3" "https://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43" standard --if has_broken_mac_readline
-if has_tar_xz_support; then
-  install_package "Python-3.4.2" "https://www.python.org/ftp/python/3.4.2/Python-3.4.2.tar.xz#1c6d9682d145c056537e477bbfa060ce727f9edd38df1827e0f970dcf04b2def" ldflags_dirs standard verify_py34 ensurepip
-else
-  install_package "Python-3.4.2" "https://www.python.org/ftp/python/3.4.2/Python-3.4.2.tgz#44a3c1ef1c7ca3e4fd25242af80ed72da941203cb4ed1a8c1b724d9078965dd8" ldflags_dirs standard verify_py34 ensurepip
-fi
+install_package "readline-6.3" "http://ftpmirror.gnu.org/readline/readline-6.3.tar.gz#56ba6071b9462f980c5a72ab0023893b65ba6debb4eeb475d7a563dc65cafd43" standard --if has_broken_mac_readline
+install_package "Python-3.4.2" "https://www.python.org/ftp/python/3.4.2/Python-3.4.2.tgz#44a3c1ef1c7ca3e4fd25242af80ed72da941203cb4ed1a8c1b724d9078965dd8" ldflags_dirs standard verify_py34 ensurepip
--- a/Show More
+++ b/Show More