[6.0] 4fc3914f4 Switch to xenial and tidy up

[Dridi Boukelmoune]

commit 4fc3914f4717e1c29901da3760320c40c3835ac4
Author: Federico G. Schwindt <fgsch at lodoss.net>
Date:   Sun Dec 2 18:27:02 2018 +0000

    Switch to xenial and tidy up

diff --git a/.travis.yml b/.travis.yml
index 52424fefc..8d31d9e04 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -4,27 +4,31 @@ matrix:
   fast_finish: true
   include:
   - os: linux
-    dist: trusty
+    dist: xenial
     compiler: gcc
   - os: linux
-    dist: trusty
+    dist: xenial
     compiler: clang
   - os: linux
-    dist: trusty
+    dist: xenial
     compiler: clang
-    env: CLANG=7 SAN_FLAGS="--enable-asan --enable-ubsan"
-    sudo: required
+    env: SAN_FLAGS="--enable-asan --enable-ubsan"
   - os: osx
     osx_image: xcode10.1
     compiler: clang
   allow_failures:
   - os: osx
-  - env: CLANG=7 SAN_FLAGS="--enable-asan --enable-ubsan"
+  - env: SAN_FLAGS="--enable-asan --enable-ubsan"
 addons:
   apt:
     packages:
       - python-docutils
       - python-sphinx
+  homebrew:
+    packages:
+      - docutils
+      - nghttp2
+      - sphinx-doc
 notifications:
   irc:
     channels:
@@ -34,19 +38,8 @@ notifications:
 before_install:
   - |
     if [[ "$TRAVIS_OS_NAME" == "osx" ]]; then
-      brew update
-      brew install docutils sphinx-doc nghttp2
       export PATH="/usr/local/opt/sphinx-doc/bin:$PATH"
-    elif [[ -n "$CLANG" ]]; then
-      wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | sudo apt-key add -
-      sudo apt-add-repository -y \
-        "deb http://apt.llvm.org/trusty/ llvm-toolchain-trusty-$CLANG main"
-      sudo apt-key adv --keyserver keyserver.ubuntu.com --recv-keys BA9EF27F
-      sudo apt-add-repository -y \
-        "deb http://ppa.launchpad.net/ubuntu-toolchain-r/test/ubuntu trusty main"
-      sudo apt-get update
-      sudo apt-get install -y clang-$CLANG llvm-$CLANG
-      export CC=clang-$CLANG
+    elif [[ -n "$SAN_FLAGS" ]]; then
       export CONFIGURE_ARGS="--enable-developer-warnings --enable-debugging-symbols --disable-stack-protector --with-persistent-storage ${SAN_FLAGS}"
       export ASAN_OPTIONS=abort_on_error=1,detect_odr_violation=1,detect_leaks=1,detect_stack_use_after_return=1,detect_invalid_pointer_pairs=1,handle_segv=0,handle_sigbus=0,use_sigaltstack=0,disable_coredump=0
       export LSAN_OPTIONS=abort_on_error=1,use_sigaltstack=0,suppressions=$(pwd)/tools/lsan.suppr