Do not use ppa to satisfy the deps

Issue: #65

.travis.yml

@@ -21,19 +21,18 @@ branches:
 
 env:
   matrix:
-    - USE_LLVM=Off
-    - USE_LLVM=On
+    - USE_LLVM=Off # if you rename On/Off,
+    - USE_LLVM=On  # fix all scripts (e.g. install-dependencies.sh)
 
 before_install:
   - ./.travis/${TRAVIS_OS_NAME}/install-dependencies.sh
 
 before_script:
   - mkdir -p build
   - cd build
-  - cmake . -DUSE_LLVM=$USE_LLVM -DBUILD_TESTS=On -DCMAKE_BUILD_TYPE=Release -DSITE="${TRAVIS_OS_NAME}@Travis" -DBUILDNAME="${TRAVIS_BRANCH}_${CMAKE_CXX_COMPILER}"
+  - cmake .. -DUSE_LLVM=$USE_LLVM -DBUILD_TESTS=On -DCMAKE_BUILD_TYPE=Release -DSITE="${TRAVIS_OS_NAME}@Travis" -DBUILDNAME="${TRAVIS_BRANCH}_${CXX}"
 
 script:
-  - cd build
   - make ExperimentalBuild
   - make ExperimentalTest
 

.travis/linux/install-dependencies.sh

@@ -1,14 +1,12 @@
 #!/bin/sh
 
-sudo add-apt-repository --yes ppa:ubuntu-toolchain-r/test
 sudo apt-get update -qq
 
-sudo apt-get install -y binutils:i386 llvm-3.3-dev:i386 libreadline-dev:i386
+alias apt_install='sudo apt-get -qy --no-install-suggests --no-install-recommends install'
 
-if [ "$CXX" = "clang++" ]; then
-    sudo apt-get install -y g++-4.8-multilib
-fi
-if [ "$CXX" = "g++" ]; then
-    sudo apt-get install -y gcc:i386 g++:i386 cpp:i386 g++-4.6:i386 gcc-4.6:i386
-fi
+apt_install "g++-multilib" gcc-multilib linux-libc-dev:i386 # 32bit compilers
+apt_install libreadline-dev:i386
 
+if [ "$USE_LLVM" = "On" ]; then
+    apt_install llvm-3.3:i386 llvm-3.3-dev:i386 libllvm3.3:i386 llvm-3.3-runtime:i386
+fi