From efb95722ca953f3559c3447716ee2137e03f52c2 Mon Sep 17 00:00:00 2001
From: "James R. Barlow" <jim@purplerock.ca>
Date: Fri, 11 May 2018 12:46:10 -0700
Subject: [PATCH] Travis: Use declarative APT for Tesseract too

---
 .travis.yml                     | 11 ++++++++---
 .travis/linux_before_install.sh | 10 ----------
 2 files changed, 8 insertions(+), 13 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 8562c9dd..3f861c32 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -10,16 +10,21 @@ addons:
   apt:
     update: true
     sources:
-    - sourceline: 'ppa:vshn/ghostscript'
+    - sourceline: 'ppa:alex-p/tesseract-ocr'
     - sourceline: 'ppa:heyarje/libav-11'
+    - sourceline: 'ppa:vshn/ghostscript'
     packages:
     - ghostscript
-    - poppler-utils
-    - libavformat56
     - libavcodec56
+    - libavformat56
     - libavutil54
     - libffi-dev
     - pngquant
+    - poppler-utils
+    - tesseract-ocr
+    - tesseract-ocr-deu
+    - tesseract-ocr-eng
+    - tesseract-ocr-fra
 
 env:
   global:
diff --git a/.travis/linux_before_install.sh b/.travis/linux_before_install.sh
index ecb27f59..b95240cd 100644
--- a/.travis/linux_before_install.sh
+++ b/.travis/linux_before_install.sh
@@ -3,16 +3,6 @@
 set -euo pipefail
 set -x
 
-sudo add-apt-repository ppa:alex-p/tesseract-ocr -y
-
-sudo apt-get update
-sudo apt-get autoremove -y
-sudo apt-get install -y --no-install-recommends \
-		tesseract-ocr \
-		tesseract-ocr-eng \
-		tesseract-ocr-fra \
-		tesseract-ocr-deu
-
 pip install --upgrade pip
 mkdir -p packages
 wget -q 'https://www.dropbox.com/s/vaq0kbwi6e6au80/unpaper_6.1-1.deb?raw=1' -O packages/unpaper_6.1-1.deb