From a0f1b02eb511bbd53c830ee7eef2faa681c5ce5b Mon Sep 17 00:00:00 2001
From: Yann Sionneau <ys@m-labs.hk>
Date: Mon, 17 Aug 2015 17:50:19 +0200
Subject: [PATCH 1/3] Revert "manual: llvmlite-artiq conda package needs a
 recent libstdc++6"

This reverts commit 8669f1d61db7cacc676db464ffbcd54b76e3e8e0.
This is no longer needed since the llvmlite-artiq package for
linux-64 has been rebuilt on an older Ubuntu (14.04 LTS)
---
 doc/manual/installing.rst | 19 -------------------
 1 file changed, 19 deletions(-)

diff --git a/doc/manual/installing.rst b/doc/manual/installing.rst
index b95dadb42..9d7523205 100644
--- a/doc/manual/installing.rst
+++ b/doc/manual/installing.rst
@@ -42,25 +42,6 @@ Then you can install the ARTIQ package, it will pull all the necessary dependenc
 
     $ conda install artiq
 
-.. note::
-    You need to have a recent libstdc++6.
-    If you are installing on e.g. Ubuntu 14.04 LTS: you need to update your
-    libstdc++6.
-
-    If the following command outputs `GLIBCXX_3.4.20`, then you don't need to
-    upgrade::
-
-        $ strings /usr/lib/x86_64-linux-gnu/libstdc++.so.6 | grep GLIBCXX_3.4.20
-        GLIBCXX_3.4.20
-
-    Adapt the previous command to the location of libstdc++ on your system.
-
-    To upgrade, on Ubuntu you need to do the following::
-
-        $ sudo add-apt-repository ppa:ubuntu-toolchain-r/test
-        $ sudo apt-get update
-        $ sudo apt-get install libstdc++6
-
 Preparing the core device FPGA board
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 

From c94dafdecab1c5416ae8a23d50a2386842631c8e Mon Sep 17 00:00:00 2001
From: Yann Sionneau <ys@m-labs.hk>
Date: Mon, 17 Aug 2015 17:51:36 +0200
Subject: [PATCH 2/3] Revert "travis: use more recent libstdc++"

This reverts commit 075bf331ac440dcab49ee73a522acfe2230a0104.
This is no longer needed since the llvmlite-artiq package for
linux-64 has been rebuilt on an older Ubuntu (14.04 LTS)
---
 .travis.yml | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/.travis.yml b/.travis.yml
index 0892bc27c..7f3498cb7 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -2,12 +2,6 @@ language: python
 python:
   - '3.4'
 sudo: false
-addons:
-  apt:
-    sources:
-      - ubuntu-toolchain-r-test
-    packages:
-      - libstdc++6
 env:
   global:
     - BUILD_SOC=1

From 19a77b51f2219965d7c0eda51ca344edf47f08d3 Mon Sep 17 00:00:00 2001
From: Yann Sionneau <ys@m-labs.hk>
Date: Mon, 17 Aug 2015 22:02:01 +0200
Subject: [PATCH 3/3] conda: make aiohttp testing not depend on gunicorn on
 Windows platform

---
 conda/aiohttp/meta.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/conda/aiohttp/meta.yaml b/conda/aiohttp/meta.yaml
index c251daaad..2b196ffc1 100644
--- a/conda/aiohttp/meta.yaml
+++ b/conda/aiohttp/meta.yaml
@@ -27,7 +27,7 @@ test:
 
   requires:
     - chardet
-    - gunicorn
+    - gunicorn # [not win]
     - nose
 
 about: