Fix rebase lapack-multibuild to master conflict 2 on sci-libs/lapack-reference

2 files changed, 29 insertions, 5 deletions

diff --git a/sci-libs/lapack-reference/ChangeLog b/sci-libs/lapack-reference/ChangeLog
index 4df95859d..6fbd2eabd 100644
--- a/sci-libs/lapack-reference/ChangeLog
+++ b/sci-libs/lapack-reference/ChangeLog
@@ -11,6 +11,10 @@
   lapack-reference-9999.ebuild:
   Add xblas to the .pc file when it is in use see bug#523388
 
+  26 Apr 2014; Mark Wright <gienah@gentoo.org> lapack-reference-9999.ebuild:
+  Add >=virtual/blas-2.1-r2[int64?] and >=virtual/lapack-3.5-r2[int64?] to
+  RDEPEND. Use separate eselect modules for lapack and lapack-int64.
+
   18 Feb 2014; Mark Wright <gienah@gentoo.org> lapack-reference-9999.ebuild,
   metadata.xml:
   multibuild lapack-reference when USE=int64 and/or USE=static is specified.
diff --git a/sci-libs/lapack-reference/lapack-reference-9999.ebuild b/sci-libs/lapack-reference/lapack-reference-9999.ebuild
index 57d64e503..17f3a042e 100644
--- a/sci-libs/lapack-reference/lapack-reference-9999.ebuild
+++ b/sci-libs/lapack-reference/lapack-reference-9999.ebuild
@@ -31,8 +31,10 @@ SLOT="0"
 IUSE="int64 static-libs test xblas"
 
 RDEPEND="
-	virtual/blas
+	>=virtual/blas-2.1-r1[int64?]
+	>=virtual/lapack-3.5-r2[int64?]
 	xblas? ( sci-libs/xblas[fortran] )"
+
 DEPEND="${RDEPEND}
 	virtual/pkgconfig"
 
@@ -56,10 +58,18 @@ get_variant_suffix() {
 	echo "${variant_suffix}"
 }
 
+get_blas_module() {
+	local module_name="blas"
+	if [[ "${MULTIBUILD_ID}" =~ "_${INT64_SUFFIX}" ]]; then
+		module_name+="-${INT64_SUFFIX}"
+	fi
+	echo "${module_name}"
+}
+
 get_blas_profname() {
 	local profname="${1:-$(get_profname)}"
 	local variant_suffix=$(get_variant_suffix "${profname}")
-	local blas_profile=$(eselect blas show)
+	local blas_profile=$(eselect $(get_blas_module) show)
 	local selected_blas_profile="${blas_profile}"
 	local blas_no_int64="${selected_blas_profile/-int64/}"
 	local blas_base="${blas_no_int64%-*}"
@@ -67,9 +77,18 @@ get_blas_profname() {
 	echo "${blas_name}"
 }
 
+get_lapack_module() {
+	local module_name="lapack"
+	if [[ "${MULTIBUILD_ID}" =~ "_${INT64_SUFFIX}" ]]; then
+		module_name+="-${INT64_SUFFIX}"
+	fi
+	echo "${module_name}"
+}
+
 int64_multilib_get_enabled_abis() {
 	local MULTILIB_VARIANTS=( $(multilib_get_enabled_abis) )
 	local MULTILIB_INT64_VARIANTS=()
+	local i
 	for i in "${MULTILIB_VARIANTS[@]}"; do
 		if use int64 && [[ "${i}" =~ 64$ ]]; then
 			MULTILIB_INT64_VARIANTS+=( "${i}_${INT64_SUFFIX}" )
@@ -77,6 +96,7 @@ int64_multilib_get_enabled_abis() {
 		MULTILIB_INT64_VARIANTS+=( "${i}" )
 	done
 	local MULTIBUILD_VARIANTS=()
+	local j
 	for j in "${MULTILIB_INT64_VARIANTS[@]}"; do
 		use static-libs && MULTIBUILD_VARIANTS+=( "${j}_${STATIC_SUFFIX}" )
 		MULTIBUILD_VARIANTS+=( "${j}" )
@@ -103,7 +123,7 @@ src_prepare() {
 	local MULTIBUILD_VARIANTS=( $(int64_multilib_get_enabled_abis) )
 	if use int64; then
 		local blas_int64_profname=$(get_blas_profname "${BASE_PROFNAME}-${INT64_SUFFIX}")
-		pkg-config --exists "${blas_int64_profname}" || die "Use int64 requires ${blas_int64_profname}"
+		$(tc-getPKG_CONFIG) --exists "${blas_int64_profname}" || die "Use int64 requires ${blas_int64_profname}"
 	fi
 
 	# rename library to avoid collision with other lapack implementations
@@ -200,8 +220,8 @@ src_install() {
 		cmake-utils_src_install
 		if [[ ! "${MULTIBUILD_ID}" =~ "_${STATIC_SUFFIX}" ]]; then
 			local profname=$(get_profname)
-			alternatives_for lapack $(get_profname "reference") 0 \
-				/usr/$(get_libdir)/pkgconfig/lapack.pc ${profname}.pc
+			alternatives_for $(get_lapack_module) $(get_profname "reference") 0 \
+				/usr/$(get_libdir)/pkgconfig/$(get_lapack_module).pc ${profname}.pc
 		fi
 	}
 	multibuild_foreach_variant _int64_multilib_multibuild_wrapper my_src_install