Upgrade to Anaconda 4.0.0

6 files changed, 40 insertions, 40 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 6949bd66dcf7..660a84ecc5ec 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,8 +1,8 @@
 # Generated by mksrcinfo v8
-# Mon Feb 22 11:49:01 UTC 2016
+# Tue Apr  5 09:38:23 UTC 2016
 pkgbase = anaconda
 	pkgdesc = Completely free enterprise-ready Python distribution for large-scale data processing, predictive analytics, and scientific computing.
-	pkgver = 2.5.0
+	pkgver = 4.0.0
 	pkgrel = 1
 	url = https://store.continuum.io/cshop/anaconda/
 	arch = x86
@@ -11,14 +11,14 @@ pkgbase = anaconda
 	makedepends = patch
 	options = !strip
 	options = libtool
-	source = https://3230d63b5fc54e62148e-c95ac804525aac4b6dba79b00b39d1d3.ssl.cf1.rackcdn.com/Anaconda3-2.5.0-Linux-x86_64.sh
+	source = https://3230d63b5fc54e62148e-c95ac804525aac4b6dba79b00b39d1d3.ssl.cf1.rackcdn.com/Anaconda3-4.0.0-Linux-x86_64.sh
 	source = installer_sh_x86.patch
 	source = installer_sh_x86_64.patch
 	source = conda_install.patch
-	sha256sums = addadcb927f15cb0b5b6e36890563d3352a8ff6a901ea753d389047d274a29a9
-	sha256sums = eca56a7f01e418ae7f12634ffc288a1387a6ae93873ed4b669e4aaf59a2a0cd8
-	sha256sums = e10e50ce51c88547f14a96c401ddde6bd4a9d9ea4a9aa863014e1248557e967a
-	sha256sums = b7d1662b2ec3de934171df0216527324135e89932b12cd8949695322fbd5ba42
+	sha256sums = 36a558a1109868661a5735f5f32607643f6dc05cf581fefb1c10fb8abbe22f39
+	sha256sums = dd816d1f60de23111e7ab7a276ea957268738464acfe25c474b37ef0cfe330e9
+	sha256sums = 155b7fc7f8e70b49ee44dee55f3b79543b99d4def4244d2d18da18f359a9dfef
+	sha256sums = 06dacb8460f32af0a057dfccd9c2349d6eb4c9d4e04b84e12ddc07c85eb561fd
 
 pkgname = anaconda
 
diff --git a/PKGBUILD b/PKGBUILD
index c56abe94467b..c4d517f6aca6 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -2,7 +2,7 @@
 # Contributor : Martin Wimpress <code@flexion.org>
 
 pkgname=anaconda
-pkgver=2.5.0
+pkgver=4.0.0
 pkgrel=1
 pkgdesc="Completely free enterprise-ready Python distribution for large-scale data processing, predictive analytics, and scientific computing."
 arch=('x86' 'x86_64')
@@ -14,17 +14,17 @@ source=("https://3230d63b5fc54e62148e-c95ac804525aac4b6dba79b00b39d1d3.ssl.cf1.r
         "installer_sh_x86_64.patch"
         "conda_install.patch")
 options=(!strip libtool)
-sha256sums=('addadcb927f15cb0b5b6e36890563d3352a8ff6a901ea753d389047d274a29a9'
-            'eca56a7f01e418ae7f12634ffc288a1387a6ae93873ed4b669e4aaf59a2a0cd8'
-            'e10e50ce51c88547f14a96c401ddde6bd4a9d9ea4a9aa863014e1248557e967a'
-            'b7d1662b2ec3de934171df0216527324135e89932b12cd8949695322fbd5ba42')
+sha256sums=('36a558a1109868661a5735f5f32607643f6dc05cf581fefb1c10fb8abbe22f39'
+            'dd816d1f60de23111e7ab7a276ea957268738464acfe25c474b37ef0cfe330e9'
+            '155b7fc7f8e70b49ee44dee55f3b79543b99d4def4244d2d18da18f359a9dfef'
+            '06dacb8460f32af0a057dfccd9c2349d6eb4c9d4e04b84e12ddc07c85eb561fd')
 _pythonver='3.5.1-0'
-_condaver='3.19.1'
+_condaver='4.0.5'
 
 _pkgarch=`uname -m`
 if [ "$CARCH" == "x86" ]; then
     _pkgarch="x86"
-    sha256sums[0]='22ac26c8bde7c4153ea859f6f6d8aca93bbf1e213d800167ad5ea530c62959af'
+    sha256sums[0]='e1469fa0d24de12f33661ce3d7a06d77968be8822f366a61a0018a3850ab56b0'
     source[0]="https://3230d63b5fc54e62148e-c95ac804525aac4b6dba79b00b39d1d3.ssl.cf1.rackcdn.com/Anaconda3-${pkgver}-Linux-x86.sh"
 fi
 
diff --git a/conda_install.patch b/conda_install.patch
index 525945184903..2503c41a895b 100644
--- a/conda_install.patch
+++ b/conda_install.patch
@@ -1,5 +1,5 @@
---- a/pkgs/conda-3.19.1-py35_0/lib/python3.5/site-packages/conda/install.py	2016-02-22 12:40:36.995269570 +0100
-+++ b/pkgs/conda-3.19.1-py35_0/lib/python3.5/site-packages/conda/install.py	2016-02-22 12:44:41.749333978 +0100
+--- a/pkgs/conda-4.0.5-py35_0/lib/python3.5/site-packages/conda/install.py	2016-03-16 20:47:12.000000000 +0100
++++ b/pkgs/conda-4.0.5-py35_0/lib/python3.5/site-packages/conda/install.py	2016-04-05 11:34:17.102042633 +0200
 @@ -267,21 +267,23 @@
      return res
  
@@ -28,7 +28,7 @@
      else:
          sys.exit("Invalid mode:" % mode)
  
-@@ -589,7 +591,7 @@
+@@ -604,7 +606,7 @@
  def load_meta(prefix, dist):
      return is_linked(prefix, dist)
  
@@ -37,7 +37,7 @@
      '''
      Set up a package in a specified (environment) prefix.  We assume that
      the package has been extracted (using extract() above).
-@@ -642,7 +644,7 @@
+@@ -657,7 +659,7 @@
          for f in sorted(has_prefix_files):
              placeholder, mode = has_prefix_files[f]
              try:
@@ -46,7 +46,7 @@
              except PaddingError:
                  sys.exit("ERROR: placeholder '%s' too short in: %s\n" %
                           (placeholder, dist))
-@@ -787,6 +789,10 @@
+@@ -802,6 +804,10 @@
                   default=sys.prefix,
                   help="prefix (defaults to %default)")
  
@@ -57,7 +57,7 @@
      p.add_option('-v', '--verbose',
                   action="store_true")
  
-@@ -797,9 +803,14 @@
+@@ -812,9 +818,14 @@
      logging.basicConfig()
  
      prefix = opts.prefix
@@ -72,7 +72,7 @@
  
      if opts.file:
          idists = list(yield_lines(join(prefix, opts.file)))
-@@ -815,7 +826,7 @@
+@@ -830,7 +841,7 @@
      for dist in idists:
          if opts.verbose:
              print("linking: %s" % dist)
diff --git a/installer_sh_x86.patch b/installer_sh_x86.patch
index 62fd1de62572..88d09b61209e 100644
--- a/installer_sh_x86.patch
+++ b/installer_sh_x86.patch
@@ -1,18 +1,18 @@
---- a/Anaconda3-2.5.0-Linux-x86.sh	2016-02-22 12:30:56.081446621 +0100
-+++ b/Anaconda3-2.5.0-Linux-x86.sh	2016-02-22 12:32:36.550378227 +0100
+--- a/Anaconda3-4.0.0-Linux-x86.sh	2016-04-05 11:28:52.342055244 +0200
++++ b/Anaconda3-4.0.0-Linux-x86.sh	2016-04-05 11:30:10.634580834 +0200
 @@ -73,9 +73,9 @@
      fi
  fi
  # verify the size of the installer
--wc -c "$THIS_PATH" | grep 350634167 >/dev/null
-+wc -c "$THIS_PATH" | grep 350634174 >/dev/null
+-wc -c "$THIS_PATH" | grep 353266156 >/dev/null
++wc -c "$THIS_PATH" | grep 353266163 >/dev/null
  if (( $? )); then
--    echo "ERROR: size of $THIS_FILE should be 350634167 bytes" >&2
-+    echo "ERROR: size of $THIS_FILE should be 350634174 bytes" >&2
+-    echo "ERROR: size of $THIS_FILE should be 353266156 bytes" >&2
++    echo "ERROR: size of $THIS_FILE should be 353266163 bytes" >&2
      exit 1
  fi
  
-@@ -433,7 +433,7 @@
+@@ -443,7 +443,7 @@
  extract_dist conda-env-2.4.5-py35_0
  
  mkdir $PREFIX/envs
@@ -21,12 +21,12 @@
  
  PYTHON="$PREFIX/pkgs/python-3.5.1-0/bin/python"
  $PYTHON -E -V
-@@ -443,7 +443,7 @@
+@@ -453,7 +453,7 @@
      uname -a
      exit 1
  fi
 -
 +exit 0
  echo "creating default environment..."
- CONDA_INSTALL="$PREFIX/pkgs/conda-3.19.1-py35_0/lib/python3.5/site-packages/conda/install.py"
+ CONDA_INSTALL="$PREFIX/pkgs/conda-4.0.5-py35_0/lib/python3.5/site-packages/conda/install.py"
  $PYTHON -E -s $CONDA_INSTALL --prefix=$PREFIX --file=conda-meta/.ilan || exit 1
diff --git a/installer_sh_x86_64.patch b/installer_sh_x86_64.patch
index b589649e1599..4b74af3ba182 100644
--- a/installer_sh_x86_64.patch
+++ b/installer_sh_x86_64.patch
@@ -1,18 +1,18 @@
---- a/Anaconda3-2.5.0-Linux-x86_64.sh	2016-02-22 12:30:55.911448429 +0100
-+++ b/Anaconda3-2.5.0-Linux-x86_64.sh	2016-02-22 12:33:42.666341829 +0100
+--- a/Anaconda3-4.0.0-Linux-x86_64.sh	2016-04-05 11:28:52.165390400 +0200
++++ b/Anaconda3-4.0.0-Linux-x86_64.sh	2016-04-05 11:31:05.547347640 +0200
 @@ -70,9 +70,9 @@
      fi
  fi
  # verify the size of the installer
--wc -c "$THIS_PATH" | grep 414838933 >/dev/null
-+wc -c "$THIS_PATH" | grep 414838940 >/dev/null
+-wc -c "$THIS_PATH" | grep 417798602 >/dev/null
++wc -c "$THIS_PATH" | grep 417798609 >/dev/null
  if (( $? )); then
--    echo "ERROR: size of $THIS_FILE should be 414838933 bytes" >&2
-+    echo "ERROR: size of $THIS_FILE should be 414838940 bytes" >&2
+-    echo "ERROR: size of $THIS_FILE should be 417798602 bytes" >&2
++    echo "ERROR: size of $THIS_FILE should be 417798609 bytes" >&2
      exit 1
  fi
  
-@@ -434,7 +434,7 @@
+@@ -444,7 +444,7 @@
  extract_dist conda-env-2.4.5-py35_0
  
  mkdir $PREFIX/envs
@@ -21,12 +21,12 @@
  
  PYTHON="$PREFIX/pkgs/python-3.5.1-0/bin/python"
  $PYTHON -E -V
-@@ -444,7 +444,7 @@
+@@ -454,7 +454,7 @@
      uname -a
      exit 1
  fi
 -
 +exit 0
  echo "creating default environment..."
- CONDA_INSTALL="$PREFIX/pkgs/conda-3.19.1-py35_0/lib/python3.5/site-packages/conda/install.py"
+ CONDA_INSTALL="$PREFIX/pkgs/conda-4.0.5-py35_0/lib/python3.5/site-packages/conda/install.py"
  $PYTHON -E -s $CONDA_INSTALL --prefix=$PREFIX --file=conda-meta/.ilan || exit 1
diff --git a/upgrade_helper.sh b/upgrade_helper.sh
index 961c3d1efeb4..d1910a458cba 100755
--- a/upgrade_helper.sh
+++ b/upgrade_helper.sh
@@ -35,7 +35,7 @@ echo "Edit conda_install patch to have correct conda version in header"
 read
 
 cd pkg/anaconda/opt/anaconda/
-conda_install=`ls -1 pkgs/conda-3.*/lib/python*/site-packages/conda/install.py`
+conda_install=`ls -1 pkgs/conda-*/lib/python*/site-packages/conda/install.py`
 cp $conda_install ${conda_install}.old
 echo "Trying patch as is:"
 patch -p1 < ../../../../conda_install.patch