From ec07bd6704edd93082d57c41c7edf461e46cbe58 Mon Sep 17 00:00:00 2001
From: Matthias Maier <tamiko@gentoo.org>
Date: Sun, 9 Oct 2016 10:22:44 -0500
Subject: sci-libs/cblas-reference: fix eselect symlnk to pc file

Package-Manager: portage-2.3.0
---
 .../cblas-reference-20151113-r1.ebuild             | 96 ----------------------
 .../cblas-reference-20151113-r2.ebuild             | 96 ++++++++++++++++++++++
 .../files/eselect.cblas.reference-r1               |  8 --
 .../files/eselect.cblas.reference-r2               |  8 ++
 4 files changed, 104 insertions(+), 104 deletions(-)
 delete mode 100644 sci-libs/cblas-reference/cblas-reference-20151113-r1.ebuild
 create mode 100644 sci-libs/cblas-reference/cblas-reference-20151113-r2.ebuild
 delete mode 100644 sci-libs/cblas-reference/files/eselect.cblas.reference-r1
 create mode 100644 sci-libs/cblas-reference/files/eselect.cblas.reference-r2

(limited to 'sci-libs/cblas-reference')

diff --git a/sci-libs/cblas-reference/cblas-reference-20151113-r1.ebuild b/sci-libs/cblas-reference/cblas-reference-20151113-r1.ebuild
deleted file mode 100644
index d9f354723f4..00000000000
--- a/sci-libs/cblas-reference/cblas-reference-20151113-r1.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=6
-
-inherit eutils fortran-2 cmake-utils multilib flag-o-matic toolchain-funcs
-
-LPN=lapack
-LPV=3.6.0
-
-DESCRIPTION="C wrapper interface to the F77 reference BLAS implementation"
-HOMEPAGE="http://www.netlib.org/cblas/"
-SRC_URI="http://www.netlib.org/${LPN}/${LPN}-${LPV}.tgz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos"
-IUSE=""
-
-DEPEND="app-eselect/eselect-cblas
-	>=virtual/blas-3.6
-	virtual/pkgconfig"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${LPN}-${LPV}"
-PATCHES=( "${FILESDIR}/lapack-fix-build-system.patch" )
-
-src_prepare() {
-	epatch "${PATCHES[@]}"
-
-	eapply_user
-
-	ESELECT_PROF=reference
-
-	cp "${FILESDIR}"/eselect.cblas.reference-r1 "${T}"/eselect.cblas.reference || die
-	sed -i -e "s:/usr:${EPREFIX}/usr:" "${T}"/eselect.cblas.reference || die
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		sed -i -e 's/\.so\([\.0-9]\+\)\?/\1.dylib/g' \
-			"${T}"/eselect.cblas.reference || die
-	fi
-
-	sed -i \
-		-e 's:/CMAKE/:/cmake/:g' \
-		CBLAS/CMakeLists.txt || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-Wno-dev
-		-DCBLAS=ON
-		-DUSE_OPTIMIZED_BLAS=ON
-		-DBLAS_LIBRARIES="$($(tc-getPKG_CONFIG) --libs blas)"
-		-DCMAKE_C_FLAGS="$($(tc-getPKG_CONFIG) --cflags blas) ${CFLAGS}"
-		-DCMAKE_Fortran_FLAGS="$($(tc-getPKG_CONFIG) --cflags blas) $(get_abi_CFLAGS) ${FCFLAGS}"
-		-DBUILD_SHARED_LIBS=ON
-		-DBUILD_STATIC_LIBS=ON
-	)
-
-	cmake-utils_src_configure
-}
-
-src_compile() {
-	cmake-utils_src_compile -C CBLAS
-}
-
-src_install() {
-	cmake-utils_src_install -C CBLAS
-
-	mkdir -p "${ED}/usr/$(get_libdir)/blas/reference" || die
-	mv "${ED}/usr/$(get_libdir)"/lib* "${ED}/usr/include"/cblas* \
-		"${ED}/usr/$(get_libdir)/pkgconfig"/* \
-		"${ED}/usr/$(get_libdir)/blas/reference" || die
-
-	rmdir "${ED}/usr/$(get_libdir)/pkgconfig" || die
-	rmdir "${ED}/usr/include" || die
-	rm -rf "${ED}"/usr/lib/ || die
-
-	eselect cblas add $(get_libdir) "${T}"/eselect.cblas.reference ${ESELECT_PROF}
-}
-
-pkg_postinst() {
-	local p=cblas
-	local current_lib=$(eselect ${p} show | cut -d' ' -f2)
-	if [[ ${current_lib} == ${ESELECT_PROF} || -z ${current_lib} ]]; then
-		# work around eselect bug #189942
-		local configfile="${EROOT}"/etc/env.d/${p}/$(get_libdir)/config
-		[[ -e ${configfile} ]] && rm -f ${configfile}
-		eselect ${p} set ${ESELECT_PROF}
-		elog "${p} has been eselected to ${ESELECT_PROF}"
-	else
-		elog "Current eselected ${p} is ${current_lib}"
-		elog "To use ${p} ${ESELECT_PROF} implementation, you have to issue (as root):"
-		elog "\t eselect ${p} set ${ESELECT_PROF}"
-	fi
-}
diff --git a/sci-libs/cblas-reference/cblas-reference-20151113-r2.ebuild b/sci-libs/cblas-reference/cblas-reference-20151113-r2.ebuild
new file mode 100644
index 00000000000..9a1017c7c4b
--- /dev/null
+++ b/sci-libs/cblas-reference/cblas-reference-20151113-r2.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI=6
+
+inherit eutils fortran-2 cmake-utils multilib flag-o-matic toolchain-funcs
+
+LPN=lapack
+LPV=3.6.0
+
+DESCRIPTION="C wrapper interface to the F77 reference BLAS implementation"
+HOMEPAGE="http://www.netlib.org/cblas/"
+SRC_URI="http://www.netlib.org/${LPN}/${LPN}-${LPV}.tgz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos"
+IUSE=""
+
+DEPEND="app-eselect/eselect-cblas
+	>=virtual/blas-3.6
+	virtual/pkgconfig"
+RDEPEND="${DEPEND}"
+
+S="${WORKDIR}/${LPN}-${LPV}"
+PATCHES=( "${FILESDIR}/lapack-fix-build-system.patch" )
+
+src_prepare() {
+	epatch "${PATCHES[@]}"
+
+	eapply_user
+
+	ESELECT_PROF=reference
+
+	cp "${FILESDIR}"/eselect.cblas.reference-r2 "${T}"/eselect.cblas.reference || die
+	sed -i -e "s:/usr:${EPREFIX}/usr:" "${T}"/eselect.cblas.reference || die
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		sed -i -e 's/\.so\([\.0-9]\+\)\?/\1.dylib/g' \
+			"${T}"/eselect.cblas.reference || die
+	fi
+
+	sed -i \
+		-e 's:/CMAKE/:/cmake/:g' \
+		CBLAS/CMakeLists.txt || die
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-Wno-dev
+		-DCBLAS=ON
+		-DUSE_OPTIMIZED_BLAS=ON
+		-DBLAS_LIBRARIES="$($(tc-getPKG_CONFIG) --libs blas)"
+		-DCMAKE_C_FLAGS="$($(tc-getPKG_CONFIG) --cflags blas) ${CFLAGS}"
+		-DCMAKE_Fortran_FLAGS="$($(tc-getPKG_CONFIG) --cflags blas) $(get_abi_CFLAGS) ${FCFLAGS}"
+		-DBUILD_SHARED_LIBS=ON
+		-DBUILD_STATIC_LIBS=ON
+	)
+
+	cmake-utils_src_configure
+}
+
+src_compile() {
+	cmake-utils_src_compile -C CBLAS
+}
+
+src_install() {
+	cmake-utils_src_install -C CBLAS
+
+	mkdir -p "${ED}/usr/$(get_libdir)/blas/reference" || die
+	mv "${ED}/usr/$(get_libdir)"/lib* "${ED}/usr/include"/cblas* \
+		"${ED}/usr/$(get_libdir)/pkgconfig"/* \
+		"${ED}/usr/$(get_libdir)/blas/reference" || die
+
+	rmdir "${ED}/usr/$(get_libdir)/pkgconfig" || die
+	rmdir "${ED}/usr/include" || die
+	rm -rf "${ED}"/usr/lib/ || die
+
+	eselect cblas add $(get_libdir) "${T}"/eselect.cblas.reference ${ESELECT_PROF}
+}
+
+pkg_postinst() {
+	local p=cblas
+	local current_lib=$(eselect ${p} show | cut -d' ' -f2)
+	if [[ ${current_lib} == ${ESELECT_PROF} || -z ${current_lib} ]]; then
+		# work around eselect bug #189942
+		local configfile="${EROOT}"/etc/env.d/${p}/$(get_libdir)/config
+		[[ -e ${configfile} ]] && rm -f ${configfile}
+		eselect ${p} set ${ESELECT_PROF}
+		elog "${p} has been eselected to ${ESELECT_PROF}"
+	else
+		elog "Current eselected ${p} is ${current_lib}"
+		elog "To use ${p} ${ESELECT_PROF} implementation, you have to issue (as root):"
+		elog "\t eselect ${p} set ${ESELECT_PROF}"
+	fi
+}
diff --git a/sci-libs/cblas-reference/files/eselect.cblas.reference-r1 b/sci-libs/cblas-reference/files/eselect.cblas.reference-r1
deleted file mode 100644
index 67aeb212101..00000000000
--- a/sci-libs/cblas-reference/files/eselect.cblas.reference-r1
+++ /dev/null
@@ -1,8 +0,0 @@
-blas/reference/libcblas.so /usr/@LIBDIR@/libcblas.so
-blas/reference/libcblas.so.3 /usr/@LIBDIR@/libcblas.so.3
-blas/reference/libcblas.a /usr/@LIBDIR@/libcblas.a
-../@LIBDIR@/blas/reference/cblas.pc /usr/@LIBDIR@/pkgconfig/cblas.pc
-../@LIBDIR@/blas/reference/cblas_test.h /usr/include/cblas_test.h
-../@LIBDIR@/blas/reference/cblas_mangling.h /usr/include/cblas_mangling.h
-../@LIBDIR@/blas/reference/cblas_f77.h /usr/include/cblas_f77.h
-../@LIBDIR@/blas/reference/cblas.h /usr/include/cblas.h
diff --git a/sci-libs/cblas-reference/files/eselect.cblas.reference-r2 b/sci-libs/cblas-reference/files/eselect.cblas.reference-r2
new file mode 100644
index 00000000000..b02188c8a9d
--- /dev/null
+++ b/sci-libs/cblas-reference/files/eselect.cblas.reference-r2
@@ -0,0 +1,8 @@
+blas/reference/libcblas.so /usr/@LIBDIR@/libcblas.so
+blas/reference/libcblas.so.3 /usr/@LIBDIR@/libcblas.so.3
+blas/reference/libcblas.a /usr/@LIBDIR@/libcblas.a
+../blas/reference/cblas.pc /usr/@LIBDIR@/pkgconfig/cblas.pc
+../@LIBDIR@/blas/reference/cblas_test.h /usr/include/cblas_test.h
+../@LIBDIR@/blas/reference/cblas_mangling.h /usr/include/cblas_mangling.h
+../@LIBDIR@/blas/reference/cblas_f77.h /usr/include/cblas_f77.h
+../@LIBDIR@/blas/reference/cblas.h /usr/include/cblas.h
-- 
cgit v1.2.1