update to 2020 update1

2 files changed, 35 insertions, 30 deletions

diff --git a/.SRCINFO b/.SRCINFO
index 73ec5454f707..008ca80c33be 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,6 +1,6 @@
 pkgbase = intel-parallel-studio-xe
 	pkgdesc = Intel C++ C and FORTRAN compiler - Intel Parallel Studio XE - Cluster Edition - icc icpc ifort ipp mkl
-	pkgver = 2020.0.166
+	pkgver = 2020.1.217
 	pkgrel = 1
 	url = http://software.intel.com/en-us/articles/non-commercial-software-download/
 	arch = x86_64
@@ -14,7 +14,7 @@ pkgbase = intel-parallel-studio-xe
 	options = strip
 	options = libtool
 	options = staticlibs
-	source = http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/16225/parallel_studio_xe_2020_cluster_edition.tgz
+	source = http://registrationcenter-download.intel.com/akdlm/irc_nas/tec/16526/parallel_studio_xe_2020_update1_cluster_edition.tgz
 	source = intel_compilers.sh
 	source = intel_vtune-profiler.sh
 	source = intel_advisor.sh
@@ -32,7 +32,7 @@ pkgbase = intel-parallel-studio-xe
 	source = intel-mkl-th.conf
 	source = intel-tbb.install
 	source = EULA.txt
-	sha256sums = 573b1d20707d68ce85b70934cfad15b5ad9cc14124a261c17ddd7717ba842c64
+	sha256sums = fd11d8de72b2bd60474f8bce7b463e4cbb2255969b9eaf24f689575aa2a2abab
 	sha256sums = 0704025fdfe40e4fce08e88b641128310c3a3b51332668aab60fb815b424f52b
 	sha256sums = 12f932f99e6d3ee9dd828b95e630f096a9e58707db39bea15fba22a1ad80f211
 	sha256sums = 63b12c66d9c8c2310a7bbd5206c82ba9667fb6ffb3dc7e3f9304a17ed8c8fbcd
@@ -52,32 +52,34 @@ pkgbase = intel-parallel-studio-xe
 	sha256sums = 228ac25e147adb9b872e1a562e522d2fd48809ccae89b765112009896a6d55a5
 
 pkgname = intel-common-libs
-	pkgdesc = Intel Common Libraries 19.1.0
+	pkgdesc = Intel Common Libraries 19.1.1
 
 pkgname = intel-openmp
-	pkgdesc = Intel OpenMP Implementation 19.1.0
-	depends = intel-common-libs=2020.0.166
+	pkgdesc = Intel OpenMP Implementation 19.1.1
+	depends = intel-common-libs=2020.1.217
 
 pkgname = intel-compiler-base
-	pkgdesc = Intel C/C++ 19.1.0
+	pkgdesc = Intel C/C++ 19.1.1
 	install = intel-composer.install
-	depends = intel-common-libs=2020.0.166
-	depends = intel-openmp=2020.0.166
+	depends = intel-common-libs=2020.1.217
+	depends = intel-openmp=2020.1.217
 
 pkgname = intel-fortran-compiler
-	pkgdesc = Intel Fortran compiler 19.1.0
+	pkgdesc = Intel Fortran compiler 19.1.1
 	install = intel-composer.install
-	depends = intel-compiler-base=2020.0.166
+	depends = intel-compiler-base=2020.1.217
 
 pkgname = intel-ipp
 	pkgdesc = Intel Integrated Performance Primitives
 	install = intel-composer.install
 
-pkgname = intel-mkl
+pkgname = intel-mkl_psxe
 	pkgdesc = Intel Math Kernel Library (Intel® MKL)
 	install = intel-mkl.install
-	depends = intel-common-libs=2020.0.166
+	depends = intel-common-libs=2020.1.217
 	optdepends = intel-openmp: Intel OpenMP Implementation
+	provides = intel-mkl
+	conflicts = intel-mkl
 	backup = etc/intel-mkl-th.conf
 
 pkgname = intel-mpi
@@ -88,14 +90,14 @@ pkgname = intel-tbb_psxe
 	install = intel-tbb.install
 
 pkgname = intel-advisor
-	pkgdesc = Threading design and prototyping tool for software architects 2020.0.0.604394
+	pkgdesc = Threading design and prototyping tool for software architects 2020.1.0.605410
 	conflicts = intel-advisor-xe
 
 pkgname = intel-vtune-profiler
-	pkgdesc = Performance profiler for serial and parallel performance analysis 2020.0.0.605129
+	pkgdesc = Performance profiler for serial and parallel performance analysis 2020.1.0.607630
 	depends = pangox-compat
 
 pkgname = intel-inspector
-	pkgdesc = Memory and thread debugger 2020.0.0.603904
+	pkgdesc = Memory and thread debugger 2020.1.0.604266
 	conflicts = intel-inspector-xe
 
diff --git a/PKGBUILD b/PKGBUILD
index 799604823924..836de64ecccf 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -1,5 +1,6 @@
-# Maintainer: Stephen Cox: stephencoxmail -at- gmail com
-# Maintainer: Alexey Stukalov: astukalov -t- gmail com
+# Maintainer: Kaixiang Huang: kxhuang0 -at- gmail.com
+# Contributor: Stephen Cox: stephencoxmail -at- gmail com
+# Contributor: Alexey Stukalov: astukalov -t- gmail com
 # Contributor: Ignat Harczuk: ignathe -at- gmail com
 # Contributor: Mark Wells: mwellsa -at- gmail com
 # Contributor: Simone Riva: siomone.rva -a- gmail com
@@ -14,7 +15,7 @@
 # intel-compiler-base:          Intel C/C++ compiler and base libs
 # intel-fortran-compiler:       Intel Fortran compiler and base libs"
 # intel-ipp:                    Intel Integrated Performance Primitives
-# intel-mkl:                    Intel Math Kernel Library (Intel® MKL)
+# intel-mkl_psxe:               Intel Math Kernel Library (Intel® MKL)
 # intel-mpi:                    Intel Message passing interface (MPI)
 # intel-tbb_psxe:               Intel Threading Building Blocks (TBB)
 # intel-vtune-profiler:         Intel Vtune Profiler
@@ -44,7 +45,7 @@ pkgname=('intel-common-libs'
          'intel-compiler-base'
          'intel-fortran-compiler'
          'intel-ipp'
-         'intel-mkl'
+         'intel-mkl_psxe'
          'intel-mpi'
          'intel-tbb_psxe'
          'intel-advisor'
@@ -86,24 +87,24 @@ _remove_static_objects_ipp=false
 ########################################
 
 _year='2020'
-_v_a='0'
-_v_b='166'
+_v_a='1'
+_v_b='217'
 # year, version a and version b found in /opt/intel/compilers_and_libraries_YEAR_A_B
 
-_update=''
+_update='1'
 
 pkgrel=1
 
 _sp='cluster_edition'
-_icc_ver='19.1.0'
-_vtune_ver='2020.0.0.605129'
-_inspector_ver='2020.0.0.603904'
-_advisor_ver='2020.0.0.604394'
+_icc_ver='19.1.1'
+_vtune_ver='2020.1.0.607630'
+_inspector_ver='2020.1.0.604266'
+_advisor_ver='2020.1.0.605410'
 
 pkgver=${_year}.${_v_a}.${_v_b}
 
 # package download folders
-_dir_nr='16225'
+_dir_nr='16526'
 
 options=(strip libtool staticlibs)
 
@@ -135,7 +136,7 @@ source=(
   'EULA.txt'
 )
 
-sha256sums=('573b1d20707d68ce85b70934cfad15b5ad9cc14124a261c17ddd7717ba842c64'
+sha256sums=('fd11d8de72b2bd60474f8bce7b463e4cbb2255969b9eaf24f689575aa2a2abab'
             '0704025fdfe40e4fce08e88b641128310c3a3b51332668aab60fb815b424f52b'
             '12f932f99e6d3ee9dd828b95e630f096a9e58707db39bea15fba22a1ad80f211'
             '63b12c66d9c8c2310a7bbd5206c82ba9667fb6ffb3dc7e3f9304a17ed8c8fbcd'
@@ -516,13 +517,15 @@ package_intel-ipp() {
   ln -s ./${_composer_xe_dir}/linux/ipp/ ${pkgdir}/opt/intel/ipp
 }
 
-package_intel-mkl() {
+package_intel-mkl_psxe() {
 
   set_build_vars
 
   pkgdesc="Intel Math Kernel Library (Intel® MKL)"
   depends=("intel-common-libs=$pkgver")
   optdepends=("intel-openmp: Intel OpenMP Implementation")
+  provides=('intel-mkl')
+  conflicts=('intel-mkl')
   install=intel-mkl.install
   backup=('etc/intel-mkl-th.conf')