[gentoo-commits] proj/sci:master commit in: eclass/

[Justin Lecher]

commit:     44f2fd7fd15e4101c564f8d9f61310cb90dafac9
Author:     David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 16 23:43:39 2016 +0000
Commit:     Justin Lecher <jlec <AT> gentoo <DOT> org>
CommitDate: Fri Feb 19 09:56:10 2016 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=44f2fd7f

eclass/intel-sdp-r1.eclass: Improve eclass to match modern QA standards

 eclass/intel-sdp-r1.eclass | 566 ++++++++++++++++++++++++---------------------
 1 file changed, 297 insertions(+), 269 deletions(-)

diff --git a/eclass/intel-sdp-r1.eclass b/eclass/intel-sdp-r1.eclass
index 14467b7..2f06ed3 100644
--- a/eclass/intel-sdp-r1.eclass
+++ b/eclass/intel-sdp-r1.eclass
@@ -9,62 +9,71 @@
 # Sci Team <sci@g.o>
 # @BLURB: Handling of Intel's Software Development Products package management
 
+MULTILIB_COMPAT=( abi_x86_{32,64} )
+
+inherit check-reqs eutils multilib-build versionator
+
+EXPORT_FUNCTIONS src_unpack src_install pkg_postinst pkg_postrm pkg_pretend
+
 if [[ ! ${_INTEL_SDP_R1_ECLASS_} ]]; then
 
-case "${EAPI:-0}" in
+case "${EAPI}" in
 	6) ;;
 	*) die "EAPI=${EAPI} is not supported" ;;
 esac
 
-# @ECLASS-VARIABLE: INTEL_DID
+# @ECLASS-VARIABLE: INTEL_DIST_SKU
 # @DEFAULT_UNSET
 # @DESCRIPTION:
 # The package download ID from Intel.
-# To find out its value, see the links to download in
+# To determine its value, see the links to download in
 # https://registrationcenter.intel.com/RegCenter/MyProducts.aspx
 #
 # e.g. 8365
 #
-# Must be defined before inheriting the eclass
+# Must be defined before inheriting the eclass.
 
-# @ECLASS-VARIABLE: INTEL_DPN
-# @DEFAULT_UNSET
+# @ECLASS-VARIABLE: INTEL_DIST_NAME
 # @DESCRIPTION:
 # The package name to download from Intel.
-# To find out its value, see the links to download in
+# To determine its value, see the links to download in
 # https://registrationcenter.intel.com/RegCenter/MyProducts.aspx
 #
 # e.g. parallel_studio_xe
 #
-# Must be defined before inheriting the eclass
+# Must be defined before inheriting the eclass.
+: ${INTEL_DIST_NAME:=parallel_studio_xe}
 
-# @ECLASS-VARIABLE: INTEL_DPV
+# @ECLASS-VARIABLE: INTEL_DIST_PV
 # @DEFAULT_UNSET
 # @DESCRIPTION:
 # The package download version from Intel.
-# To find out its value, see the links to download in
+# To determine its value, see the links to download in
 # https://registrationcenter.intel.com/RegCenter/MyProducts.aspx
 #
 # e.g. 2016_update1
 #
-# Must be defined before inheriting the eclass
+# Must be defined before inheriting the eclass.
 
-# @ECLASS-VARIABLE: INTEL_TARX
+# @ECLASS-VARIABLE: INTEL_DIST_TARX
 # @DESCRIPTION:
-# The package extention.
-# To find out its value, see the links to download in
+# The package distfile suffix.
+# To determine its value, see the links to download in
 # https://registrationcenter.intel.com/RegCenter/MyProducts.aspx
 #
-# e.g. tar.gz
+# e.g. tgz
 #
-# Must be defined before inheriting the eclass
-: ${INTEL_TARX:=tgz}
+# Must be defined before inheriting the eclass.
+: ${INTEL_DIST_TARX:=tgz}
 
 # @ECLASS-VARIABLE: INTEL_SUBDIR
-# @DEFAULT_UNSET
 # @DESCRIPTION:
-# The package sub-directory where it will end-up in /opt/intel
-# To find out its value, you have to do a raw install from the Intel tar ball
+# The package sub-directory (without version numbers) where it will end-up in /opt/intel
+#
+# e.g. compilers_and_libraries
+#
+# To determine its value, you have to do a raw install from the Intel tarball.
+: ${INTEL_SUBDIR:=compilers_and_libraries}
 
 # @ECLASS-VARIABLE: INTEL_SKIP_LICENSE
 # @DEFAULT_UNSET
@@ -84,9 +93,9 @@ esac
 # e.g. i486
 : ${INTEL_X86:=i486}
 
-# @ECLASS-VARIABLE: INTEL_BIN_RPMS
+# @ECLASS-VARIABLE: INTEL_DIST_BIN_RPMS
 # @DESCRIPTION:
-# Functional name of rpm without any version/arch tag
+# Functional name of rpm without any version/arch tag.
 # Has to be a bash array
 #
 # e.g. ("icc-l-all-devel")
@@ -94,68 +103,95 @@ esac
 # if the rpm is located in a directory other than INTEL_RPMS_DIR you can
 # specify the full path
 #
-# e.g. CLI_install/rpm/intel-vtune-amplifier-xe-cli
-: ${INTEL_BIN_RPMS:=()}
+# e.g. ("CLI_install/rpm/intel-vtune-amplifier-xe-cli")
+[[ ${INTEL_DIST_BIN_RPMS[@]} ]] || INTEL_DIST_BIN_RPMS=()
 
-# @ECLASS-VARIABLE: INTEL_AMD64_RPMS
+# @ECLASS-VARIABLE: INTEL_DIST_AMD64_RPMS
 # @DESCRIPTION:
-# AMD64 single arch rpms. Same syntax as INTEL_BIN_RPMS
-# Has to be a bash array
-: ${INTEL_AMD64_RPMS:=()}
+# AMD64 single arch rpms. Same syntax as INTEL_DIST_BIN_RPMS.
+# Has to be a bash array.
+[[ ${INTEL_DIST_AMD64_RPMS[@]} ]] || INTEL_DIST_AMD64_RPMS=()
 
-# @ECLASS-VARIABLE: INTEL_X86_RPMS
+# @ECLASS-VARIABLE: INTEL_DIST_X86_RPMS
 # @DESCRIPTION:
-# X86 single arch rpms. Same syntax as INTEL_BIN_RPMS
-# Has to be a bash array
-: ${INTEL_X86_RPMS:=()}
+# X86 single arch rpms. Same syntax as INTEL_DIST_BIN_RPMS.
+# Has to be a bash array.
+[[ ${INTEL_DIST_X86_RPMS[@]} ]] || INTEL_DIST_X86_RPMS=()
 
-# @ECLASS-VARIABLE: INTEL_DAT_RPMS
+# @ECLASS-VARIABLE: INTEL_DIST_DAT_RPMS
 # @DESCRIPTION:
 # Functional name of rpm of common data which are arch free
-# without any version tag
-# Has to be a bash array
+# without any version tag. Has to be a bash array.
 #
 # e.g. ("openmp-l-all-devel")
 #
 # if the rpm is located in a directory different to INTEL_RPMS_DIR you can
 # specify the full path
 #
-# e.g. CLI_install/rpm/intel-vtune-amplifier-xe-cli-common
-: ${INTEL_DAT_RPMS:=()}
+# e.g. ("CLI_install/rpm/intel-vtune-amplifier-xe-cli-common")
+[[ ${INTEL_DIST_DAT_RPMS[@]} ]] || INTEL_DIST_DAT_RPMS=()
 
-# @ECLASS-VARIABLE: INTEL_SINGLE_ARCH
+# @ECLASS-VARIABLE: INTEL_DIST_SPLIT_ARCH
 # @DESCRIPTION:
-# Unset, if only the multilib package will be provided by intel
-: ${INTEL_SINGLE_ARCH:=true}
+# Set to "true" if arches are to be fetched separately, instead of using
+# the combined tarball.
+: ${INTEL_DIST_SPLIT_ARCH:=false}
 
-MULTILIB_COMPAT=( abi_x86_{32,64} )
+# @FUNCTION: _isdp_get-sdp-full-pv
+# @INTERNAL
+# @DESCRIPTION:
+# Gets the full internal Intel version specifier.
+_isdp_get-sdp-full-pv() {
+	local _intel_pv=($(get_version_components))
+	local _intel_pv_full="${_intel_pv[3]}-${_intel_pv[0]}.${_intel_pv[1]}.${_intel_pv[2]}-${_intel_pv[3]}"
+	echo "${_intel_pv_full}"
+}
 
-inherit check-reqs eutils multilib-build versionator
+# @FUNCTION: _isdp_get-sdp-year
+# @INTERNAL
+# @DESCRIPTION:
+# Gets the year component from INTEL_DIST_PV
+_isdp_get-sdp-year() {
+	local _intel_sdp_year
+	_intel_sdp_year=${INTEL_DIST_PV}
+	_intel_sdp_year=${_intel_sdp_year%_sp*}
+	_intel_sdp_year=${_intel_sdp_year%_update*}
+	echo "${_intel_sdp_year}"
+}
 
-_INTEL_PV1=$(get_version_component_range 1)
-_INTEL_PV2=$(get_version_component_range 2)
-_INTEL_PV3=$(get_version_component_range 3)
-_INTEL_PV4=$(get_version_component_range 4)
-_INTEL_PV=""
-[[ -n ${_INTEL_PV4} ]] && _INTEL_PV+="${_INTEL_PV4}-"
-[[ -n ${_INTEL_PV1} ]] && _INTEL_PV+="${_INTEL_PV1}"
-[[ -n ${_INTEL_PV2} ]] && _INTEL_PV+=".${_INTEL_PV2}"
-[[ -n ${_INTEL_PV3} ]] && _INTEL_PV+=".${_INTEL_PV3}"
-[[ -n ${_INTEL_PV4} ]] && _INTEL_PV+="-${_INTEL_PV4}"
+# @FUNCTION: isdp_get-sdp-dir
+# @DESCRIPTION:
+# Gets the full rootless path to the installation directory
+#
+#     e.g. opt/intel/compilers_and_libraries_2016.1.150
+isdp_get-sdp-dir() {
+	local _intel_sdp_dir="opt/intel/${INTEL_SUBDIR}_$(_isdp_get-sdp-year).$(get_version_component_range 3-4)"
+	echo "${_intel_sdp_dir}"
+}
 
-_INTEL_URI="http://registrationcenter-download.intel.com/akdlm/irc_nas/${INTEL_DID}/${INTEL_DPN}"
+# @FUNCTION: isdp_get-sdp-edir
+# @DESCRIPTION:
+# Gets the full rooted/prefixed path to the installation directory
+#
+#     e.g. /opt/intel/compilers_and_libraries_2016.1.150
+isdp_get-sdp-edir() {
+	local _intel_sdp_edir="${EPREFIX%/}/$(isdp_get-sdp-dir)"
+	echo "${_intel_sdp_edir}"
+}
 
-if [ ${INTEL_SINGLE_ARCH} == true ]; then
-	SRC_URI="
-		abi_x86_32? ( ${_INTEL_URI}_${INTEL_DPV}_ia32.${INTEL_TARX} )
-		abi_x86_64? ( ${_INTEL_URI}_${INTEL_DPV}_intel64.${INTEL_TARX} )"
+_INTEL_URI="http://registrationcenter-download.intel.com/akdlm/irc_nas/${INTEL_DIST_SKU}/${INTEL_DIST_NAME}"
+if [[ "${INTEL_DIST_SPLIT_ARCH}" != true ]]; then
+	SRC_URI="${_INTEL_URI}_${INTEL_DIST_PV}.${INTEL_DIST_TARX}"
 else
-	SRC_URI="${_INTEL_URI}_${INTEL_DPV}.${INTEL_TARX}"
+	SRC_URI="
+		abi_x86_32? ( ${_INTEL_URI}_${INTEL_DIST_PV}_ia32.${INTEL_DIST_TARX} )
+		abi_x86_64? ( ${_INTEL_URI}_${INTEL_DIST_PV}_intel64.${INTEL_DIST_TARX} )"
 fi
+unset _INTEL_URI
 
 LICENSE="Intel-SDP"
+# TODO: Proper slotting
 # Future work, #394411
-#SLOT="${_INTEL_PV1}.${_INTEL_PV2}"
 SLOT="0"
 
 RESTRICT="mirror"
@@ -163,32 +199,128 @@ RESTRICT="mirror"
 RDEPEND=""
 DEPEND="app-arch/rpm2targz"
 
-_INTEL_SDP_YEAR=${INTEL_DPV}
-_INTEL_SDP_YEAR=${_INTEL_SDP_YEAR%_sp*}
-_INTEL_SDP_YEAR=${_INTEL_SDP_YEAR%_update*}
+S="${WORKDIR}"
 
-# @ECLASS-VARIABLE: INTEL_SDP_DIR
+QA_PREBUILT="$(isdp_get-sdp-dir)/*"
+
+# @FUNCTION: isdp_convert2intel-arch
+# @USAGE: <arch>
 # @DESCRIPTION:
-# Full rootless path to installation dir
-INTEL_SDP_DIR="opt/intel/${INTEL_SUBDIR}_${_INTEL_SDP_YEAR:-${_INTEL_PV1}}"
-[[ -n ${_INTEL_PV3} ]] && INTEL_SDP_DIR+=".${_INTEL_PV3}"
-[[ -n ${_INTEL_PV4} ]] && INTEL_SDP_DIR+=".${_INTEL_PV4}"
+# Convert between portage arch (e.g. amd64, x86) and intel installed arch
+# nomenclature (e.g. intel64, ia32)
+isdp_convert2intel-arch() {
+	debug-print-function ${FUNCNAME} "${@}"
 
-# @ECLASS-VARIABLE: INTEL_SDP_EDIR
+	case $1 in
+		*amd64*|abi_x86_64)
+			echo "intel64"
+			;;
+		*x86*)
+			echo "ia32"
+			;;
+		*)
+			die "Abi \'$1\' is unsupported"
+			;;
+	esac
+}
+
+# @FUNCTION: isdp_get-native-abi-arch
 # @DESCRIPTION:
-# Full rooted path to installation dir
-INTEL_SDP_EDIR="${EROOT%/}/${INTEL_SDP_DIR}"
+# Determine the the intel arch string of the native ABI
+isdp_get-native-abi-arch() {
+	debug-print-function ${FUNCNAME} "${@}"
 
-S="${WORKDIR}"
+	use amd64 && echo "$(isdp_convert2intel-arch abi_x86_64)"
+	use x86 && echo "$(isdp_convert2intel-arch abi_x86_32)"
+}
 
-QA_PREBUILT="${INTEL_SDP_DIR}/*"
+# @FUNCTION: isdp_get-sdp-installed-arches
+# @DESCRIPTION:
+# Returns a space separated list of the arch suffixes used in directory
+# names for enabled ABIs. Intel uses "ia32" for x86 and "intel64" for
+# amd64. The result would be "ia32 intel64" if both ABIs were enabled.
+isdp_get-sdp-installed-arches() {
+	local arch=()
+	use abi_x86_64 && arch+=($(isdp_convert2intel-arch abi_x86_64))
+	use abi_x86_32 && arch+=($(isdp_convert2intel-arch abi_x86_32))
+	echo "${arch[*]}"
+}
 
-# @ECLASS-VARIABLE: INTEL_ARCH
-# @DEFAULT_UNSET
+# @FUNCTION: _isdp_get-sdp-source-rpm-arches
+# @INTERNAL
 # @DESCRIPTION:
-# Intels internal names of the arches; will be set at runtime accordingly
+# Returns a space separated list of the arch suffixes used in the RPM filenames, e.g.
 #
-# e.g. amd64-multilib -> INTEL_ARCH="intel64 ia32"
+#    intel-openmp-l-all-150-16.0.1-150.i486.rpm
+#    intel-openmp-l-all-150-16.0.1-150.x86_64.rpm
+#
+# the result would consist of "i486 x86_64".
+_isdp_get-sdp-source-rpm-arches() {
+	local arch=()
+	use abi_x86_64 && arch+=("x86_64")
+	use abi_x86_32 && arch+=("${INTEL_X86}")
+	echo "${arch[*]}"
+}
+
+# @FUNCTION: _isdp_generate-list-install-rpms
+# @INTERNAL
+# @DESCRIPTION:
+# Generates the list of fully expanded RPMs to be extracted.
+_isdp_generate-list-install-rpms() {
+	debug-print-function ${FUNCNAME} "${@}" 
+
+	# Expand components into full RPM filenames
+	expand_component_into_full_rpm() {
+		local deref_var="${1}[@]"
+		local arch="${2}"
+		local p a rpm_prefix rpm_suffix expanded_full_rpms=()
+
+		for p in "${!deref_var}"; do
+			for a in ${arch}; do
+				# check if a directory is prefixed
+				if [[ "${p}" == "${p##*/}" ]]; then
+					rpm_prefix="${INTEL_RPMS_DIR}/intel-"
+				else
+					rpm_prefix=""
+				fi
+
+				# check for variables ending in ".rpm"
+				# these are excluded from version expansion, due to Intel's
+				# idiosyncratic versioning scheme beginning with their 2016
+				# suite of tools. For instance
+				#
+				#     intel-ccompxe-2016.1-056.noarch.rpm
+				#
+				# which is completely unpredictable using versions
+				if [[ "${p}" == *.rpm ]]; then
+					rpm_suffix=""
+				else
+					rpm_suffix="-$(_isdp_get-sdp-full-pv).${a}.rpm"
+				fi
+
+				expanded_full_rpms+=( "${rpm_prefix}${p}${rpm_suffix}" )
+			done
+		done
+		echo ${expanded_full_rpms[*]}
+	}
+
+	local vars_to_expand=("INTEL_DIST_BIN_RPMS" "INTEL_DIST_DAT_RPMS")
+	local vars_to_expand_suffixes=("$(_isdp_get-sdp-source-rpm-arches)" "noarch")
+	if use abi_x86_32; then
+		vars_to_expand+=("INTEL_DIST_X86_RPMS")
+		vars_to_expand_suffixes+=("${INTEL_X86}")
+	fi
+	if use abi_x86_64; then
+		vars_to_expand+=("INTEL_DIST_AMD64_RPMS")
+		vars_to_expand_suffixes+=("x86_64")
+	fi
+
+	local i fully_expanded_intel_rpms=()
+	for ((i=0; i<${#vars_to_expand[@]}; i++)); do
+		fully_expanded_intel_rpms+=($(expand_component_into_full_rpm "${vars_to_expand[i]}" "${vars_to_expand_suffixes[i]}"))
+	done
+	echo ${fully_expanded_intel_rpms[*]}
+}
 
 # @FUNCTION: _isdp_big-warning
 # @USAGE: [pre-check | test-failed]
@@ -200,23 +332,21 @@ _isdp_big-warning() {
 
 	case ${1} in
 		pre-check )
-			echo ""
 			ewarn "License file not found!"
 			;;
 
 		test-failed )
-			echo ""
 			ewarn "Function test failed. Most probably due to an invalid license."
 			ewarn "This means you already tried to bypass the license check once."
 			;;
 	esac
 
-	echo ""
+	ewarn
 	ewarn "Make sure you have received an Intel license."
 	ewarn "To receive a non-commercial license, you need to register at:"
 	ewarn "https://software.intel.com/en-us/qualify-for-free-software"
 	ewarn "Install the license file into ${EPREFIX}/opt/intel/licenses"
-	ewarn ""
+	ewarn
 	ewarn "Beginning with the 2016 suite of tools, license files are keyed"
 	ewarn "to the MAC address of the eth0 interface. In order to retrieve"
 	ewarn "a personalized license file, follow the instructions at"
@@ -225,22 +355,20 @@ _isdp_big-warning() {
 	case ${1} in
 		pre-check )
 			ewarn "before proceeding with installation of ${P}"
-			echo ""
 			;;
 		* )
-			echo ""
 			;;
-			esac
+	esac
 }
 
 # @FUNCTION: _isdp_version_test
 # @INTERNAL
 # @DESCRIPTION:
-# Testing for valid license by asking for version information of the compiler
+# Testing for valid license by asking for version information of the compiler.
 _isdp_version_test() {
 	debug-print-function ${FUNCNAME} "${@}"
 
-	local comp comp_full arch warn
+	local comp
 	case ${PN} in
 		ifc )
 			debug-print "Testing ifort"
@@ -255,39 +383,39 @@ _isdp_version_test() {
 			;;
 	esac
 
-	for arch in ${INTEL_ARCH}; do
+	local comp_full arch warn
+	for arch in $(isdp_get-sdp-installed-arches); do
 		case ${EBUILD_PHASE} in
 			install )
-				comp_full="${ED}/${INTEL_SDP_DIR}/linux/bin/${arch}/${comp}"
+				comp_full="${ED%/}/$(isdp_get-sdp-dir)/linux/bin/${arch}/${comp}"
 				;;
 			postinst )
-				comp_full="${INTEL_SDP_EDIR}/linux/bin/${arch}/${comp}"
+				comp_full="$(isdp_get-sdp-edir)/linux/bin/${arch}/${comp}"
 				;;
 			* )
-				ewarn "Compile test not supported in ${EBUILD_PHASE}"
-				continue
+				die "Compile test not supported in ${EBUILD_PHASE}"
 				;;
 		esac
 
-		debug-print "LD_LIBRARY_PATH=\"${INTEL_SDP_EDIR}/linux/bin/${arch}/\" \"${comp_full}\" -V"
+		debug-print "LD_LIBRARY_PATH=\"$(isdp_get-sdp-edir)/linux/bin/${arch}/\" \"${comp_full}\" -V"
 
-		LD_LIBRARY_PATH="${INTEL_SDP_EDIR}/linux/bin/${arch}/" "${comp_full}" -V &>/dev/null
-		[[ $? -ne 0 ]] && warn=yes
+		LD_LIBRARY_PATH="$(isdp_get-sdp-edir)/linux/bin/${arch}/" "${comp_full}" -V &>/dev/null || warn=yes
 	done
-	[[ "${warn}" == "yes" ]] && _isdp_big-warning test-failed
+	[[ ${warn} == yes ]] && _isdp_big-warning test-failed
 }
 
 # @FUNCTION: _isdp_run-test
 # @INTERNAL
 # @DESCRIPTION:
-# Test if installed compiler is working
+# Test if installed compiler is working.
 _isdp_run-test() {
 	debug-print-function ${FUNCNAME} "${@}"
 
 	if [[ -z ${INTEL_SKIP_LICENSE} ]]; then
 		case ${PN} in
 			ifc | icc )
-				_isdp_version_test ;;
+				_isdp_version_test
+				;;
 			* )
 				debug-print "No test available for ${PN}"
 				;;
@@ -295,33 +423,13 @@ _isdp_run-test() {
 	fi
 }
 
-# @FUNCTION: convert2intel_arch
-# @USAGE: <arch>
-# @DESCRIPTION:
-# Convert between portage arch (e.g. amd64, x86) and intel arch
-# nomenclature (e.g. intel64, ia32)
-convert2intel_arch() {
-	debug-print-function ${FUNCNAME} "${@}"
-
-	case $1 in
-		amd64|abi_x86_64|*amd64*)
-			echo "intel64"
-			;;
-		x86|abi_x86_32|*x86*)
-			echo "ia32"
-			;;
-		*)
-			die "Abi \'$1\' is unsupported"
-			;;
-	esac
-}
-
 # @FUNCTION: intel-sdp-r1_pkg_pretend
 # @DESCRIPTION:
-# @CODE
-# * Check that the user has a (valid) license file before going on.
-# * Check for space requirements being fullfilled
-# @CODE
+#
+# * Check for a (valid) license before proceeding.
+#
+# * Check for space requirements being fulfilled.
+#
 intel-sdp-r1_pkg_pretend() {
 	debug-print-function ${FUNCNAME} "${@}"
 
@@ -331,7 +439,7 @@ intel-sdp-r1_pkg_pretend() {
 	check-reqs_pkg_pretend
 
 	if [[ -z ${INTEL_SKIP_LICENSE} ]]; then
-		if echo ${INTEL_LICENSE_FILE} | grep -q @; then
+		if [[ ${INTEL_LICENSE_FILE} == *@* ]]; then
 			einfo "Looks like you are using following license server:"
 			einfo "   ${INTEL_LICENSE_FILE}"
 			return 0
@@ -339,20 +447,15 @@ intel-sdp-r1_pkg_pretend() {
 
 		dirs=(
 			"${EPREFIX}/opt/intel/licenses"
-			"${INTEL_SDP_EDIR}/licenses"
-			"${INTEL_SDP_EDIR}/Licenses"
+			"$(isdp_get-sdp-edir)/licenses"
+			"$(isdp_get-sdp-edir)/Licenses"
 			)
 		for dir in "${dirs[@]}" ; do
 			ebegin "Checking for a license in: ${dir}"
-			#maybe use nullglob or [[ $(echo ${dir/*lic) != "${dir}/*lic" ]]
-			[[ $( ls "${dir}"/*lic 2>/dev/null ) ]]; ret=$?
-			eend ${ret}
-			if [[ ${ret} == "0" ]]; then
-				warn=${ret}
-				break
-			fi
+			path_exists "${dir}"/*lic && warn=0
+			eend ${warn} && break
 		done
-		if [[ ${warn} == "1" ]]; then
+		if [[ ${warn} == 1 ]]; then
 			_isdp_big-warning pre-check
 			die "Could not find license file"
 		fi
@@ -362,127 +465,29 @@ intel-sdp-r1_pkg_pretend() {
 	fi
 }
 
-# @FUNCTION: intel-sdp-r1_pkg_setup
-# @DESCRIPTION:
-# Setting up and sorting some internal variables
-intel-sdp-r1_pkg_setup() {
-	debug-print-function ${FUNCNAME} "${@}"
-	local arch a p
-
-	INTEL_ARCH=""
-
-	if use abi_x86_64; then
-		arch+=" x86_64"
-		INTEL_ARCH+=" intel64"
-	fi
-	if use abi_x86_32; then
-		arch+=" ${INTEL_X86}"
-		INTEL_ARCH+=" ia32"
-	fi
-	INTEL_RPMS=()
-	INTEL_RPMS_FULL=()
-
-	for p in "${INTEL_BIN_RPMS[@]}"; do
-		for a in ${arch}; do
-			if [ ${p} == $(basename ${p}) ]; then
-				# check for variables ending in ".rpm"
-				# these are excluded from version expansion, due to Intel's
-				# idiosyncratic versioning scheme beginning with their 2016
-				# suite of tools.
-				if [[ "${p}" == *.rpm ]]; then
-					INTEL_RPMS+=( intel-${p} )
-				else
-					INTEL_RPMS+=( intel-${p}-${_INTEL_PV}.${a}.rpm )
-				fi
-			else
-				if [[ "${p}" == *.rpm ]]; then
-					INTEL_RPMS_FULL+=( ${p} )
-				else
-					INTEL_RPMS_FULL+=( ${p}-${_INTEL_PV}.${a}.rpm )
-				fi
-			fi
-		done
-	done
-
-	if use amd64; then
-		for p in "${INTEL_AMD64_RPMS[@]}"; do
-			if [ ${p} == $(basename ${p}) ]; then
-				if [[ "${p}" == *.rpm ]]; then
-					INTEL_RPMS+=( intel-${p} )
-				else
-					INTEL_RPMS+=( intel-${p}-${_INTEL_PV}.x86_64.rpm )
-				fi
-			else
-				if [[ "${p}" == *.rpm ]]; then
-					INTEL_RPMS_FULL+=( ${p} )
-				else
-					INTEL_RPMS_FULL+=( ${p}-${_INTEL_PV}.x86_64.rpm )
-				fi
-			fi
-		done
-	fi
-
-	for p in "${INTEL_X86_RPMS[@]}"; do
-		if [ ${p} == $(basename ${p}) ]; then
-			if [[ "${p}" == *.rpm ]]; then
-				INTEL_RPMS+=( intel-${p} )
-			else
-				INTEL_RPMS+=( intel-${p}-${_INTEL_PV}.${INTEL_X86}.rpm )
-			fi
-		else
-			if [[ "${p}" == *.rpm ]]; then
-				INTEL_RPMS_FULL+=( ${p} )
-			else
-				INTEL_RPMS_FULL+=( ${p}-${_INTEL_PV}.${INTEL_X86}.rpm )
-			fi
-		fi
-	done
-
-	for p in "${INTEL_DAT_RPMS[@]}"; do
-		if [ ${p} == $(basename ${p}) ]; then
-			if [[ "${p}" == *.rpm ]]; then
-				INTEL_RPMS+=( intel-${p} )
-			else
-				INTEL_RPMS+=( intel-${p}-${_INTEL_PV}.noarch.rpm )
-			fi
-		else
-			if [[ "${p}" == *.rpm ]]; then
-				INTEL_RPMS_FULL+=( ${p} )
-			else
-				INTEL_RPMS_FULL+=( ${p}-${_INTEL_PV}.noarch.rpm )
-			fi
-		fi
-	done
-}
-
 # @FUNCTION: intel-sdp-r1_src_unpack
 # @DESCRIPTION:
 # Unpacking necessary rpms from tarball, extract them and rearrange the output.
 intel-sdp-r1_src_unpack() {
-	local l r subdir rb t list=() debug_list
-
+	local t
 	for t in ${A}; do
-		for r in "${INTEL_RPMS[@]}"; do
-			rpmdir=${t%%.*}/${INTEL_RPMS_DIR}
-			list+=( ${rpmdir}/${r} )
-		done
-
-		for r in "${INTEL_RPMS_FULL[@]}"; do
+		local r list=() source_rpms=($(_isdp_generate-list-install-rpms))
+		for r in "${source_rpms[@]}"; do
 			list+=( ${t%%.*}/${r} )
 		done
 
+		local debug_list
 		debug_list="$(IFS=$'\n'; echo ${list[@]} )"
 
 		debug-print "Adding to decompression list:"
 		debug-print ${debug_list}
 
-		tar xvf "${DISTDIR}"/${t} ${list[@]} &> "${T}"/rpm-extraction.log
+		tar -xvf "${DISTDIR}"/${t} ${list[@]} &> "${T}"/rpm-extraction.log
 
 		for r in ${list[@]}; do
-			rb=$(basename ${r})
-			einfo "Unpacking ${rb}"
-			rpm2tar -O ${r} | tar xvf - | sed -e \
-				"s:^\.:${EROOT#/}:g" > /dev/null; assert "unpacking ${r} failed"
+			einfo "Unpacking ${r}"
+			printf "\nUnpacking %s\n" "${r}" >> "${T}"/rpm-extraction.log
+			rpm2tar -O ${r} | tar -xvf - &>> "${T}"/rpm-extraction.log; assert "Unpacking ${r} failed"
 		done
 	done
 }
@@ -493,61 +498,86 @@ intel-sdp-r1_src_unpack() {
 intel-sdp-r1_src_install() {
 	debug-print-function ${FUNCNAME} "${@}"
 
+	local i
 	# remove uninstall information
-	if path_exists opt/intel/"${INTEL_DPN}"*/uninstall; then
-		ebegin "Cleaning out uninstall"
-		rm -r opt/intel/"${INTEL_DPN}"*/uninstall || die
+	ebegin "Cleaning out uninstall"
+	while IFS='\n' read -r -d '' i; do
+		rm -r "${i}" || die
+	done < <(find opt -regextype posix-extended -regex '.*(uninstall|uninstall.sh)$' -print0)
+	eend
+
+	# remove remaining japanese stuff
+	if ! use linguas_ja; then
+		ebegin "Cleaning out japanese language directories"
+		while IFS='\n' read -r -d '' i; do
+			rm -r "${i}" || die
+		done < <(find opt -type d -regextype posix-extended -regex '.*(ja|ja_JP)$' -print0)
 		eend
 	fi
 
 	# handle documentation
-	if path_exists "opt/intel/documentation_${_INTEL_SDP_YEAR}"; then
-		if path_exists "opt/intel/documentation_${_INTEL_SDP_YEAR}/en/man/common/man1"; then
-			doman opt/intel/documentation_"${_INTEL_SDP_YEAR}"/en/man/common/man1/*
-			rm -r opt/intel/documentation_"${_INTEL_SDP_YEAR}"/en/man || die
+	if path_exists "opt/intel/documentation_$(_isdp_get-sdp-year)"; then
+		# normal man pages
+		if path_exists "opt/intel/documentation_$(_isdp_get-sdp-year)/en/man/common/man1"; then
+			doman opt/intel/documentation_"$(_isdp_get-sdp-year)"/en/man/common/man1/*
+			rm -r opt/intel/documentation_"$(_isdp_get-sdp-year)"/en/man || die
 		fi
 
-		if use doc; then
-			if ! use linguas_ja; then
-				rm -r opt/intel/documentation_"${_INTEL_SDP_YEAR}"/ja || die
-			fi
-			dodoc -r opt/intel/documentation_"${_INTEL_SDP_YEAR}"/*
-		fi
+		use doc && dodoc -r opt/intel/documentation_"$(_isdp_get-sdp-year)"/*
 
 		ebegin "Cleaning out documentation"
-		rm -r "opt/intel/documentation_${_INTEL_SDP_YEAR}" || die
-		rm "${INTEL_SDP_DIR}"/linux/{documentation,man} || die
+		rm -r "opt/intel/documentation_$(_isdp_get-sdp-year)" || die
+		rm -rf "$(isdp_get-sdp-dir)"/linux/{documentation,man} || die
 		eend
 	fi
 
+	# MPI man pages
+	if path_exists "$(isdp_get-sdp-dir)/linux/mpi/man/man3"; then
+		doman "$(isdp_get-sdp-dir)"/linux/mpi/man/man3/*
+		rm -r "$(isdp_get-sdp-dir)"/linux/mpi/man || die
+	fi
+
+	# licensing docs
+	if path_exists "$(isdp_get-sdp-dir)/licensing/documentation"; then
+		dodoc -r "$(isdp_get-sdp-dir)/licensing/documentation"/*
+		rm -rf "$(isdp_get-sdp-dir)/licensing/documentation" || die
+	fi
+
+	if path_exists opt/intel/"${INTEL_DIST_NAME}"*/licensing; then
+		dodoc -r opt/intel/"${INTEL_DIST_NAME}"*/licensing
+		rm -rf opt/intel/"${INTEL_DIST_NAME}"* || die
+	fi
+
 	# handle examples
-	if path_exists "opt/intel/samples_${_INTEL_SDP_YEAR}"; then
-		if use examples; then
-			if ! use linguas_ja; then
-				rm -r opt/intel/samples_"${_INTEL_SDP_YEAR}"/ja || die
-			fi
-			dodoc -r opt/intel/samples_"${_INTEL_SDP_YEAR}"/*
-		fi
+	if path_exists "opt/intel/samples_$(_isdp_get-sdp-year)"; then
+		use examples && dodoc -r opt/intel/samples_"$(_isdp_get-sdp-year)"/*
 
 		ebegin "Cleaning out examples"
-		rm -r "opt/intel/samples_${_INTEL_SDP_YEAR}" || die
+		rm -r "opt/intel/samples_$(_isdp_get-sdp-year)" || die
 		eend
 	fi
 
-	# remove eclipse
+	# remove eclipse unconditionally
+	ebegin "Cleaning out eclipse files"
 	rm -rf opt/intel/ide_support_* || die
+	eend
 
+	# repair shell scripts used for sourcing PATH (iccvars.sh and such)
 	ebegin "Tagging ${PN}"
 	find opt -name \*sh -type f -exec sed -i \
-		-e "s:<.*DIR>:${INTEL_SDP_EDIR}/linux:g" \
+		-e "s:<.*DIR>:$(isdp_get-sdp-edir)/linux:g" \
 		'{}' + || die
 	eend
 
-	[[ -d "${ED}" ]] || dodir /
-	mv opt "${ED}"/ || die "moving files failed"
+	ebegin "Removing broken symlinks"
+	while IFS='\n' read -r -d '' i; do
+		rm "${i}" || die
+	done < <(find opt -xtype l -print0)
+	eend
+
+	mv opt "${ED%/}"/ || die "moving files failed"
 
-	dodir "${INTEL_SDP_DIR}"/licenses /opt/intel/ism/rm
-	keepdir "${INTEL_SDP_DIR}"/licenses /opt/intel/ism/rm
+	keepdir "$(isdp_get-sdp-dir)"/licenses /opt/intel/ism/rm
 }
 
 # @FUNCTION: intel-sdp-r1_pkg_postinst
@@ -580,7 +610,5 @@ intel-sdp-r1_pkg_postrm() {
 	fi
 }
 
-EXPORT_FUNCTIONS pkg_setup src_unpack src_install pkg_postinst pkg_postrm pkg_pretend
-
 _INTEL_SDP_R1_ECLASS_=1
 fi