cleanup versions

- fix 2019.3 tools versions
- fix the ld .conf files to use the proper version
- fix doc/man tools folders
- don't include version into the package name for MKL, MPI, TBB
  (it's the same)

5 files changed, 40 insertions, 47 deletions

diff --git a/.SRCINFO b/.SRCINFO
index d43eb96491f7..6abb32727d31 100644
--- a/.SRCINFO
+++ b/.SRCINFO
@@ -1,7 +1,7 @@
 pkgbase = intel-parallel-studio-xe
 	pkgdesc = Intel C++ C and FORTRAN compiler - Intel Parallel Studio XE - Cluster Edition - icc icpc ifort ipp mkl
 	pkgver = 2019.3.199
-	pkgrel = 2
+	pkgrel = 3
 	url = http://software.intel.com/en-us/articles/non-commercial-software-download/
 	arch = x86_64
 	license = custom
@@ -36,9 +36,9 @@ pkgbase = intel-parallel-studio-xe
 	sha256sums = b5b022366d6d1a98dbb63b60221c62bc951c9819653ad6f5142192e89f78cf63
 	sha256sums = 5304346c863f64de797250eeb14f51c5cfc8212ff20813b124f20e7666286990
 	sha256sums = 0704025fdfe40e4fce08e88b641128310c3a3b51332668aab60fb815b424f52b
-	sha256sums = 278f9545d14c1fbec737bbfbcafb1b9090d35aab0dfeddc99d4c6e296b56057b
-	sha256sums = e3103fb1c5e2ec9f0cc4090abb7e273563e735d88e185f527c66b2aebd52e733
-	sha256sums = 3978b721722db7e3127828caf00e6e98539724daffd0a0bdaa287b27bc61b97a
+	sha256sums = 58bced75693b2f73480b89242b33c9a0ce565d6a12a17f84067bab351bde9be7
+	sha256sums = 63b12c66d9c8c2310a7bbd5206c82ba9667fb6ffb3dc7e3f9304a17ed8c8fbcd
+	sha256sums = fd24842f29d50bc53779dd918fbc548ebf165ff664114e59195773ad04076b5d
 	sha256sums = 3f96dec03111e69d16bb363acf4d0570e8a9526c09e5e542a7558f1b26d043ef
 	sha256sums = 31ac4d0f30a93fe6393f48cb13761d7d1ce9719708c76a377193d96416bed884
 	sha256sums = 6151bc273b6f741a4ce93d8160b6f167c8ad499dbc6e8e3f6e08d48571d6a52a
@@ -76,28 +76,28 @@ pkgname = intel-ipp
 	install = intel-composer.install
 
 pkgname = intel-mkl
-	pkgdesc = Intel Math Kernel Library (Intel® MKL) 2019.3.199
+	pkgdesc = Intel Math Kernel Library (Intel® MKL)
 	install = intel-mkl.install
 	depends = intel-common-libs=2019.3.199
 	optdepends = intel-openmp: Intel OpenMP Implementation
 	backup = etc/intel-mkl-th.conf
 
 pkgname = intel-mpi
-	pkgdesc = Intel MPI library 2019.3.199
+	pkgdesc = Intel MPI library
 
 pkgname = intel-tbb_psxe
-	pkgdesc = Intel Threading Building Blocks (TBB) 2019.3.199
+	pkgdesc = Intel Threading Building Blocks (TBB)
 	install = intel-tbb.install
 
 pkgname = intel-advisor
-	pkgdesc = Threading design and prototyping tool for software architects 2019.3.0.591264
+	pkgdesc = Threading design and prototyping tool for software architects 2019.3.0.591490
 	conflicts = intel-advisor-xe
 
 pkgname = intel-vtune-amplifier
-	pkgdesc = Performance profiler for serial and parallel performance analysis 2019.3.0.590814
+	pkgdesc = Performance profiler for serial and parallel performance analysis 2019.3.0.591499
 	depends = pangox-compat
 
 pkgname = intel-inspector
-	pkgdesc = Memory and thread debugger 2019.3.0.590798
+	pkgdesc = Memory and thread debugger 2019.3.0.591484
 	conflicts = intel-inspector-xe
 
diff --git a/PKGBUILD b/PKGBUILD
index d4e194735496..8affe561e9e3 100644
--- a/PKGBUILD
+++ b/PKGBUILD
@@ -92,25 +92,18 @@ _v_b='199'
 
 _update='3'
 
-pkgrel=2
+pkgrel=3
 
 
 _sp='cluster_edition'
 _icc_ver='19.0.3'
-_mpi_ver='2019.3.199'
-_mkl_ver='2019.3.199'
-_tbb_ver='2019.3.199'
-_vtune_ver='2019.3.0.590814'
-_inspector_ver='2019.3.0.590798'
-_advisor_ver='2019.3.0.591264'
-
-_vtune_man_ver='2019.3.0.590814'
-_inspector_man_ver='2019.3.0.590798'
-_advisor_man_ver='2019.3.0.591264'
-
+_vtune_ver='2019.3.0.591499'
+_inspector_ver='2019.3.0.591484'
+_advisor_ver='2019.3.0.591490'
 
 pkgver=${_year}.${_v_a}.${_v_b}
 
+# package download folders
 _dir_nr='15268'
 _mpi_dir_nr='15260'
 
@@ -149,9 +142,9 @@ source=(
 sha256sums=('b5b022366d6d1a98dbb63b60221c62bc951c9819653ad6f5142192e89f78cf63'
             '5304346c863f64de797250eeb14f51c5cfc8212ff20813b124f20e7666286990'
             '0704025fdfe40e4fce08e88b641128310c3a3b51332668aab60fb815b424f52b'
-            '278f9545d14c1fbec737bbfbcafb1b9090d35aab0dfeddc99d4c6e296b56057b'
-            'e3103fb1c5e2ec9f0cc4090abb7e273563e735d88e185f527c66b2aebd52e733'
-            '3978b721722db7e3127828caf00e6e98539724daffd0a0bdaa287b27bc61b97a'
+            '58bced75693b2f73480b89242b33c9a0ce565d6a12a17f84067bab351bde9be7'
+            '63b12c66d9c8c2310a7bbd5206c82ba9667fb6ffb3dc7e3f9304a17ed8c8fbcd'
+            'fd24842f29d50bc53779dd918fbc548ebf165ff664114e59195773ad04076b5d'
             '3f96dec03111e69d16bb363acf4d0570e8a9526c09e5e542a7558f1b26d043ef'
             '31ac4d0f30a93fe6393f48cb13761d7d1ce9719708c76a377193d96416bed884'
             '6151bc273b6f741a4ce93d8160b6f167c8ad499dbc6e8e3f6e08d48571d6a52a'
@@ -487,7 +480,7 @@ package_intel-ipp() {
 
   set_build_vars
 
-  pkgdesc="Intel Integrated Performance Primitives $_ipp_ver"
+  pkgdesc="Intel Integrated Performance Primitives"
   pkgver=${_pkg_ver}
   install=intel-composer.install
 
@@ -529,7 +522,7 @@ package_intel-mkl() {
 
   set_build_vars
 
-  pkgdesc="Intel Math Kernel Library (Intel® MKL) $_mkl_ver"
+  pkgdesc="Intel Math Kernel Library (Intel® MKL)"
   pkgver=${_pkg_ver}
   depends=("intel-common-libs=$pkgver")
   optdepends=("intel-openmp: Intel OpenMP Implementation")
@@ -582,7 +575,7 @@ package_intel-mpi() {
 
   set_build_vars
 
-  pkgdesc="Intel MPI library $_mpi_ver"
+  pkgdesc="Intel MPI library"
   pkgver=${_pkg_ver}
 
   mkdir -p ${xe_build_dir}/opt
@@ -623,7 +616,7 @@ package_intel-tbb_psxe() {
 
   set_build_vars
 
-  pkgdesc="Intel Threading Building Blocks (TBB) $_tbb_ver"
+  pkgdesc="Intel Threading Building Blocks (TBB)"
   pkgver=${_pkg_ver}
   install=intel-tbb.install
 
@@ -678,7 +671,7 @@ package_intel-vtune-amplifier() {
   mkdir -p ${_man_dir}
 
   msg2 "Updating scripts"
-  sed -e "s/<arch>/${_bin_dir}/g" \
+  sed -e "s/<arch>/${_bin_dir}/g" -e "s/<ver>/${_vtune_ver}/g" \
     < ${srcdir}/intel_vtune-amplifier.sh > ${xe_build_dir}/etc/profile.d/intel_vtune-amplifier.sh
   chmod a+x ${xe_build_dir}/etc/profile.d/intel_vtune-amplifier.sh
 
@@ -687,17 +680,17 @@ package_intel-vtune-amplifier() {
   extract_rpms 'intel-vtune-amplifier-*.rpm'  $xe_build_dir
 
   msg2 "Copying man pages"
-  if [[ -d ${xe_build_dir}/opt/intel/vtune_amplifier_xe_${_year}.${_vtune_man_ver}/man/man1 ]]
+  if [[ -d ${xe_build_dir}/opt/intel/vtune_amplifier_${_vtune_ver}/man/man1 ]]
   then
-    mv ${xe_build_dir}/opt/intel/vtune_amplifier_xe_${_year}.${_vtune_man_ver}/man/man1/*.1 ${_man_dir}
+    mv ${xe_build_dir}/opt/intel/vtune_amplifier_${_vtune_ver}/man/man1/*.1 ${_man_dir}
     gzip ${_man_dir}/*.1
   fi
 
 
   if $_remove_docs ; then
     msg2 "Removing documentation"
-    rm -rf ${xe_build_dir}/opt/intel/vtune_amplifier_xe_${_year}.${_vtune_ver}/samples
-    rm -rf ${xe_build_dir}/opt/intel/vtune_amplifier_xe_${_year}.${_vtune_ver}/documentation
+    rm -rf ${xe_build_dir}/opt/intel/vtune_amplifier_${_vtune_ver}/samples
+    rm -rf ${xe_build_dir}/opt/intel/vtune_amplifier_${_vtune_ver}/documentation
   fi
 
   msg2 "Moving package files"
@@ -720,7 +713,7 @@ package_intel-advisor() {
   mkdir -p ${_man_dir}
 
   msg2 "Updating scripts"
-  sed -e "s/<arch>/${_bin_dir}/g" \
+  sed -e "s/<arch>/${_bin_dir}/g" -e "s/<ver>/${_advisor_ver}/g" \
     < ${srcdir}/intel_advisor.sh > ${xe_build_dir}/etc/profile.d/intel_advisor.sh
   chmod a+x ${xe_build_dir}/etc/profile.d/intel_advisor.sh
 
@@ -729,17 +722,17 @@ package_intel-advisor() {
   extract_rpms 'intel-advisor-*.rpm'  $xe_build_dir
 
   msg2 "Copying man pages"
-  if [[ -d ${xe_build_dir}/opt/intel/advisor_${_year}.${_advisor_man_ver}/man/man1 ]]
+  if [[ -d ${xe_build_dir}/opt/intel/advisor_${_advisor_ver}/man/man1 ]]
   then
-    mv ${xe_build_dir}/opt/intel/advisor_${_year}.${_advisor_man_ver}/man/man1/*.1 ${_man_dir}
+    mv ${xe_build_dir}/opt/intel/advisor_${_advisor_ver}/man/man1/*.1 ${_man_dir}
     gzip ${_man_dir}/*.1
   fi
 
 
   if $_remove_docs ; then
     msg2 "Removing documentation"
-    rm -rf ${xe_build_dir}/opt/intel/advisor_${_year}.${_advisor_ver}/samples
-    rm -rf ${xe_build_dir}/opt/intel/advisor_${_year}.${_advisor_ver}/documentation
+    rm -rf ${xe_build_dir}/opt/intel/advisor_${_advisor_ver}/samples
+    rm -rf ${xe_build_dir}/opt/intel/advisor_${_advisor_ver}/documentation
   fi
 
   msg2 "Moving package files"
@@ -760,7 +753,7 @@ package_intel-inspector() {
   mkdir -p ${_man_dir}
 
   msg2 "Updating scripts"
-  sed -e "s/<arch>/${_bin_dir}/g" \
+  sed -e "s/<arch>/${_bin_dir}/g" -e "s/<ver>/${_inspector_ver}/g" \
     < ${srcdir}/intel_inspector.sh > ${xe_build_dir}/etc/profile.d/intel_inspector.sh
   chmod a+x ${xe_build_dir}/etc/profile.d/intel_inspector.sh
 
@@ -769,17 +762,17 @@ package_intel-inspector() {
   extract_rpms 'intel-inspector-*.rpm'  $xe_build_dir
 
   msg2 "Copying man pages"
-  if [[ -d ${xe_build_dir}/opt/intel/inspector_${_year}.${_inspector_man_ver}/man/man1 ]]
+  if [[ -d ${xe_build_dir}/opt/intel/inspector_${_inspector_ver}/man/man1 ]]
   then
-    mv ${xe_build_dir}/opt/intel/inspector_${_year}.${_inspector_man_ver}/man/man1/*.1 ${_man_dir}
+    mv ${xe_build_dir}/opt/intel/inspector_${_inspector_ver}/man/man1/*.1 ${_man_dir}
     gzip ${_man_dir}/*.1
   fi
 
 
   if $_remove_docs ; then
     msg2 "Removing documentation"
-    rm -rf ${xe_build_dir}/opt/intel/inspector_${_year}.${_inspector_ver}/samples
-    rm -rf ${xe_build_dir}/opt/intel/inspector_${_year}.${_inspector_ver}/documentation
+    rm -rf ${xe_build_dir}/opt/intel/inspector_${_inspector_ver}/samples
+    rm -rf ${xe_build_dir}/opt/intel/inspector_${_inspector_ver}/documentation
   fi
 
   msg2 "Moving package files"
diff --git a/intel_advisor.sh b/intel_advisor.sh
index 4d839a1dfc0f..8f909ab0cd75 100644
--- a/intel_advisor.sh
+++ b/intel_advisor.sh
@@ -1,2 +1,2 @@
-PATH=$PATH:/opt/intel/advisor_2017.1.1.486553/<arch>
+PATH=$PATH:/opt/intel/advisor_<ver>/<arch>
 export PATH
diff --git a/intel_inspector.sh b/intel_inspector.sh
index c338919bd6eb..72a1edceb92c 100644
--- a/intel_inspector.sh
+++ b/intel_inspector.sh
@@ -1,2 +1,2 @@
-PATH=$PATH:/opt/intel/inspector_2017.1.1.484836/<arch>
+PATH=$PATH:/opt/intel/inspector_<ver>/<arch>
 export PATH
diff --git a/intel_vtune-amplifier.sh b/intel_vtune-amplifier.sh
index 0f82018ee3af..48f1b37d6acb 100644
--- a/intel_vtune-amplifier.sh
+++ b/intel_vtune-amplifier.sh
@@ -1,2 +1,2 @@
-PATH=$PATH:/opt/intel/vtune_amplifier_xe_2017.1.0.486011/<arch>
+PATH=$PATH:/opt/intel/vtune_amplifier_xe_<ver>/<arch>
 export PATH