diff --git a/plugins/python-build/bin/python-build b/plugins/python-build/bin/python-build
index 8561bfca..40eae378 100755
--- a/plugins/python-build/bin/python-build
+++ b/plugins/python-build/bin/python-build
@@ -730,6 +730,23 @@ build_package_jython_builder() {
   ( cd "dist" && build_package_jython )
 }
 
+pypy_architecture() {
+  case "$(uname -s)" in
+  "Darwin" ) echo "osx64" ;;
+  "Linux" )
+    case "$(uname -m)" in
+    "armel" ) echo "linux-armel" ;;
+    "armhf" | "armv6l" | "armv7l" ) echo "linux-armhf" ;;
+    "i386" | "i486" | "i586" | "i686" | "i786" ) echo "linux" ;;
+    "x86_64" ) echo "linux64" ;;
+    * ) return 1 ;;
+    esac
+    ;;
+  "CYGWIN"* | "MINGW"* ) echo "win32" ;;
+  * ) return 1 ;;
+  esac
+}
+
 build_package_pypy() {
   build_package_copy
   { if [ -x "${PREFIX_PATH}/bin/pypy" ] && [ ! -x "${PREFIX_PATH}/bin/python" ]; then
diff --git a/plugins/python-build/share/python-build/pypy-1.5 b/plugins/python-build/share/python-build/pypy-1.5
index 1fa143d3..73b2ee38 100644
--- a/plugins/python-build/share/python-build/pypy-1.5
+++ b/plugins/python-build/share/python-build/pypy-1.5
@@ -1,39 +1,27 @@
-case "$(uname -s)" in
-"Darwin" )
-  package_name="pypy-c-jit-43780-b590cf6de419-osx64"
-  package_url="https://bitbucket.org/pypy/pypy/downloads/pypy-1.5-osx64.tar.bz2#b1417916bc01ebb9f95c666f5e397fb5"
+case "$(pypy_architecture 2>/dev/null || true)" in
+"linux" )
+  install_package "pypy-c-jit-43780-b590cf6de419-linux" "https://bitbucket.org/pypy/pypy/downloads/pypy-1.5-linux.tar.bz2#08a2c95163c95f91772abb8bf5f8b9cb" "pypy" verify_py27
   ;;
-"Linux" )
-  case "$(uname -m)" in
-  "i386" | "i486" | "i586" | "i686" | "i786" )
-    package_name="pypy-c-jit-43780-b590cf6de419-linux"
-    package_url="https://bitbucket.org/pypy/pypy/downloads/pypy-1.5-linux.tar.bz2#08a2c95163c95f91772abb8bf5f8b9cb"
-    ;;
-  "x86_64" )
-    package_name="pypy-c-jit-43780-b590cf6de419-linux64"
-    package_url="https://bitbucket.org/pypy/pypy/downloads/pypy-1.5-linux64.tar.bz2#32392b7986eb34cd657d5b6c5d242cc7"
-    ;;
-  esac
+"linux64" )
+  install_package "pypy-c-jit-43780-b590cf6de419-linux64" "https://bitbucket.org/pypy/pypy/downloads/pypy-1.5-linux64.tar.bz2#32392b7986eb34cd657d5b6c5d242cc7" "pypy" verify_py27
   ;;
-"CYGWIN"* | "MINGW"* )
+"osx64" )
+  install_package "pypy-c-jit-43780-b590cf6de419-osx64" "https://bitbucket.org/pypy/pypy/downloads/pypy-1.5-osx64.tar.bz2#b1417916bc01ebb9f95c666f5e397fb5" "pypy" verify_py27
+  ;;
+"win32" )
   # FIXME: never tested on Windows
-  package_name="pypy-1.5.0a0-win32"
-  package_url="https://bitbucket.org/pypy/pypy/downloads/pypy-1.5-win32.zip#b6cc12bed5e7243ed44aa3430eb14885"
+  install_zip "pypy-1.5.0a0-win32" "https://bitbucket.org/pypy/pypy/downloads/pypy-1.5-win32.zip#b6cc12bed5e7243ed44aa3430eb14885" "pypy" verify_py27
+  ;;
+* )
+  { echo
+    colorize 1 "ERROR"
+    echo ": The binary distribution of PyPy is not available for $(uname -s)-$(uname -m)."
+    echo "try 'pypy-1.5-src' to build from source."
+    echo
+  } >&2
+  exit 1
   ;;
 esac
 
-if [ -n "${package_name}" ] && [ -n "${package_url}" ]; then
-  if [ "${package_url}" != "${package_url%%.zip*}" ]; then
-    install_zip "${package_name}" "${package_url}" "pypy" verify_py27
-  else
-    install_package "${package_name}" "${package_url}" "pypy" verify_py27
-  fi
-else
-  { echo "Precompiled binary of pypy-1.5 is not available for $(uname -s)-$(uname -m)."
-    echo "To build pypy-1.5 from soruce, use 'pypy-1.5-src'."
-  } 1>&4 2>&1
-  exit 1
-fi
-
 install_package "setuptools-2.2" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.2.tar.gz#04a7664538957b832710653fd7d5b4e6" python
 install_package "pip-1.5.4" "https://pypi.python.org/packages/source/p/pip/pip-1.5.4.tar.gz#834b2904f92d46aaa333267fb1c922bb" python
diff --git a/plugins/python-build/share/python-build/pypy-1.6 b/plugins/python-build/share/python-build/pypy-1.6
index 313d66db..06d54320 100644
--- a/plugins/python-build/share/python-build/pypy-1.6
+++ b/plugins/python-build/share/python-build/pypy-1.6
@@ -1,38 +1,26 @@
-case "$(uname -s)" in
-"Darwin" )
-  package_name="pypy-1.6"
-  package_url="https://bitbucket.org/pypy/pypy/downloads/pypy-1.6-osx64.tar.bz2#78bbf70f55e9fec20d7ac22531a997fc"
+case "$(pypy_architecture 2>/dev/null || true)" in
+"linux" )
+  install_package "pypy-1.6" "https://bitbucket.org/pypy/pypy/downloads/pypy-1.6-linux.tar.bz2#ee949986fc5ec5c4a11ecbd546b87fbb" "pypy" verify_py27
   ;;
-"Linux" )
-  case "$(uname -m)" in
-  "i386" | "i486" | "i586" | "i686" | "i786" )
-    package_name="pypy-1.6"
-    package_url="https://bitbucket.org/pypy/pypy/downloads/pypy-1.6-linux.tar.bz2#ee949986fc5ec5c4a11ecbd546b87fbb"
-    ;;
-  "x86_64" )
-    package_name="pypy-1.6"
-    package_url="https://bitbucket.org/pypy/pypy/downloads/pypy-1.6-linux64.tar.bz2#a34e3113508449393e874f409dd888fc"
-    ;;
-  esac
+"linux64" )
+  install_package "pypy-1.6" "https://bitbucket.org/pypy/pypy/downloads/pypy-1.6-linux64.tar.bz2#a34e3113508449393e874f409dd888fc" "pypy" verify_py27
   ;;
-"CYGWIN"* | "MINGW"* )
+"osx64" )
+  install_package "pypy-1.6" "https://bitbucket.org/pypy/pypy/downloads/pypy-1.6-osx64.tar.bz2#78bbf70f55e9fec20d7ac22531a997fc" "pypy" verify_py27
+  ;;
+"win32" )
   # FIXME: never tested on Windows
-  package_name="pypy-1.6"
-  package_url="https://bitbucket.org/pypy/pypy/downloads/pypy-1.6-win32-c.zip#62b9eb914954aeab32905d632d3904f1"
+  install_zip "pypy-1.6" "https://bitbucket.org/pypy/pypy/downloads/pypy-1.6-win32-c.zip#62b9eb914954aeab32905d632d3904f1" "pypy" verify_py27
+  ;;
+* )
+  { echo
+    colorize 1 "ERROR"
+    echo ": The binary distribution of PyPy is not available for $(uname -s)-$(uname -m)."
+    echo
+  } >&2
+  exit 1
   ;;
 esac
 
-if [ -n "${package_name}" ] && [ -n "${package_url}" ]; then
-  if [ "${package_url}" != "${package_url%%.zip*}" ]; then
-    install_zip "${package_name}" "${package_url}" "pypy" verify_py27
-  else
-    install_package "${package_name}" "${package_url}" "pypy" verify_py27
-  fi
-else
-  { echo "Precompiled binary of pypy-1.6 is not available for $(uname -s)-$(uname -m)."
-  } 1>&4 2>&1
-  exit 1
-fi
-
 install_package "setuptools-2.2" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.2.tar.gz#04a7664538957b832710653fd7d5b4e6" python
 install_package "pip-1.5.4" "https://pypi.python.org/packages/source/p/pip/pip-1.5.4.tar.gz#834b2904f92d46aaa333267fb1c922bb" python
diff --git a/plugins/python-build/share/python-build/pypy-1.7 b/plugins/python-build/share/python-build/pypy-1.7
index 982f275c..c3a3ab54 100644
--- a/plugins/python-build/share/python-build/pypy-1.7
+++ b/plugins/python-build/share/python-build/pypy-1.7
@@ -1,39 +1,27 @@
-case "$(uname -s)" in
-"Darwin" )
-  package_name="pypy-1.7"
-  package_url="https://bitbucket.org/pypy/pypy/downloads/pypy-1.7-osx64.tar.bz2#ff979054fc8e17b4973ffebb9844b159"
+case "$(pypy_architecture 2>/dev/null || true)" in
+"linux" )
+  install_package "pypy-1.7" "https://bitbucket.org/pypy/pypy/downloads/pypy-1.7-linux.tar.bz2#8a6e2583902bc6f2661eb3c96b45f4e3" "pypy" verify_py27
   ;;
-"Linux" )
-  case "$(uname -m)" in
-  "i386" | "i486" | "i586" | "i686" | "i786" )
-    package_name="pypy-1.7"
-    package_url="pypy-1.7" "https://bitbucket.org/pypy/pypy/downloads/pypy-1.7-linux.tar.bz2#8a6e2583902bc6f2661eb3c96b45f4e3"
-    ;;
-  "x86_64" )
-    package_name="pypy-1.7"
-    package_url="pypy-1.7" "https://bitbucket.org/pypy/pypy/downloads/pypy-1.7-linux64.tar.bz2#ceb8dfe7d9d1aeb558553b91b381a1a8"
-    ;;
-  esac
+"linux64" )
+  install_package "pypy-1.7" "https://bitbucket.org/pypy/pypy/downloads/pypy-1.7-linux64.tar.bz2#ceb8dfe7d9d1aeb558553b91b381a1a8" "pypy" verify_py27
   ;;
-"CYGWIN"* | "MINGW"* )
+"osx64" )
+  install_package "pypy-1.7" "https://bitbucket.org/pypy/pypy/downloads/pypy-1.7-osx64.tar.bz2#ff979054fc8e17b4973ffebb9844b159" "pypy" verify_py27
+  ;;
+"win32" )
   # FIXME: never tested on Windows
-  package_name="pypy-1.7"
-  package_url="pypy-1.7" "https://bitbucket.org/pypy/pypy/downloads/pypy-1.7-win32.zip#08de1ed4a4382559b1c4c46650f4a8e8"
+  install_zip "pypy-1.7" "https://bitbucket.org/pypy/pypy/downloads/pypy-1.7-win32.zip#08de1ed4a4382559b1c4c46650f4a8e8" "pypy" verify_py27
+  ;;
+* )
+  { echo
+    colorize 1 "ERROR"
+    echo ": The binary distribution of PyPy is not available for $(uname -s)-$(uname -m)."
+    echo "try 'pypy-1.7-dev' to build from soruce."
+    echo
+  } >&2
+  exit 1
   ;;
 esac
 
-if [ -n "${package_name}" ] && [ -n "${package_url}" ]; then
-  if [ "${package_url}" != "${package_url%%.zip*}" ]; then
-    install_zip "${package_name}" "${package_url}" "pypy" verify_py27
-  else
-    install_package "${package_name}" "${package_url}" "pypy" verify_py27
-  fi
-else
-  { echo "Precompiled binary of pypy-1.7 is not available for $(uname -s)-$(uname -m)."
-    echo "To build pypy-1.7 from soruce, use 'pypy-1.7-dev'."
-  } 1>&4 2>&1
-  exit 1
-fi
-
 install_package "setuptools-2.2" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.2.tar.gz#04a7664538957b832710653fd7d5b4e6" python
 install_package "pip-1.5.4" "https://pypi.python.org/packages/source/p/pip/pip-1.5.4.tar.gz#834b2904f92d46aaa333267fb1c922bb" python
diff --git a/plugins/python-build/share/python-build/pypy-1.8 b/plugins/python-build/share/python-build/pypy-1.8
index 1370c84c..c1e170cf 100644
--- a/plugins/python-build/share/python-build/pypy-1.8
+++ b/plugins/python-build/share/python-build/pypy-1.8
@@ -1,39 +1,27 @@
-case "$(uname -s)" in
-"Darwin" )
-  package_name="pypy-1.8"
-  package_url="https://bitbucket.org/pypy/pypy/downloads/pypy-1.8-osx64.tar.bz2#1c293253e8e4df411c3dd59dff82a663"
+case "$(pypy_architecture 2>/dev/null || true)" in
+"linux" )
+  install_package "pypy-1.8" "https://bitbucket.org/pypy/pypy/downloads/pypy-1.8-linux.tar.bz2#c4a1d11e0283a390d9e9b801a4633b9f" "pypy" verify_py27
   ;;
-"Linux" )
-  case "$(uname -m)" in
-  "i386" | "i486" | "i586" | "i686" | "i786" )
-    package_name="pypy-1.8"
-    package_url="https://bitbucket.org/pypy/pypy/downloads/pypy-1.8-linux.tar.bz2#c4a1d11e0283a390d9e9b801a4633b9f"
-    ;;
-  "x86_64" )
-    package_name="pypy-1.8"
-    package_url="https://bitbucket.org/pypy/pypy/downloads/pypy-1.8-linux64.tar.bz2#3b81363ccbc042dfdda2fabbf419e788"
-    ;;
-  esac
+"linux64" )
+  install_package "pypy-1.8" "https://bitbucket.org/pypy/pypy/downloads/pypy-1.8-linux64.tar.bz2#3b81363ccbc042dfdda2fabbf419e788" "pypy" verify_py27
   ;;
-"CYGWIN"* | "MINGW"* )
+"osx64" )
+  install_package "pypy-1.8" "https://bitbucket.org/pypy/pypy/downloads/pypy-1.8-osx64.tar.bz2#1c293253e8e4df411c3dd59dff82a663" "pypy" verify_py27
+  ;;
+"win32" )
   # FIXME: never tested on Windows
-  package_name="pypy-1.8"
-  package_url="https://bitbucket.org/pypy/pypy/downloads/pypy-1.8-win32.zip#1af8ee722721e9f5fd06b61af530ecb3"
+  install_zip "pypy-1.8" "https://bitbucket.org/pypy/pypy/downloads/pypy-1.8-win32.zip#1af8ee722721e9f5fd06b61af530ecb3" "pypy" verify_py27
+  ;;
+* )
+  { echo
+    colorize 1 "ERROR"
+    echo ": The binary distribution of PyPy is not available for $(uname -s)-$(uname -m)."
+    echo "try 'pypy-1.8-dev' to build from soruce."
+    echo
+  } >&2
+  exit 1
   ;;
 esac
 
-if [ -n "${package_name}" ] && [ -n "${package_url}" ]; then
-  if [ "${package_url}" != "${package_url%%.zip*}" ]; then
-    install_zip "${package_name}" "${package_url}" "pypy" verify_py27
-  else
-    install_package "${package_name}" "${package_url}" "pypy" verify_py27
-  fi
-else
-  { echo "Precompiled binary of pypy-1.8 is not available for $(uname -s)-$(uname -m)."
-    echo "To build pypy-1.8 from soruce, use 'pypy-1.8-dev'."
-  } 1>&4 2>&1
-  exit 1
-fi
-
 install_package "setuptools-2.2" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.2.tar.gz#04a7664538957b832710653fd7d5b4e6" python
 install_package "pip-1.5.4" "https://pypi.python.org/packages/source/p/pip/pip-1.5.4.tar.gz#834b2904f92d46aaa333267fb1c922bb" python
diff --git a/plugins/python-build/share/python-build/pypy-1.9 b/plugins/python-build/share/python-build/pypy-1.9
index 6b1f39d8..3ebfc5e0 100644
--- a/plugins/python-build/share/python-build/pypy-1.9
+++ b/plugins/python-build/share/python-build/pypy-1.9
@@ -1,39 +1,27 @@
-case "$(uname -s)" in
-"Darwin" )
-  package_name="pypy-1.9"
-  package_url="https://bitbucket.org/pypy/pypy/downloads/pypy-1.9-osx64.tar.bz2#aad9c4b7b827583e37fe8ae0f7cfe0ff"
+case "$(pypy_architecture 2>/dev/null || true)" in
+"linux" )
+  install_package "pypy-1.9" "https://bitbucket.org/pypy/pypy/downloads/pypy-1.9-linux.tar.bz2#1a08c88642434fc2e0e4256d351f48db" "pypy" verify_py27
   ;;
-"Linux" )
-  case "$(uname -m)" in
-  "i386" | "i486" | "i586" | "i686" | "i786" )
-    package_name="pypy-1.9"
-    package_url="https://bitbucket.org/pypy/pypy/downloads/pypy-1.9-linux.tar.bz2#1a08c88642434fc2e0e4256d351f48db"
-    ;;
-  "x86_64" )
-    package_name="pypy-1.9"
-    package_url="https://bitbucket.org/pypy/pypy/downloads/pypy-1.9-linux64.tar.bz2#201d2cce2557e40c784473b471ee1b6b"
-    ;;
-  esac
+"linux64" )
+  install_package "pypy-1.9" "https://bitbucket.org/pypy/pypy/downloads/pypy-1.9-linux64.tar.bz2#201d2cce2557e40c784473b471ee1b6b" "pypy" verify_py27
   ;;
-"CYGWIN"* | "MINGW"* )
+"osx64" )
+  install_package "pypy-1.9" "https://bitbucket.org/pypy/pypy/downloads/pypy-1.9-osx64.tar.bz2#aad9c4b7b827583e37fe8ae0f7cfe0ff" "pypy" verify_py27
+  ;;
+"win32" )
   # FIXME: never tested on Windows
-  package_name="pypy-1.9"
-  package_url="https://bitbucket.org/pypy/pypy/downloads/pypy-1.9-win32.zip#e7655066baed3c7bbbca7df617817dd5"
+  install_zip "pypy-1.9" "https://bitbucket.org/pypy/pypy/downloads/pypy-1.9-win32.zip#e7655066baed3c7bbbca7df617817dd5" "pypy" verify_py27
+  ;;
+* )
+  { echo
+    colorize 1 "ERROR"
+    echo ": The binary distribution of PyPy is not available for $(uname -s)-$(uname -m)."
+    echo "try 'pypy-1.9-dev' to build from soruce."
+    echo
+  } >&2
+  exit 1
   ;;
 esac
 
-if [ -n "${package_name}" ] && [ -n "${package_url}" ]; then
-  if [ "${package_url}" != "${package_url%%.zip*}" ]; then
-    install_zip "${package_name}" "${package_url}" "pypy" verify_py27
-  else
-    install_package "${package_name}" "${package_url}" "pypy" verify_py27
-  fi
-else
-  { echo "Precompiled binary of pypy-1.9 is not available for $(uname -s)-$(uname -m)."
-    echo "To build pypy-1.9 from soruce, use 'pypy-1.9-dev'."
-  } 1>&4 2>&1
-  exit 1
-fi
-
 install_package "setuptools-2.2" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.2.tar.gz#04a7664538957b832710653fd7d5b4e6" python
 install_package "pip-1.5.4" "https://pypi.python.org/packages/source/p/pip/pip-1.5.4.tar.gz#834b2904f92d46aaa333267fb1c922bb" python
diff --git a/plugins/python-build/share/python-build/pypy-2.0 b/plugins/python-build/share/python-build/pypy-2.0
index 6d6a6f61..3d98d0f2 100644
--- a/plugins/python-build/share/python-build/pypy-2.0
+++ b/plugins/python-build/share/python-build/pypy-2.0
@@ -1,47 +1,49 @@
-case "$(uname -s)" in
-"Darwin" )
-  package_name="pypy-2.0"
-  package_url="https://bitbucket.org/pypy/pypy/downloads/pypy-2.0-osx64.tar.bz2#39837722da4a03ca03eda187aafa13bb"
+require_distro() {
+  if [[ "$(cat /etc/issue 2>/dev/null || true)" != "$1"* ]]; then
+    { echo
+      colorize 1 "WARNING"
+      echo ": The binary distribution of PyPy is built for $1."
+      echo "installed binary may not run expectedly on other platforms."
+      echo
+    } >&2
+    return 1
+  fi
+}
+
+case "$(pypy_architecture 2>/dev/null || true)" in
+"linux" )
+  require_distro "Ubuntu 10.04" || true
+  install_package "pypy-2.0" "https://bitbucket.org/pypy/pypy/downloads/pypy-2.0-linux.tar.bz2#267c46ed8c591da19b6091aa90fa9acf" "pypy" verify_py27
   ;;
-"Linux" )
-  case "$(uname -m)" in
-  "armel" )
-    package_name="pypy-2.0-alpha-arm"
-    package_url="https://bitbucket.org/pypy/pypy/downloads/pypy-2.0-alpha-arm-armel.tar.bz2#b9c36b99296c85a590c3e480b05d5a13"
+"linux-armel" )
+  require_distro "Ubuntu 12.04" || true
+  install_package "pypy-2.0-alpha-arm" "https://bitbucket.org/pypy/pypy/downloads/pypy-2.0-alpha-arm-armel.tar.bz2#b9c36b99296c85a590c3e480b05d5a13" "pypy" verify_py27
     ;;
-  "armhf" )
-    package_name="pypy-2.0-alpha-arm"
-    package_url="https://bitbucket.org/pypy/pypy/downloads/pypy-2.0-alpha-arm-armhf.tar.bz2#2565ce68b4032eb306d998e722495694"
-    ;;
-  "i386" | "i486" | "i586" | "i686" | "i786" )
-    package_name="pypy-2.0"
-    package_url="https://bitbucket.org/pypy/pypy/downloads/pypy-2.0-linux.tar.bz2#267c46ed8c591da19b6091aa90fa9acf"
-    ;;
-  "x86_64" )
-    package_name="pypy-2.0"
-    package_url="https://bitbucket.org/pypy/pypy/downloads/pypy-2.0-linux64.tar.bz2#2fe3298ac9354fbdb57a38472936b823"
-    ;;
-  esac
+"linux-armhf" )
+  require_distro "Ubuntu 12.04" || true
+  install_package "pypy-2.0-alpha-arm" "https://bitbucket.org/pypy/pypy/downloads/pypy-2.0-alpha-arm-armhf.tar.bz2#2565ce68b4032eb306d998e722495694" "pypy" verify_py27
   ;;
-"CYGWIN"* | "MINGW"* )
+"linux64" )
+  require_distro "Ubuntu 12.04" || true
+  install_package "pypy-2.0" "https://bitbucket.org/pypy/pypy/downloads/pypy-2.0-linux64.tar.bz2#2fe3298ac9354fbdb57a38472936b823" "pypy" verify_py27
+  ;;
+"osx64" )
+  install_package "pypy-2.0" "https://bitbucket.org/pypy/pypy/downloads/pypy-2.0-osx64.tar.bz2#39837722da4a03ca03eda187aafa13bb" "pypy" verify_py27
+  ;;
+"win32" )
   # FIXME: never tested on Windows
-  package_name="pypy-2.0"
-  package_url="https://bitbucket.org/pypy/pypy/downloads/pypy-2.0-win32.zip#f0d051c2b612b64dff496a6c0f3654fb"
+  install_zip "pypy-2.0" "https://bitbucket.org/pypy/pypy/downloads/pypy-2.0-win32.zip#f0d051c2b612b64dff496a6c0f3654fb" "pypy" verify_py27
+  ;;
+* )
+  { echo
+    colorize 1 "ERROR"
+    echo ": The binary distribution of PyPy is not available for $(uname -s)-$(uname -m)."
+    echo "try 'pypy-2.0-src' to build from soruce."
+    echo
+  } >&2
+  exit 1
   ;;
 esac
 
-if [ -n "${package_name}" ] && [ -n "${package_url}" ]; then
-  if [ "${package_url}" != "${package_url%%.zip*}" ]; then
-    install_zip "${package_name}" "${package_url}" "pypy" verify_py27
-  else
-    install_package "${package_name}" "${package_url}" "pypy" verify_py27
-  fi
-else
-  { echo "Precompiled binary of pypy-2.0 is not available for $(uname -s)-$(uname -m)."
-    echo "To build pypy-2.0 from soruce, use 'pypy-2.0-src'."
-  } 1>&4 2>&1
-  exit 1
-fi
-
 install_package "setuptools-2.2" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.2.tar.gz#04a7664538957b832710653fd7d5b4e6" python
 install_package "pip-1.5.4" "https://pypi.python.org/packages/source/p/pip/pip-1.5.4.tar.gz#834b2904f92d46aaa333267fb1c922bb" python
diff --git a/plugins/python-build/share/python-build/pypy-2.0.1 b/plugins/python-build/share/python-build/pypy-2.0.1
index 3d9b8cc8..7c1667b7 100644
--- a/plugins/python-build/share/python-build/pypy-2.0.1
+++ b/plugins/python-build/share/python-build/pypy-2.0.1
@@ -1,39 +1,41 @@
-case "$(uname -s)" in
-"Darwin" )
-  package_name="pypy-2.0.1"
-  package_url="https://bitbucket.org/pypy/pypy/downloads/pypy-2.0.1-linux.tar.bz2#e666450bcfbd936b016a2dd7312f9853"
+require_distro() {
+  if [[ "$(cat /etc/issue 2>/dev/null || true)" != "$1"* ]]; then
+    { echo
+      colorize 1 "WARNING"
+      echo ": The binary distribution of PyPy is built for $1."
+      echo "installed binary may not run expectedly on other platforms."
+      echo
+    } >&2
+    return 1
+  fi
+}
+
+case "$(pypy_architecture 2>/dev/null || true)" in
+"linux" )
+  require_distro "Ubuntu 10.04" || true
+  install_package "pypy-2.0.1" "https://bitbucket.org/pypy/pypy/downloads/pypy-2.0.1-linux.tar.bz2#8d11952e0356ea751321e7d2a1d4f17a" "pypy" verify_py27
   ;;
-"Linux" )
-  case "$(uname -m)" in
-  "i386" | "i486" | "i586" | "i686" | "i786" )
-    package_name="pypy-2.0.1"
-    package_url="https://bitbucket.org/pypy/pypy/downloads/pypy-2.0.1-linux.tar.bz2#8d11952e0356ea751321e7d2a1d4f17a"
-    ;;
-  "x86_64" )
-    package_name="pypy-2.0.1"
-    package_url="https://bitbucket.org/pypy/pypy/downloads/pypy-2.0.1-linux64.tar.bz2#5c11d727579443d0834caadb4dfe53e3"
-    ;;
-  esac
+"linux64" )
+  require_distro "Ubuntu 12.04" || true
+  install_package "pypy-2.0.1" "https://bitbucket.org/pypy/pypy/downloads/pypy-2.0.1-linux64.tar.bz2#5c11d727579443d0834caadb4dfe53e3" "pypy" verify_py27
   ;;
-"CYGWIN"* | "MINGW"* )
+"osx64" )
+  install_package "pypy-2.0.1" "https://bitbucket.org/pypy/pypy/downloads/pypy-2.0.1-linux.tar.bz2#e666450bcfbd936b016a2dd7312f9853" "pypy" verify_py27
+  ;;
+"win32" )
   # FIXME: never tested on Windows
-  package_name="pypy-2.0.1"
-  package_url="https://bitbucket.org/pypy/pypy/downloads/pypy-2.0.1-win32.zip#4c40b19ea1ec5c8c8c2a1f94f59bdf02"
+  install_zip "pypy-2.0.1" "https://bitbucket.org/pypy/pypy/downloads/pypy-2.0.1-win32.zip#4c40b19ea1ec5c8c8c2a1f94f59bdf02" "pypy" verify_py27
+  ;;
+* )
+  { echo
+    colorize 1 "ERROR"
+    echo ": The binary distribution of PyPy is not available for $(uname -s)-$(uname -m)."
+    echo "try 'pypy-2.0.1-src' to build from soruce."
+    echo
+  } >&2
+  exit 1
   ;;
 esac
 
-if [ -n "${package_name}" ] && [ -n "${package_url}" ]; then
-  if [ "${package_url}" != "${package_url%%.zip*}" ]; then
-    install_zip "${package_name}" "${package_url}" "pypy" verify_py27
-  else
-    install_package "${package_name}" "${package_url}" "pypy" verify_py27
-  fi
-else
-  { echo "Precompiled binary of pypy-2.0.1 is not available for $(uname -s)-$(uname -m)."
-    echo "To build pypy-2.0.1 from soruce, use 'pypy-2.0.1-src'."
-  } 1>&4 2>&1
-  exit 1
-fi
-
 install_package "setuptools-2.2" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.2.tar.gz#04a7664538957b832710653fd7d5b4e6" python
 install_package "pip-1.5.4" "https://pypi.python.org/packages/source/p/pip/pip-1.5.4.tar.gz#834b2904f92d46aaa333267fb1c922bb" python
diff --git a/plugins/python-build/share/python-build/pypy-2.0.2 b/plugins/python-build/share/python-build/pypy-2.0.2
index 22e82b69..f45e7007 100644
--- a/plugins/python-build/share/python-build/pypy-2.0.2
+++ b/plugins/python-build/share/python-build/pypy-2.0.2
@@ -1,39 +1,41 @@
-case "$(uname -s)" in
-"Darwin" )
-  package_name="pypy-2.0.2"
-  package_url="https://bitbucket.org/pypy/pypy/downloads/pypy-2.0.2-osx64.tar.bz2#a7da45a3161c198de6f662e3c40629ff"
+require_distro() {
+  if [[ "$(cat /etc/issue 2>/dev/null || true)" != "$1"* ]]; then
+    { echo
+      colorize 1 "WARNING"
+      echo ": The binary distribution of PyPy is built for $1."
+      echo "installed binary may not run expectedly on other platforms."
+      echo
+    } >&2
+    return 1
+  fi
+}
+
+case "$(pypy_architecture 2>/dev/null || true)" in
+"linux" )
+  require_distro "Ubuntu 10.04" || true
+  install_package "pypy-2.0.2" "https://bitbucket.org/pypy/pypy/downloads/pypy-2.0.2-linux.tar.bz2#51ac0aa37a8255acbc71eca23ea29609" "pypy" verify_py27
   ;;
-"Linux" )
-  case "$(uname -m)" in
-  "i386" | "i486" | "i586" | "i686" | "i786" )
-    package_name="pypy-2.0.2"
-    package_url="https://bitbucket.org/pypy/pypy/downloads/pypy-2.0.2-linux.tar.bz2#51ac0aa37a8255acbc71eca23ea29609"
-    ;;
-  "x86_64" )
-    package_name="pypy-2.0.2"
-    package_url="https://bitbucket.org/pypy/pypy/downloads/pypy-2.0.2-linux64.tar.bz2#9d9f512ab2f114bfb4f165c71181a511"
-    ;;
-  esac
+"linux64" )
+  require_distro "Ubuntu 12.04" || true
+  install_package "pypy-2.0.2" "https://bitbucket.org/pypy/pypy/downloads/pypy-2.0.2-linux64.tar.bz2#9d9f512ab2f114bfb4f165c71181a511" "pypy" verify_py27
   ;;
-"CYGWIN"* | "MINGW"* )
+"osx64" )
+  install_package "pypy-2.0.2" "https://bitbucket.org/pypy/pypy/downloads/pypy-2.0.2-osx64.tar.bz2#a7da45a3161c198de6f662e3c40629ff" "pypy" verify_py27
+  ;;
+"win32" )
   # FIXME: never tested on Windows
-  package_name="pypy-2.0.2"
-  package_url="https://bitbucket.org/pypy/pypy/downloads/pypy-2.0.2-win32.zip#3e51dce7ecfc8fb069d65d95e8de6fb2"
+  install_zip "pypy-2.0.2" "https://bitbucket.org/pypy/pypy/downloads/pypy-2.0.2-win32.zip#3e51dce7ecfc8fb069d65d95e8de6fb2" "pypy" verify_py27
+  ;;
+* )
+  { echo
+    colorize 1 "ERROR"
+    echo ": The binary distribution of PyPy is not available for $(uname -s)-$(uname -m)."
+    echo "try 'pypy-2.0.2-src' to build from soruce."
+    echo
+  } >&2
+  exit 1
   ;;
 esac
 
-if [ -n "${package_name}" ] && [ -n "${package_url}" ]; then
-  if [ "${package_url}" != "${package_url%%.zip*}" ]; then
-    install_zip "${package_name}" "${package_url}" "pypy" verify_py27
-  else
-    install_package "${package_name}" "${package_url}" "pypy" verify_py27
-  fi
-else
-  { echo "Precompiled binary of pypy-2.0.2 is not available for $(uname -s)-$(uname -m)."
-    echo "To build pypy-2.0.2 from soruce, use 'pypy-2.0.2-src'."
-  } 1>&4 2>&1
-  exit 1
-fi
-
 install_package "setuptools-2.2" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.2.tar.gz#04a7664538957b832710653fd7d5b4e6" python
 install_package "pip-1.5.4" "https://pypi.python.org/packages/source/p/pip/pip-1.5.4.tar.gz#834b2904f92d46aaa333267fb1c922bb" python
diff --git a/plugins/python-build/share/python-build/pypy-2.1 b/plugins/python-build/share/python-build/pypy-2.1
index 0bd84e35..a47caf2a 100644
--- a/plugins/python-build/share/python-build/pypy-2.1
+++ b/plugins/python-build/share/python-build/pypy-2.1
@@ -1,55 +1,53 @@
-case "$(uname -s)" in
-"Darwin" )
-  package_name="pypy-2.1"
-  package_url="https://bitbucket.org/pypy/pypy/downloads/pypy-2.1-osx64.tar.bz2#2a9b66d1511335183108428436fe4184"
+require_distro() {
+  if [[ "$(cat /etc/issue 2>/dev/null || true)" != "$1"* ]]; then
+    { echo
+      colorize 1 "WARNING"
+      echo ": The binary distribution of PyPy is built for $1."
+      echo "installed binary may not run expectedly on other platforms."
+      echo
+    } >&2
+    return 1
+  fi
+}
+
+case "$(pypy_architecture 2>/dev/null || true)" in
+"linux" )
+  require_distro "Ubuntu 10.04" || true
+  install_package "pypy-2.1" "https://bitbucket.org/pypy/pypy/downloads/pypy-2.1-linux.tar.bz2#dd6b4f4f52ab1bebe30b32dc4085757a" "pypy" verify_py27
   ;;
-"Linux" )
-  case "$(uname -m)" in
-  "armel" )
-    package_name="pypy-2.1"
-    package_url="https://bitbucket.org/pypy/pypy/downloads/pypy-2.1-linux-armel.tar.bz2#48cdb54c54153d219670a8a56364e9cb"
-    ;;
-  "armhf" | "armv6l" | "armv7l" )
-    case "$(cat /etc/issue 2>/dev/null || true)" in
-    "Raspbian"* )
-      package_name="pypy-2.1"
-      package_url="https://bitbucket.org/pypy/pypy/downloads/pypy-2.1-linux-armhf-raspbian.tar.bz2#56de3739f73072dfd53c7249dd04603a"
-      ;;
-    "Ubuntu"* )
-      package_name="pypy-2.1"
-      package_url="https://bitbucket.org/pypy/pypy/downloads/pypy-2.1-linux-armhf-raring.tar.bz2#563a97875c342459c277cdd567c83af8"
-      ;;
-    esac
-    ;;
-  "i386" | "i486" | "i586" | "i686" | "i786" )
-    package_name="pypy-2.1"
-    package_url="https://bitbucket.org/pypy/pypy/downloads/pypy-2.1-linux.tar.bz2#dd6b4f4f52ab1bebe30b32dc4085757a"
-    ;;
-  "x86_64" )
-    package_name="pypy-2.1"
-    package_url="https://bitbucket.org/pypy/pypy/downloads/pypy-2.1-linux64.tar.bz2#80ef61f3b1b15fd0bd94fa5cdf8a005f"
-    ;;
-  esac
+"linux-armel" )
+  require_distro "Ubuntu 12.04" || true
+  install_package "pypy-2.1" "https://bitbucket.org/pypy/pypy/downloads/pypy-2.1-linux-armel.tar.bz2#48cdb54c54153d219670a8a56364e9cb" "pypy" verify_py27
   ;;
-"CYGWIN"* | "MINGW"* )
+"linux-armhf" )
+  if [[ "$(cat /etc/issue 2>/dev/null || true)" == "Raspbian"* ]]; then
+    install_package "pypy-2.1" "https://bitbucket.org/pypy/pypy/downloads/pypy-2.1-linux-armhf-raspbian.tar.bz2#56de3739f73072dfd53c7249dd04603a" "pypy" verify_py27
+  else
+    require_distro "Ubuntu 13.04" || true
+    install_package "pypy-2.1" "https://bitbucket.org/pypy/pypy/downloads/pypy-2.1-linux-armhf-raring.tar.bz2#563a97875c342459c277cdd567c83af8" "pypy" verify_py27
+  fi
+  ;;
+"linux64" )
+  require_distro "Ubuntu 12.04" || true
+  install_package "pypy-2.1" "https://bitbucket.org/pypy/pypy/downloads/pypy-2.1-linux64.tar.bz2#80ef61f3b1b15fd0bd94fa5cdf8a005f" "pypy" verify_py27
+  ;;
+"osx64" )
+  install_package "pypy-2.1" "https://bitbucket.org/pypy/pypy/downloads/pypy-2.1-osx64.tar.bz2#2a9b66d1511335183108428436fe4184" "pypy" verify_py27
+  ;;
+"win32" )
   # FIXME: never tested on Windows
-  package_name="pypy-2.1"
-  package_url="https://bitbucket.org/pypy/pypy/downloads/pypy-2.1-win32.zip#9943c7a008535c99fed6bbe1c5a22797"
+  install_zip "pypy-2.1" "https://bitbucket.org/pypy/pypy/downloads/pypy-2.1-win32.zip#9943c7a008535c99fed6bbe1c5a22797" "pypy" verify_py27
+  ;;
+* )
+  { echo
+    colorize 1 "ERROR"
+    echo ": The binary distribution of PyPy is not available for $(uname -s)-$(uname -m)."
+    echo "try 'pypy-2.1-src' to build from soruce."
+    echo
+  } >&2
+  exit 1
   ;;
 esac
 
-if [ -n "${package_name}" ] && [ -n "${package_url}" ]; then
-  if [ "${package_url}" != "${package_url%%.zip*}" ]; then
-    install_zip "${package_name}" "${package_url}" "pypy" verify_py27
-  else
-    install_package "${package_name}" "${package_url}" "pypy" verify_py27
-  fi
-else
-  { echo "Precompiled binary of pypy-2.1 is not available for $(uname -s)-$(uname -m)."
-    echo "To build pypy-2.1 from soruce, use 'pypy-2.1-src'."
-  } 1>&4 2>&1
-  exit 1
-fi
-
 install_package "setuptools-2.2" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.2.tar.gz#04a7664538957b832710653fd7d5b4e6" python
 install_package "pip-1.5.4" "https://pypi.python.org/packages/source/p/pip/pip-1.5.4.tar.gz#834b2904f92d46aaa333267fb1c922bb" python
diff --git a/plugins/python-build/share/python-build/pypy-2.2 b/plugins/python-build/share/python-build/pypy-2.2
index d334ed17..80c660e2 100644
--- a/plugins/python-build/share/python-build/pypy-2.2
+++ b/plugins/python-build/share/python-build/pypy-2.2
@@ -1,55 +1,53 @@
-case "$(uname -s)" in
-"Darwin" )
-  package_name="pypy-2.2-osx64"
-  package_url="https://bitbucket.org/pypy/pypy/downloads/pypy-2.2-osx64.tar.bz2#690783f07340888a0fa180789de789da"
+require_distro() {
+  if [[ "$(cat /etc/issue 2>/dev/null || true)" != "$1"* ]]; then
+    { echo
+      colorize 1 "WARNING"
+      echo ": The binary distribution of PyPy is built for $1."
+      echo "installed binary may not run expectedly on other platforms."
+      echo
+    } >&2
+    return 1
+  fi
+}
+
+case "$(pypy_architecture 2>/dev/null || true)" in
+"linux" )
+  require_distro "Ubuntu 10.04" || true
+  install_package "pypy-2.2-linux" "https://bitbucket.org/pypy/pypy/downloads/pypy-2.2-linux.tar.bz2#28b38b2417c3cad4c32db120f718bcd9" "pypy" verify_py27
   ;;
-"Linux" )
-  case "$(uname -m)" in
-  "armel" )
-    package_name="pypy-2.2-linux-armel"
-    package_url="https://bitbucket.org/pypy/pypy/downloads/pypy-2.2-linux-armel.tar.bz2#c50373a6c2517b43c65fd84ac2cd3a6f"
-    ;;
-  "armhf" | "armv6l" | "armv7l" )
-    case "$(cat /etc/issue 2>/dev/null || true)" in
-    "Raspbian"* )
-      package_name="pypy-2.2-linux-armhf-raspbian"
-      package_url="https://bitbucket.org/pypy/pypy/downloads/pypy-2.2-linux-armhf-raspbian.tar.bz2#e9c9f28cba22d07445e9195c1d2fede6"
-      ;;
-    "Ubuntu"* )
-      package_name="pypy-2.2-linux-armhf-raring"
-      package_url="https://bitbucket.org/pypy/pypy/downloads/pypy-2.2-linux-armhf-raring.tar.bz2#830fdcfafae461d8e72daa94a1ab4499"
-      ;;
-    esac
-    ;;
-  "i386" | "i486" | "i586" | "i686" | "i786" )
-    package_name="pypy-2.2-linux"
-    package_url="https://bitbucket.org/pypy/pypy/downloads/pypy-2.2-linux.tar.bz2#28b38b2417c3cad4c32db120f718bcd9"
-    ;;
-  "x86_64" )
-    package_name="pypy-2.2-linux64"
-    package_url="https://bitbucket.org/pypy/pypy/downloads/pypy-2.2-linux64.tar.bz2#2ce3be921d063eff8286be2e82649638"
-    ;;
-  esac
+"linux-armel" )
+  require_distro "Ubuntu 12.04" || true
+  install_package "pypy-2.2-linux-armel" "https://bitbucket.org/pypy/pypy/downloads/pypy-2.2-linux-armel.tar.bz2#c50373a6c2517b43c65fd84ac2cd3a6f" "pypy" verify_py27
   ;;
-"CYGWIN"* | "MINGW"* )
+"linux-armhf" )
+  if [[ "$(cat /etc/issue 2>/dev/null || true)" == "Raspbian"* ]]; then
+    install_package "pypy-2.2-linux-armhf-raspbian" "https://bitbucket.org/pypy/pypy/downloads/pypy-2.2-linux-armhf-raspbian.tar.bz2#e9c9f28cba22d07445e9195c1d2fede6" "pypy" verify_py27
+  else
+    require_distro "Ubuntu 13.04" || true
+    install_package "pypy-2.2-linux-armhf-raring" "https://bitbucket.org/pypy/pypy/downloads/pypy-2.2-linux-armhf-raring.tar.bz2#830fdcfafae461d8e72daa94a1ab4499" "pypy" verify_py27
+  fi
+  ;;
+"linux64" )
+  require_distro "Ubuntu 12.04" || true
+  install_package "pypy-2.2-linux64" "https://bitbucket.org/pypy/pypy/downloads/pypy-2.2-linux64.tar.bz2#2ce3be921d063eff8286be2e82649638" "pypy" verify_py27
+  ;;
+"osx64" )
+  install_package "pypy-2.2-osx64" "https://bitbucket.org/pypy/pypy/downloads/pypy-2.2-osx64.tar.bz2#690783f07340888a0fa180789de789da" "pypy" verify_py27
+  ;;
+"win32" )
   # FIXME: never tested on Windows
-  package_name="pypy-2.2-win32"
-  package_url="https://bitbucket.org/pypy/pypy/downloads/pypy-2.2-win32.zip#b44e65f0a7951c0f7eb4338f89120120"
+  install_zip "pypy-2.2-win32" "https://bitbucket.org/pypy/pypy/downloads/pypy-2.2-win32.zip#b44e65f0a7951c0f7eb4338f89120120" "pypy" verify_py27
+  ;;
+* )
+  { echo
+    colorize 1 "ERROR"
+    echo ": The binary distribution of PyPy is not available for $(uname -s)-$(uname -m)."
+    echo "try 'pypy-2.2-src' to build from soruce."
+    echo
+  } >&2
+  exit 1
   ;;
 esac
 
-if [ -n "${package_name}" ] && [ -n "${package_url}" ]; then
-  if [ "${package_url}" != "${package_url%%.zip*}" ]; then
-    install_zip "${package_name}" "${package_url}" "pypy" verify_py27
-  else
-    install_package "${package_name}" "${package_url}" "pypy" verify_py27
-  fi
-else
-  { echo "Precompiled binary of pypy-2.2 is not available for $(uname -s)-$(uname -m)."
-    echo "To build pypy-2.2 from soruce, use 'pypy-2.2-src'."
-  } 1>&4 2>&1
-  exit 1
-fi
-
 install_package "setuptools-2.2" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.2.tar.gz#04a7664538957b832710653fd7d5b4e6" python
 install_package "pip-1.5.4" "https://pypi.python.org/packages/source/p/pip/pip-1.5.4.tar.gz#834b2904f92d46aaa333267fb1c922bb" python
diff --git a/plugins/python-build/share/python-build/pypy-2.2.1 b/plugins/python-build/share/python-build/pypy-2.2.1
index 7347e0d5..5e330eb5 100644
--- a/plugins/python-build/share/python-build/pypy-2.2.1
+++ b/plugins/python-build/share/python-build/pypy-2.2.1
@@ -1,55 +1,53 @@
-case "$(uname -s)" in
-"Darwin" )
-  package_name="pypy-2.2.1-osx64"
-  package_url="https://bitbucket.org/pypy/pypy/downloads/pypy-2.2.1-osx64.tar.bz2#040cd25e95f62242c41e9d4e1e1c1166"
+require_distro() {
+  if [[ "$(cat /etc/issue 2>/dev/null || true)" != "$1"* ]]; then
+    { echo
+      colorize 1 "WARNING"
+      echo ": The binary distribution of PyPy is built for $1."
+      echo "installed binary may not run expectedly on other platforms."
+      echo
+    } >&2
+    return 1
+  fi
+}
+
+case "$(pypy_architecture 2>/dev/null || true)" in
+"linux" )
+  require_distro "Ubuntu 10.04" || true
+  install_package "pypy-2.2.1-linux" "https://bitbucket.org/pypy/pypy/downloads/pypy-2.2.1-linux.tar.bz2#86ef92a13faf309f4f413e35c01afcab" "pypy" verify_py27
   ;;
-"Linux" )
-  case "$(uname -m)" in
-  "armel" )
-    package_name="pypy-2.2.1-linux-armel"
-    package_url="https://bitbucket.org/pypy/pypy/downloads/pypy-2.2.1-linux-armel.tar.bz2#0127094c36f985f6c2b4ed82be3fb6c8"
-    ;;
-  "armhf" | "armv6l" | "armv7l" )
-    case "$(cat /etc/issue 2>/dev/null || true)" in
-    "Raspbian"* )
-      package_name="pypy-2.2.1-linux-armhf-raspbian"
-      package_url="https://bitbucket.org/pypy/pypy/downloads/pypy-2.2.1-linux-armhf-raspbian.tar.bz2#dcb1803b109a43b3a5b166bb1f7c4736"
-      ;;
-    "Ubuntu"* )
-      package_name="pypy-2.2.1-linux-armhf-raring"
-      package_url="https://bitbucket.org/pypy/pypy/downloads/pypy-2.2.1-linux-armhf-raring.tar.bz2#278e0ceb961bd0f49af53a01301601d4"
-      ;;
-    esac
-    ;;
-  "i386" | "i486" | "i586" | "i686" | "i786" )
-    package_name="pypy-2.2.1-linux"
-    package_url="https://bitbucket.org/pypy/pypy/downloads/pypy-2.2.1-linux.tar.bz2#86ef92a13faf309f4f413e35c01afcab"
-    ;;
-  "x86_64" )
-    package_name="pypy-2.2.1-linux64"
-    package_url="https://bitbucket.org/pypy/pypy/downloads/pypy-2.2.1-linux64.tar.bz2#96732d12957fa3c8e58ded2939631e5f"
-    ;;
-  esac
+"linux-armel" )
+  require_distro "Ubuntu 12.04" || true
+  install_package "pypy-2.2.1-linux-armel" "https://bitbucket.org/pypy/pypy/downloads/pypy-2.2.1-linux-armel.tar.bz2#0127094c36f985f6c2b4ed82be3fb6c8" "pypy" verify_py27
   ;;
-"CYGWIN"* | "MINGW"* )
+"linux-armhf" )
+  if [[ "$(cat /etc/issue 2>/dev/null || true)" == "Raspbian"* ]]; then
+    install_package "pypy-2.2.1-linux-armhf-raspbian" "https://bitbucket.org/pypy/pypy/downloads/pypy-2.2.1-linux-armhf-raspbian.tar.bz2#dcb1803b109a43b3a5b166bb1f7c4736" "pypy" verify_py27
+  else
+    require_distro "Ubuntu 13.04" || true
+    install_package "pypy-2.2.1-linux-armhf-raring" "https://bitbucket.org/pypy/pypy/downloads/pypy-2.2.1-linux-armhf-raring.tar.bz2#278e0ceb961bd0f49af53a01301601d4" "pypy" verify_py27
+  fi
+  ;;
+"linux64" )
+  require_distro "Ubuntu 12.04" || true
+  install_package "pypy-2.2.1-linux64" "https://bitbucket.org/pypy/pypy/downloads/pypy-2.2.1-linux64.tar.bz2#96732d12957fa3c8e58ded2939631e5f" "pypy" verify_py27
+  ;;
+"osx64" )
+  install_package "pypy-2.2.1-osx64" "https://bitbucket.org/pypy/pypy/downloads/pypy-2.2.1-osx64.tar.bz2#040cd25e95f62242c41e9d4e1e1c1166" "pypy" verify_py27
+  ;;
+"win32" )
   # FIXME: never tested on Windows
-  package_name="pypy-2.2.1-win32"
-  package_url="https://bitbucket.org/pypy/pypy/downloads/pypy-2.2.1-win32.zip#213aacf7a06cd531c3457f1c5a73059c"
+  install_zip "pypy-2.2.1-win32" "https://bitbucket.org/pypy/pypy/downloads/pypy-2.2.1-win32.zip#213aacf7a06cd531c3457f1c5a73059c" "pypy" verify_py27
+  ;;
+* )
+  { echo
+    colorize 1 "ERROR"
+    echo ": The binary distribution of PyPy is not available for $(uname -s)-$(uname -m)."
+    echo "try 'pypy-2.2.1-src' to build from soruce."
+    echo
+  } >&2
+  exit 1
   ;;
 esac
 
-if [ -n "${package_name}" ] && [ -n "${package_url}" ]; then
-  if [ "${package_url}" != "${package_url%%.zip*}" ]; then
-    install_zip "${package_name}" "${package_url}" "pypy" verify_py27
-  else
-    install_package "${package_name}" "${package_url}" "pypy" verify_py27
-  fi
-else
-  { echo "Precompiled binary of pypy-2.2.1 is not available for $(uname -s)-$(uname -m)."
-    echo "To build pypy-2.2.1 from soruce, use 'pypy-2.2.1-src'."
-  } 1>&4 2>&1
-  exit 1
-fi
-
 install_package "setuptools-2.2" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.2.tar.gz#04a7664538957b832710653fd7d5b4e6" python
 install_package "pip-1.5.4" "https://pypi.python.org/packages/source/p/pip/pip-1.5.4.tar.gz#834b2904f92d46aaa333267fb1c922bb" python
diff --git a/plugins/python-build/share/python-build/pypy3-2.1-beta1 b/plugins/python-build/share/python-build/pypy3-2.1-beta1
index 45f82e64..a9efff3f 100644
--- a/plugins/python-build/share/python-build/pypy3-2.1-beta1
+++ b/plugins/python-build/share/python-build/pypy3-2.1-beta1
@@ -1,55 +1,53 @@
-case "$(uname -s)" in
-"Darwin" )
-  package_name="pypy3-2.1-beta1-osx64"
-  package_url="https://bitbucket.org/pypy/pypy/downloads/pypy3-2.1-beta1-osx64.tar.bz2#36634bf17f0e9852fda7cc6745f2df28"
+require_distro() {
+  if [[ "$(cat /etc/issue 2>/dev/null || true)" != "$1"* ]]; then
+    { echo
+      colorize 1 "WARNING"
+      echo ": The binary distribution of PyPy is built for $1."
+      echo "installed binary may not run expectedly on other platforms."
+      echo
+    } >&2
+    return 1
+  fi
+}
+
+case "$(pypy_architecture 2>/dev/null || true)" in
+"linux" )
+  require_distro "Ubuntu 10.04" || true
+  install_package "pypy3-2.1-beta1-linux" "https://bitbucket.org/pypy/pypy/downloads/pypy3-2.1-beta1-linux.tar.bz2#9ae9d0b67279c557fb4b7f57c3072d0f" "pypy" verify_py32
   ;;
-"Linux" )
-  case "$(uname -m)" in
-  "armel" )
-    package_name="pypy3-2.1-beta1-linux-armel"
-    package_url="https://bitbucket.org/pypy/pypy/downloads/pypy3-2.1-beta1-linux-armel.tar.bz2#d57d0d0d3c49c7cce75440924d8f66b7"
-    ;;
-  "armhf" | "armv6l" | "armv7l" )
-    case "$(cat /etc/issue 2>/dev/null || true)" in
-    "Raspbian"* )
-      package_name="pypy3-2.1-beta1-linux-armhf-raspbian"
-      package_url="https://bitbucket.org/pypy/pypy/downloads/pypy3-2.1-beta1-linux-armhf-raspbian.tar.bz2#a43e64557fe27b979a8546a89c05652f"
-      ;;
-    "Ubuntu"* )
-      package_name="pypy3-2.1-beta1-linux-armhf-raring"
-      package_url="https://bitbucket.org/pypy/pypy/downloads/pypy3-2.1-beta1-linux-armhf-raring.tar.bz2#55b82b199ccf537c7ea5e2f31df78dfe"
-      ;;
-    esac
-    ;;
-  "i386" | "i486" | "i586" | "i686" | "i786" )
-    package_name="pypy3-2.1-beta1-linux"
-    package_url="https://bitbucket.org/pypy/pypy/downloads/pypy3-2.1-beta1-linux.tar.bz2#9ae9d0b67279c557fb4b7f57c3072d0f"
-    ;;
-  "x86_64" )
-    package_name="pypy3-2.1-beta1-linux64"
-    package_url="https://bitbucket.org/pypy/pypy/downloads/pypy3-2.1-beta1-linux64.tar.bz2#f6adca4d26f34bef9903cc5347c7d688"
-    ;;
-  esac
+"linux-armel" )
+  require_distro "Ubuntu 12.04" || true
+  install_package "pypy3-2.1-beta1-linux-armel" "https://bitbucket.org/pypy/pypy/downloads/pypy3-2.1-beta1-linux-armel.tar.bz2#d57d0d0d3c49c7cce75440924d8f66b7" "pypy" verify_py32
   ;;
-"CYGWIN"* | "MINGW"* )
+"linux-armhf")
+  if [[ "$(cat /etc/issue 2>/dev/null || true)" == "Raspbian"* ]]; then
+    install_package "pypy3-2.1-beta1-linux-armhf-raspbian" "https://bitbucket.org/pypy/pypy/downloads/pypy3-2.1-beta1-linux-armhf-raspbian.tar.bz2#a43e64557fe27b979a8546a89c05652f" "pypy" verify_py32
+  else
+    require_distro "Ubuntu 13.04" || true
+    install_package "pypy3-2.1-beta1-linux-armhf-raring" "https://bitbucket.org/pypy/pypy/downloads/pypy3-2.1-beta1-linux-armhf-raring.tar.bz2#55b82b199ccf537c7ea5e2f31df78dfe" "pypy" verify_py32
+  fi
+  ;;
+"linux64" )
+  require_distro "Ubuntu 12.04" || true
+  install_package "pypy3-2.1-beta1-linux64" "https://bitbucket.org/pypy/pypy/downloads/pypy3-2.1-beta1-linux64.tar.bz2#f6adca4d26f34bef9903cc5347c7d688" "pypy" verify_py32
+  ;;
+"osx64" )
+  install_package "pypy3-2.1-beta1-osx64" "https://bitbucket.org/pypy/pypy/downloads/pypy3-2.1-beta1-osx64.tar.bz2#36634bf17f0e9852fda7cc6745f2df28" "pypy" verify_py32
+  ;;
+"win32" )
   # FIXME: never tested on Windows
-  package_name="pypy3-2.1-beta1-win32"
-  package_url="https://bitbucket.org/pypy/pypy/downloads/pypy3-2.1-beta1-win32.zip#026c8be208bf2ef742ddfa3f8ca41a05"
+  install_zip "pypy3-2.1-beta1-win32" "https://bitbucket.org/pypy/pypy/downloads/pypy3-2.1-beta1-win32.zip#026c8be208bf2ef742ddfa3f8ca41a05" "pypy" verify_py32
+  ;;
+* )
+  { echo
+    colorize 1 "ERROR"
+    echo ": The binary distribution of PyPy is not available for $(uname -s)-$(uname -m)."
+    echo "try 'pypy3-2.1-beta1-src' to build from soruce."
+    echo
+  } >&2
+  exit 1
   ;;
 esac
 
-if [ -n "${package_name}" ] && [ -n "${package_url}" ]; then
-  if [ "${package_url}" != "${package_url%%.zip*}" ]; then
-    install_zip "${package_name}" "${package_url}" "pypy" verify_py32
-  else
-    install_package "${package_name}" "${package_url}" "pypy" verify_py32
-  fi
-else
-  { echo "Precompiled binary of pypy3-2.1-beta1 is not available for $(uname -s)-$(uname -m)."
-    echo "To build pypy3-2.1-beta1 from soruce, use 'pypy3-2.1-beta1-src'."
-  } 1>&4 2>&1
-  exit 1
-fi
-
 install_package "setuptools-2.2" "https://pypi.python.org/packages/source/s/setuptools/setuptools-2.2.tar.gz#04a7664538957b832710653fd7d5b4e6" python
 install_package "pip-1.5.4" "https://pypi.python.org/packages/source/p/pip/pip-1.5.4.tar.gz#834b2904f92d46aaa333267fb1c922bb" python