cleaned up profile

2 files changed, 21 insertions, 19 deletions

diff --git a/sci-libs/gotoblas2/Manifest b/sci-libs/gotoblas2/Manifest
index 37ec6a0..d53c4ba 100644
--- a/sci-libs/gotoblas2/Manifest
+++ b/sci-libs/gotoblas2/Manifest
@@ -1,6 +1,6 @@
 AUX gotoblas2-1.13-dynamic.patch 608 RMD160 37947ee4aeeec6db1f32132adf97e802369bdaf0 SHA1 f96cb1d7856b4647857b8dc77aa68ceba1d51107 SHA256 7ff5d3179c3051f41fd2963e90734bd6997dd4d6d955ea4c613ff241f49875c4
 AUX gotoblas2-1.13-sharedlibs.patch 1926 RMD160 2922ebe6e0e05b8844ea89feaea8ff30a0caacb9 SHA1 66ce3c97c91c70b5cb733e02219c2179dd8279f2 SHA256 0802a87e8f5c90ad99a78f1b82f3d85ed474b53b7adcb204c3bc934a9239a64d
 DIST GotoBLAS2-1.13.tar.gz 3179300 RMD160 8a7eec19adc37418b8b9c061d35c22caa1a08344 SHA1 84256329345b834dcfc823da41cf9b3c84726fa4 SHA256 6c30d60a701dacc2e638bb68ac912756f2286af834bf41ebe841310d9258e7cb
-EBUILD gotoblas2-1.13.ebuild 2877 RMD160 f841d4070590d086c5b06fffa93ad96f3beab584 SHA1 ccc90e2d0ddfc8dd55d9c6d53bcf820bff24045e SHA256 1585864875ef97be5998414cb57ed120bbfa9d67af99be697531cdcc63571a47
+EBUILD gotoblas2-1.13.ebuild 2986 RMD160 c1823fa552946b012a6ef3c5ceb354dd5119c78d SHA1 8026db0161a5a84895b1be91d722e18250563737 SHA256 55b410eb93bdeaf68d248cf9713a7586b1f7f4653d566bddb3c46cc244777045
 MISC ChangeLog 343 RMD160 def653a6a8aa7b66b0f6d48f9fdcc628ba8c1cf3 SHA1 3a7390f336886d659b941443b215cef4d5bb47ba SHA256 eaa66440bfd66871308599f9288d5206ceab0a497fc92dac936b3b7220c3f801
 MISC metadata.xml 854 RMD160 4753e75febbea8bdd428a5d37babb43736341ebc SHA1 98b7d5028af44a509516d4579a821a6903e56dfe SHA256 2cb7acbde906d3a23f672d7f5ce98691ee57e1dec464e82ee2ce875a27b1438c
diff --git a/sci-libs/gotoblas2/gotoblas2-1.13.ebuild b/sci-libs/gotoblas2/gotoblas2-1.13.ebuild
index ba657fc..9c2df2c 100644
--- a/sci-libs/gotoblas2/gotoblas2-1.13.ebuild
+++ b/sci-libs/gotoblas2/gotoblas2-1.13.ebuild
@@ -37,6 +37,7 @@ src_prepare() {
 			Makefile.rule || die
 	fi
 	# fix executable stacks
+	local i
 	for i in $(find . -name \*.S); do
 		cat >> ${i} <<-EOF
 			#if defined(__ELF__)
@@ -44,7 +45,6 @@ src_prepare() {
 			#endif
 		EOF
 	done
-	LIBNAME=libgoto2
 }
 
 src_configure() {
@@ -52,8 +52,9 @@ src_configure() {
 	if use amd64 || use alpha || use ppc64 ||  use sparc || use ia64; then
 		bits=64
 	fi
-	GOTO_MAKEFLAGS=( CC=$(tc-getCC) FC=$(tc-getFC) )
-	GOTO_MAKEFLAGS+=(
+	GOTO_MAKEFLAGS=(
+		CC=$(tc-getCC)
+		FC=$(tc-getFC)
 		BINARY=${bits}
 		USE_THREAD=$(use threads && echo 1 || echo 0)
 		USE_OPENMP=$(use openmp && echo 1)
@@ -77,14 +78,15 @@ src_test() {
 }
 
 src_install() {
-	mv $(readlink ${LIBNAME}.so) ${LIBNAME}.so
-	dolib.so ${LIBNAME}.so  || die "installing shared lib failed"
+	local libname=goto2
+	mv $(readlink lib${libname}.so) lib${libname}.so
+	dolib.so lib${libname}.so  || die "installing shared ${libname} failed"
 	if use static-libs; then
-		mv $(readlink ${LIBNAME}.a) ${LIBNAME}.a
-		dolib.a ${LIBNAME}.a || die "installing static lib failed"
+		mv $(readlink lib${libname}.a) lib${libname}.a
+		dolib.a lib${libname}.a || die "installing static ${libname} failed"
 	fi
-	dodoc 01Readme.txt 03FAQ.txt 05LargePage 06WeirdPerformance
-	cat <<-EOF > ${PN}.pc
+	# create pkg-config file and associated eselect file
+	cat <<-EOF > ${libname}.pc
 		prefix="${EPREFIX}"/usr
 		libdir=\${prefix}/$(get_libdir)
 		includedir=\${prefix}/include
@@ -93,23 +95,23 @@ src_install() {
 		Description: ${DESCRIPTION}
 		Version: ${PV}
 		URL: ${HOMEPAGE}
-		Libs: -L\${libdir} -l${LIBNAME}
+		Libs: -L\${libdir} -l${libname}
 	EOF
-	local prof=${PN}
-	echo > eselect.blas.${prof} \
-		"${PN}.pc ${EPREFIX}/usr/$(get_libdir)/pkgconfig/blas.pc"
-	eselect blas add $(get_libdir) eselect.blas.${prof} ${prof}
+	echo > eselect.blas.${libname} \
+		"${libname}.pc ${EPREFIX}/usr/$(get_libdir)/pkgconfig/blas.pc"
+	eselect blas add $(get_libdir) eselect.blas.${libname} ${libname}
 
 	if use cblas; then
 		insinto /usr/include/${PN}
 		doins cblas.h || die
-		echo >> ${PN}.pc "Cflags: -I\${includedir}"
-		cat <<-EOF > eselect.cblas.${PN}
+		echo >> ${libname}.pc "Cflags: -I\${includedir}/${PN}"
+		cat <<-EOF > eselect.cblas.${libname}
 			${PN}.pc "${EPREFIX}"/usr/$(get_libdir)/pkgconfig/cblas.pc
 			${PN}/cblas.h "${EPREFIX}"/usr/include/cblas.h
 		EOF
-		eselect cblas add $(get_libdir) eselect.cblas.${prof} ${prof}
+		eselect cblas add $(get_libdir) eselect.cblas.${libname} ${libname}
 	fi
 	insinto /usr/$(get_libdir)/pkgconfig
-	doins ${PN}.pc
+	doins ${libname}.pc
+	dodoc 01Readme.txt 03FAQ.txt 05LargePage 06WeirdPerformance
 }