public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] proj/sci:master commit in: sci-libs/plasma/
@ 2012-02-24 18:30 Sebastien Fabbro
  0 siblings, 0 replies; 9+ messages in thread
From: Sebastien Fabbro @ 2012-02-24 18:30 UTC (permalink / raw
  To: gentoo-commits

commit:     005bf052a7f7d8973f628e9033f4223cd2978ee2
Author:     Sébastien Fabbro <sebfabbro <AT> gmail <DOT> com>
AuthorDate: Fri Feb 24 18:30:48 2012 +0000
Commit:     Sebastien Fabbro <bicatali <AT> gentoo <DOT> org>
CommitDate: Fri Feb 24 18:30:48 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=005bf052

sci-libs/plasma: Initial import

(Portage version: 2.1.10.44/git/Linux x86_64, unsigned Manifest commit)

---
 sci-libs/plasma/ChangeLog           |   10 +++
 sci-libs/plasma/metadata.xml        |   12 ++++
 sci-libs/plasma/plasma-2.4.5.ebuild |  105 +++++++++++++++++++++++++++++++++++
 3 files changed, 127 insertions(+), 0 deletions(-)

diff --git a/sci-libs/plasma/ChangeLog b/sci-libs/plasma/ChangeLog
new file mode 100644
index 0000000..3d57fff
--- /dev/null
+++ b/sci-libs/plasma/ChangeLog
@@ -0,0 +1,10 @@
+# ChangeLog for sci-libs/plasma
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: $
+
+*plasma-2.4.5 (24 Feb 2012)
+
+  24 Feb 2012; Sébastien Fabbro <bicatali@gentoo.org> +metadata.xml,
+  +plasma-2.4.5.ebuild:
+  sci-libs/plasma: Initial import
+

diff --git a/sci-libs/plasma/metadata.xml b/sci-libs/plasma/metadata.xml
new file mode 100644
index 0000000..1481be2
--- /dev/null
+++ b/sci-libs/plasma/metadata.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+<herd>sci</herd>
+<longdescription lang="en">
+  The Parallel Linear Algebra for Scalable Multi-core Architectures
+  (PLASMA) project aims to address the critical and highly disruptive
+  situation that is facing the Linear Algebra and High Performance
+  Computing community due to the introduction of multi-core
+  architectures.
+</longdescription>
+</pkgmetadata>

diff --git a/sci-libs/plasma/plasma-2.4.5.ebuild b/sci-libs/plasma/plasma-2.4.5.ebuild
new file mode 100644
index 0000000..e857b2b
--- /dev/null
+++ b/sci-libs/plasma/plasma-2.4.5.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2012 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=4
+inherit eutils fortran-2 toolchain-funcs versionator
+
+MYP=${PN}_${PV}
+
+DESCRIPTION="Parallel Linear Algebra for Scalable Multi-core Architecture"
+HOMEPAGE="http://icl.cs.utk.edu/plasma/"
+SRC_URI="http://icl.cs.utk.edu/projectsfiles/plasma/pubs/${MYP}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="doc examples fortran static-libs"
+
+RDEPEND="sys-apps/hwloc
+	virtual/blas
+	virtual/cblas
+	virtual/lapack
+	virtual/lapacke"
+
+DEPEND="${RDEPEND}
+	dev-util/pkgconfig"
+
+S="${WORKDIR}/${MYP}"
+
+make_shared_lib() {
+	local libstatic=${1}
+	local soname=$(basename "${1%.a}").so.$(get_major_version)
+	shift
+	einfo "Making ${soname}"
+	${LINK:-$(tc-getCC)} ${LDFLAGS}  \
+		-shared -Wl,-soname="${soname}" \
+		-Wl,--whole-archive "${libstatic}" -Wl,--no-whole-archive \
+		"$@" -o $(dirname "${libstatic}")/"${soname}" \
+		|| die "${soname} failed"
+	ln -s "${soname}" $(dirname "${libstatic}")/"${soname%.*}"
+}
+
+src_prepare() {
+	# distributed pc file not so useful
+	cat <<-EOF > ${PN}.pc
+		prefix=${EPREFIX}/usr
+		libdir=\${prefix}/$(get_libdir)
+		includedir=\${prefix}/include/${PN}
+		Name: ${PN}
+		Description: ${DESCRIPTION}
+		Version: ${PV}
+		URL: ${HOMEPAGE}
+		Libs: -L\${libdir} -lplasma -lcoreblas -lquark
+		Libs.private: -lm
+		Cflags: -I\${includedir}
+		Requires: blas cblas lapack lapacke hwloc
+	EOF
+}
+
+src_configure() {
+	cat <<-EOF > make.inc
+		ARCH = $(tc-getAR)
+		ARCHFLAGS = cr
+		RANLIB = $(tc-getRANLIB)
+		CC = $(tc-getCC)
+		FC = $(tc-getFC)
+		CFLAGS = ${CFLAGS} -DADD_ -fPIC
+		FFLAGS = ${FFLAGS} -fPIC
+		LOADER = $(tc-getFC)
+		LIBBLAS = $(pkg-config --libs blas)
+		LIBCBLAS = $(pkg-config --libs cblas)
+		LIBLAPACK = $(pkg-config --libs lapack)
+		LIBCLAPACK = $(pkg-config --libs lapacke)
+	EOF
+	use fortran && echo >> make.inc "PLASMA_F90 = 1"
+}
+
+src_compile() {
+	emake lib
+	make_shared_lib lib/libcoreblas.a
+	make_shared_lib lib/libplasma.a
+	make_shared_lib quark/libquark.a
+	if use static-libs; then
+		emake cleanall
+		sed 's/-fPIC//g' make.inc
+		emake lib
+	fi
+}
+
+src_install() {
+	dolib.so lib/lib*.so* quark/libquark.so*
+	use static-libs && dolib.a lib/lib*.a quark/libquark.a
+	insinto /usr/include/plasma
+	doins quark/quark{,_unpack_args}.h quark/icl_{hash,list}.h include/*.h
+	use fortran && doins include/*.mod
+	insinto /usr/$(get_libdir)/pkgconfig
+	doins plasma.pc
+	dodoc README ToDo ReleaseNotes
+	use doc && dodoc docs/pdf/*.pdf && dohtml docs/doxygen/out/html/*
+	if use examples; then
+		emake -C examples cleanall
+		insinto /usr/share/doc/${PF}
+		doins -r examples
+	fi
+}



^ permalink raw reply related	[flat|nested] 9+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-libs/plasma/
@ 2012-02-24 19:17 Sebastien Fabbro
  0 siblings, 0 replies; 9+ messages in thread
From: Sebastien Fabbro @ 2012-02-24 19:17 UTC (permalink / raw
  To: gentoo-commits

commit:     09483fa76909ab19782a24c2b05b2eebdc253917
Author:     Sébastien Fabbro <sebfabbro <AT> gmail <DOT> com>
AuthorDate: Fri Feb 24 19:15:48 2012 +0000
Commit:     Sebastien Fabbro <bicatali <AT> gentoo <DOT> org>
CommitDate: Fri Feb 24 19:15:48 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=09483fa7

sci-libs/plasma: fixed some as-needed issues

(Portage version: 2.1.10.44/git/Linux x86_64, unsigned Manifest commit)

---
 sci-libs/plasma/ChangeLog           |    3 +++
 sci-libs/plasma/plasma-2.4.5.ebuild |   12 ++++++------
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/sci-libs/plasma/ChangeLog b/sci-libs/plasma/ChangeLog
index 3d57fff..83d8ace 100644
--- a/sci-libs/plasma/ChangeLog
+++ b/sci-libs/plasma/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  24 Feb 2012; Sébastien Fabbro <bicatali@gentoo.org> plasma-2.4.5.ebuild:
+  fixed some as-needed issues
+
 *plasma-2.4.5 (24 Feb 2012)
 
   24 Feb 2012; Sébastien Fabbro <bicatali@gentoo.org> +metadata.xml,

diff --git a/sci-libs/plasma/plasma-2.4.5.ebuild b/sci-libs/plasma/plasma-2.4.5.ebuild
index e857b2b..94b3031 100644
--- a/sci-libs/plasma/plasma-2.4.5.ebuild
+++ b/sci-libs/plasma/plasma-2.4.5.ebuild
@@ -71,15 +71,15 @@ src_configure() {
 		LIBCBLAS = $(pkg-config --libs cblas)
 		LIBLAPACK = $(pkg-config --libs lapack)
 		LIBCLAPACK = $(pkg-config --libs lapacke)
+		$(use fortran && echo "PLASMA_F90 = 1")
 	EOF
-	use fortran && echo >> make.inc "PLASMA_F90 = 1"
 }
 
 src_compile() {
 	emake lib
-	make_shared_lib lib/libcoreblas.a
-	make_shared_lib lib/libplasma.a
-	make_shared_lib quark/libquark.a
+	make_shared_lib quark/libquark.a $(pkg-config --libs hwloc) -pthread
+	make_shared_lib lib/libcoreblas.a quark/libquark.so $(pkg-config --libs cblas lapacke)
+	make_shared_lib lib/libplasma.a quark/libquark.so lib/libcoreblas.so
 	if use static-libs; then
 		emake cleanall
 		sed 's/-fPIC//g' make.inc
@@ -90,11 +90,11 @@ src_compile() {
 src_install() {
 	dolib.so lib/lib*.so* quark/libquark.so*
 	use static-libs && dolib.a lib/lib*.a quark/libquark.a
-	insinto /usr/include/plasma
+	insinto /usr/include/${PN}
 	doins quark/quark{,_unpack_args}.h quark/icl_{hash,list}.h include/*.h
 	use fortran && doins include/*.mod
 	insinto /usr/$(get_libdir)/pkgconfig
-	doins plasma.pc
+	doins ${PN}.pc
 	dodoc README ToDo ReleaseNotes
 	use doc && dodoc docs/pdf/*.pdf && dohtml docs/doxygen/out/html/*
 	if use examples; then



^ permalink raw reply related	[flat|nested] 9+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-libs/plasma/
@ 2012-07-12 20:43 Sebastien Fabbro
  0 siblings, 0 replies; 9+ messages in thread
From: Sebastien Fabbro @ 2012-07-12 20:43 UTC (permalink / raw
  To: gentoo-commits

commit:     b24e7ede660001ee114a524cbfb5202e3be5b130
Author:     Sebastien Fabbro <sfabbro <AT> uvic <DOT> ca>
AuthorDate: Thu Jul 12 18:49:23 2012 +0000
Commit:     Sebastien Fabbro <bicatali <AT> gentoo <DOT> org>
CommitDate: Thu Jul 12 18:49:23 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=b24e7ede

sci-libs/plasma: Shared library fixes and prefix love

(Portage version: 2.2.01.20757-prefix/git/Linux x86_64, RepoMan options: --force, unsigned Manifest commit)

---
 sci-libs/plasma/ChangeLog           |    4 ++-
 sci-libs/plasma/plasma-2.4.5.ebuild |   47 +++++++++++++++++++++-------------
 2 files changed, 32 insertions(+), 19 deletions(-)

diff --git a/sci-libs/plasma/ChangeLog b/sci-libs/plasma/ChangeLog
index 83d8ace..38a82a6 100644
--- a/sci-libs/plasma/ChangeLog
+++ b/sci-libs/plasma/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  12 Jul 2012; Sébastien Fabbro <bicatali@gentoo.org> plasma-2.4.5.ebuild:
+  sci-libs/plasma: Shared library fixes and prefix love
+
   24 Feb 2012; Sébastien Fabbro <bicatali@gentoo.org> plasma-2.4.5.ebuild:
   fixed some as-needed issues
 
@@ -10,4 +13,3 @@
   24 Feb 2012; Sébastien Fabbro <bicatali@gentoo.org> +metadata.xml,
   +plasma-2.4.5.ebuild:
   sci-libs/plasma: Initial import
-

diff --git a/sci-libs/plasma/plasma-2.4.5.ebuild b/sci-libs/plasma/plasma-2.4.5.ebuild
index 94b3031..c5b2181 100644
--- a/sci-libs/plasma/plasma-2.4.5.ebuild
+++ b/sci-libs/plasma/plasma-2.4.5.ebuild
@@ -3,7 +3,7 @@
 # $Header: $
 
 EAPI=4
-inherit eutils fortran-2 toolchain-funcs versionator
+inherit eutils fortran-2 toolchain-funcs versionator multilib
 
 MYP=${PN}_${PV}
 
@@ -13,31 +13,42 @@ SRC_URI="http://icl.cs.utk.edu/projectsfiles/plasma/pubs/${MYP}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
 IUSE="doc examples fortran static-libs"
 
 RDEPEND="sys-apps/hwloc
 	virtual/blas
 	virtual/cblas
+	virtual/fortran
 	virtual/lapack
 	virtual/lapacke"
 
 DEPEND="${RDEPEND}
-	dev-util/pkgconfig"
+	virtual/pkgconfig"
 
 S="${WORKDIR}/${MYP}"
 
-make_shared_lib() {
-	local libstatic=${1}
-	local soname=$(basename "${1%.a}").so.$(get_major_version)
-	shift
-	einfo "Making ${soname}"
-	${LINK:-$(tc-getCC)} ${LDFLAGS}  \
-		-shared -Wl,-soname="${soname}" \
-		-Wl,--whole-archive "${libstatic}" -Wl,--no-whole-archive \
-		"$@" -o $(dirname "${libstatic}")/"${soname}" \
-		|| die "${soname} failed"
-	ln -s "${soname}" $(dirname "${libstatic}")/"${soname%.*}"
+static_to_shared() {
+	local libstatic=${1}; shift
+	local libname=$(basename ${libstatic%.a})
+	local soname=${libname}$(get_libname $(get_version_component_range 1-2))
+	local libdir=$(dirname ${libstatic})
+
+	einfo "Making ${soname} from ${libstatic}"
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		${LINK:-$(tc-getCC)} ${LDFLAGS}  \
+			-dynamiclib -install_name "${EPREFIX}"/usr/lib/"${soname}" \
+			-Wl,-all_load -Wl,${libstatic} \
+			"$@" -o ${libdir}/${soname} || die "${soname} failed"
+	else
+		${LINK:-$(tc-getCC)} ${LDFLAGS}  \
+			-shared -Wl,-soname=${soname} \
+			-Wl,--whole-archive ${libstatic} -Wl,--no-whole-archive \
+			"$@" -o ${libdir}/${soname} || die "${soname} failed"
+		[[ $(get_version_component_count) -gt 1 ]] && \
+			ln -s ${soname} ${libdir}/${libname}$(get_libname $(get_major_version))
+		ln -s ${soname} ${libdir}/${libname}$(get_libname)
+	fi
 }
 
 src_prepare() {
@@ -77,9 +88,9 @@ src_configure() {
 
 src_compile() {
 	emake lib
-	make_shared_lib quark/libquark.a $(pkg-config --libs hwloc) -pthread
-	make_shared_lib lib/libcoreblas.a quark/libquark.so $(pkg-config --libs cblas lapacke)
-	make_shared_lib lib/libplasma.a quark/libquark.so lib/libcoreblas.so
+	static_to_shared quark/libquark.a $(pkg-config --libs hwloc) -pthread
+	static_to_shared lib/libcoreblas.a quark/libquark.so $(pkg-config --libs cblas lapacke)
+	static_to_shared lib/libplasma.a quark/libquark.so lib/libcoreblas.so
 	if use static-libs; then
 		emake cleanall
 		sed 's/-fPIC//g' make.inc
@@ -88,7 +99,7 @@ src_compile() {
 }
 
 src_install() {
-	dolib.so lib/lib*.so* quark/libquark.so*
+	dolib.so lib/lib*$(get_libname)* quark/libquark$(get_libname)*
 	use static-libs && dolib.a lib/lib*.a quark/libquark.a
 	insinto /usr/include/${PN}
 	doins quark/quark{,_unpack_args}.h quark/icl_{hash,list}.h include/*.h



^ permalink raw reply related	[flat|nested] 9+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-libs/plasma/
@ 2012-11-29  0:06 Sebastien Fabbro
  0 siblings, 0 replies; 9+ messages in thread
From: Sebastien Fabbro @ 2012-11-29  0:06 UTC (permalink / raw
  To: gentoo-commits

commit:     cad4671a480d2cfdebbb33d9d5b6dc954506a195
Author:     Sébastien Fabbro <bicatali <AT> gentoo <DOT> org>
AuthorDate: Thu Nov 29 00:04:49 2012 +0000
Commit:     Sebastien Fabbro <bicatali <AT> gentoo <DOT> org>
CommitDate: Thu Nov 29 00:04:49 2012 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=cad4671a

sci-libs/plasma: Version bump. Introduce testing

Package-Manager: portage-2.2.01.21313-prefix

---
 sci-libs/plasma/ChangeLog                          |    6 ++++
 .../{plasma-2.4.5.ebuild => plasma-2.4.6.ebuild}   |   31 +++++++++++++-------
 2 files changed, 26 insertions(+), 11 deletions(-)

diff --git a/sci-libs/plasma/ChangeLog b/sci-libs/plasma/ChangeLog
index 38a82a6..b0003dc 100644
--- a/sci-libs/plasma/ChangeLog
+++ b/sci-libs/plasma/ChangeLog
@@ -2,6 +2,12 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*plasma-2.4.6 (29 Nov 2012)
+
+  29 Nov 2012; Sébastien Fabbro <bicatali@gentoo.org> +plasma-2.4.6.ebuild,
+  -plasma-2.4.5.ebuild:
+  sci-libs/plasma: Version bump. Introduce testing
+
   12 Jul 2012; Sébastien Fabbro <bicatali@gentoo.org> plasma-2.4.5.ebuild:
   sci-libs/plasma: Shared library fixes and prefix love
 

diff --git a/sci-libs/plasma/plasma-2.4.5.ebuild b/sci-libs/plasma/plasma-2.4.6.ebuild
similarity index 78%
rename from sci-libs/plasma/plasma-2.4.5.ebuild
rename to sci-libs/plasma/plasma-2.4.6.ebuild
index c5b2181..e3bd016 100644
--- a/sci-libs/plasma/plasma-2.4.5.ebuild
+++ b/sci-libs/plasma/plasma-2.4.6.ebuild
@@ -14,20 +14,23 @@ SRC_URI="http://icl.cs.utk.edu/projectsfiles/plasma/pubs/${MYP}.tar.gz"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc examples fortran static-libs"
+IUSE="doc examples fortran static-libs test"
 
-RDEPEND="sys-apps/hwloc
+RDEPEND="
+	sys-apps/hwloc
 	virtual/blas
 	virtual/cblas
-	virtual/fortran
 	virtual/lapack
 	virtual/lapacke"
-
 DEPEND="${RDEPEND}
-	virtual/pkgconfig"
+	virtual/pkgconfig
+	test? ( sci-libs/lapacke-reference[tmg] )"
 
 S="${WORKDIR}/${MYP}"
 
+# TODO: virtual/{blas,cblas,lapack} serial and threaded. plasma works properly
+# with serial blas/lapack (see README). not doable dynamically with atlas
+
 static_to_shared() {
 	local libstatic=${1}; shift
 	local libname=$(basename ${libstatic%.a})
@@ -78,18 +81,18 @@ src_configure() {
 		CFLAGS = ${CFLAGS} -DADD_ -fPIC
 		FFLAGS = ${FFLAGS} -fPIC
 		LOADER = $(tc-getFC)
-		LIBBLAS = $(pkg-config --libs blas)
-		LIBCBLAS = $(pkg-config --libs cblas)
-		LIBLAPACK = $(pkg-config --libs lapack)
-		LIBCLAPACK = $(pkg-config --libs lapacke)
+		LIBBLAS = $($(tc-getPKG_CONFIG) --libs blas)
+		LIBCBLAS = $($(tc-getPKG_CONFIG) --libs cblas)
+		LIBLAPACK = $($(tc-getPKG_CONFIG) --libs lapack)
+		LIBCLAPACK = $($(tc-getPKG_CONFIG) --libs lapacke)
 		$(use fortran && echo "PLASMA_F90 = 1")
 	EOF
 }
 
 src_compile() {
 	emake lib
-	static_to_shared quark/libquark.a $(pkg-config --libs hwloc) -pthread
-	static_to_shared lib/libcoreblas.a quark/libquark.so $(pkg-config --libs cblas lapacke)
+	static_to_shared quark/libquark.a $($(tc-getPKG_CONFIG --libs hwloc)) -pthread
+	static_to_shared lib/libcoreblas.a quark/libquark.so $($(tc-getPKG_CONFIG --libs cblas lapacke))
 	static_to_shared lib/libplasma.a quark/libquark.so lib/libcoreblas.so
 	if use static-libs; then
 		emake cleanall
@@ -98,6 +101,12 @@ src_compile() {
 	fi
 }
 
+src_test() {
+	emake test
+	cd testing
+	LD_LIBRARY_PATH="../lib:../quark:${LD_LIBRARY_PATH}" ./plasma_testing.py || die
+}
+
 src_install() {
 	dolib.so lib/lib*$(get_libname)* quark/libquark$(get_libname)*
 	use static-libs && dolib.a lib/lib*.a quark/libquark.a


^ permalink raw reply related	[flat|nested] 9+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-libs/plasma/
@ 2013-07-12 17:37 Sebastien Fabbro
  0 siblings, 0 replies; 9+ messages in thread
From: Sebastien Fabbro @ 2013-07-12 17:37 UTC (permalink / raw
  To: gentoo-commits

commit:     8b2f24d9cce966fdae065f37c2239ce4e4b0a4f0
Author:     Sébastien Fabbro <bicatali <AT> gentoo <DOT> org>
AuthorDate: Fri Jul 12 17:35:34 2013 +0000
Commit:     Sebastien Fabbro <bicatali <AT> gentoo <DOT> org>
CommitDate: Fri Jul 12 17:35:34 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=8b2f24d9

sci-libs/plasma: Version bump. Avoid collision with KDE plasma (github issue #34)

Package-Manager: portage-2.2.01.22124-prefix

---
 sci-libs/plasma/ChangeLog           |   8 ++-
 sci-libs/plasma/plasma-2.5.1.ebuild | 134 ++++++++++++++++++++++++++++++++++++
 2 files changed, 141 insertions(+), 1 deletion(-)

diff --git a/sci-libs/plasma/ChangeLog b/sci-libs/plasma/ChangeLog
index b0003dc..63aa673 100644
--- a/sci-libs/plasma/ChangeLog
+++ b/sci-libs/plasma/ChangeLog
@@ -1,7 +1,13 @@
 # ChangeLog for sci-libs/plasma
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*plasma-2.5.1 (12 Jul 2013)
+
+  12 Jul 2013; Sébastien Fabbro <bicatali@gentoo.org> +plasma-2.5.1.ebuild:
+  sci-libs/plasma: Version bump. Avoid collision with KDE plasma (github issue
+  #34)
+
 *plasma-2.4.6 (29 Nov 2012)
 
   29 Nov 2012; Sébastien Fabbro <bicatali@gentoo.org> +plasma-2.4.6.ebuild,

diff --git a/sci-libs/plasma/plasma-2.5.1.ebuild b/sci-libs/plasma/plasma-2.5.1.ebuild
new file mode 100644
index 0000000..5609c24
--- /dev/null
+++ b/sci-libs/plasma/plasma-2.5.1.ebuild
@@ -0,0 +1,134 @@
+# Copyright 1999-2013 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+inherit eutils fortran-2 toolchain-funcs versionator multilib
+
+MYP=${PN}_${PV}
+
+DESCRIPTION="Parallel Linear Algebra for Scalable Multi-core Architecture"
+HOMEPAGE="http://icl.cs.utk.edu/plasma/"
+SRC_URI="http://icl.cs.utk.edu/projectsfiles/plasma/pubs/${MYP}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc examples fortran static-libs test"
+
+RDEPEND="
+	sys-apps/hwloc
+	virtual/blas
+	virtual/cblas
+	virtual/lapack
+	virtual/lapacke"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	test? ( sci-libs/lapacke-reference[tmg] )"
+
+S="${WORKDIR}/${MYP}"
+
+# TODO: virtual/{blas,cblas,lapack} serial and threaded. plasma works properly
+# with serial blas/lapack (see README). not doable dynamically with atlas
+
+static_to_shared() {
+	local libstatic=${1}; shift
+	local libname=$(basename ${libstatic%.a})
+	local soname=${libname}$(get_libname $(get_version_component_range 1-2))
+	local libdir=$(dirname ${libstatic})
+
+	einfo "Making ${soname} from ${libstatic}"
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		${LINK:-$(tc-getCC)} ${LDFLAGS}  \
+			-dynamiclib -install_name "${EPREFIX}"/usr/lib/"${soname}" \
+			-Wl,-all_load -Wl,${libstatic} \
+			"$@" -o ${libdir}/${soname} || die "${soname} failed"
+	else
+		${LINK:-$(tc-getCC)} ${LDFLAGS}  \
+			-shared -Wl,-soname=${soname} \
+			-Wl,--whole-archive ${libstatic} -Wl,--no-whole-archive \
+			"$@" -o ${libdir}/${soname} || die "${soname} failed"
+		[[ $(get_version_component_count) -gt 1 ]] && \
+			ln -s ${soname} ${libdir}/${libname}$(get_libname $(get_major_version))
+		ln -s ${soname} ${libdir}/${libname}$(get_libname)
+	fi
+}
+
+src_prepare() {
+	# distributed pc file not so useful
+	cat <<-EOF > ${PN}.pc
+		prefix=${EPREFIX}/usr
+		libdir=\${prefix}/$(get_libdir)
+		includedir=\${prefix}/include/${PN}
+		Name: ${PN}
+		Description: ${DESCRIPTION}
+		Version: ${PV}
+		URL: ${HOMEPAGE}
+		Libs: -L\${libdir} -lplasmca -lcoreblas -lquark
+		Libs.private: -lm
+		Cflags: -I\${includedir}
+		Requires: blas cblas lapack lapacke hwloc
+	EOF
+}
+
+src_configure() {
+	cat <<-EOF > make.inc
+		ARCH = $(tc-getAR)
+		ARCHFLAGS = cr
+		RANLIB = $(tc-getRANLIB)
+		CC = $(tc-getCC)
+		FC = $(tc-getFC)
+		CFLAGS = ${CFLAGS} -DADD_ -fPIC
+		FFLAGS = ${FFLAGS} -fPIC
+		LOADER = $(tc-getFC)
+		LIBBLAS = $($(tc-getPKG_CONFIG) --libs blas)
+		LIBCBLAS = $($(tc-getPKG_CONFIG) --libs cblas)
+		LIBLAPACK = $($(tc-getPKG_CONFIG) --libs lapack)
+		LIBCLAPACK = $($(tc-getPKG_CONFIG) --libs lapacke)
+		$(use fortran && echo "PLASMA_F90 = 1")
+	EOF
+}
+
+src_compile() {
+	emake lib
+	# rename plasma to avoid collision (https://github.com/gentoo-science/sci/issues/34)
+	mv lib/libplasm{,c}a.a || die
+	static_to_shared quark/libquark.a $($(tc-getPKG_CONFIG --libs hwloc)) -pthread
+	static_to_shared lib/libcoreblas.a quark/libquark.so $($(tc-getPKG_CONFIG --libs cblas lapacke))
+	static_to_shared lib/libplasmca.a quark/libquark.so lib/libcoreblas.so
+	if use static-libs; then
+		emake cleanall
+		sed 's/-fPIC//g' make.inc
+		emake lib
+	fi
+}
+
+src_test() {
+	emake test
+	cd testing
+	LD_LIBRARY_PATH="../lib:../quark:${LD_LIBRARY_PATH}" ./plasma_testing.py || die
+}
+
+src_install() {
+	dolib.so lib/lib*$(get_libname)* quark/libquark$(get_libname)*
+	use static-libs && dolib.a lib/lib*.a quark/libquark.a
+	insinto /usr/include/${PN}
+	doins quark/quark{,_unpack_args}.h quark/icl_{hash,list}.h include/*.h
+	use fortran && doins include/*.mod
+	insinto /usr/$(get_libdir)/pkgconfig
+	doins ${PN}.pc
+	dodoc README ToDo ReleaseNotes
+	use doc && dodoc docs/pdf/*.pdf && dohtml docs/doxygen/out/html/*
+	if use examples; then
+		emake -C examples cleanall
+		insinto /usr/share/doc/${PF}
+		doins -r examples
+	fi
+}
+
+pkg_postinst() {
+	elog "The plasma linear algebra library has been renamed plasmca"
+	elog "to avoid collision with KDE plasma."
+	elog "Compile and link your programs using the following command:"
+	elog "     pkg-config --cflags --libs plasma"
+}


^ permalink raw reply related	[flat|nested] 9+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-libs/plasma/
@ 2014-01-28 19:01 Sebastien Fabbro
  0 siblings, 0 replies; 9+ messages in thread
From: Sebastien Fabbro @ 2014-01-28 19:01 UTC (permalink / raw
  To: gentoo-commits

commit:     5f7e68e99c5a706b64fd00d7dfc0f55261c58905
Author:     Sébastien Fabbro <bicatali <AT> gentoo <DOT> org>
AuthorDate: Mon Dec  9 17:24:10 2013 +0000
Commit:     Sebastien Fabbro <bicatali <AT> gentoo <DOT> org>
CommitDate: Mon Dec  9 17:24:10 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=5f7e68e9

fixed src_prepare for reflapacke

---
 sci-libs/plasma/plasma-2.4.6.ebuild                | 125 ---------------------
 .../{plasma-2.5.1.ebuild => plasma-2.5.2.ebuild}   |   0
 2 files changed, 125 deletions(-)

diff --git a/sci-libs/plasma/plasma-2.4.6.ebuild b/sci-libs/plasma/plasma-2.4.6.ebuild
deleted file mode 100644
index e3bd016..0000000
--- a/sci-libs/plasma/plasma-2.4.6.ebuild
+++ /dev/null
@@ -1,125 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=4
-inherit eutils fortran-2 toolchain-funcs versionator multilib
-
-MYP=${PN}_${PV}
-
-DESCRIPTION="Parallel Linear Algebra for Scalable Multi-core Architecture"
-HOMEPAGE="http://icl.cs.utk.edu/plasma/"
-SRC_URI="http://icl.cs.utk.edu/projectsfiles/plasma/pubs/${MYP}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc examples fortran static-libs test"
-
-RDEPEND="
-	sys-apps/hwloc
-	virtual/blas
-	virtual/cblas
-	virtual/lapack
-	virtual/lapacke"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	test? ( sci-libs/lapacke-reference[tmg] )"
-
-S="${WORKDIR}/${MYP}"
-
-# TODO: virtual/{blas,cblas,lapack} serial and threaded. plasma works properly
-# with serial blas/lapack (see README). not doable dynamically with atlas
-
-static_to_shared() {
-	local libstatic=${1}; shift
-	local libname=$(basename ${libstatic%.a})
-	local soname=${libname}$(get_libname $(get_version_component_range 1-2))
-	local libdir=$(dirname ${libstatic})
-
-	einfo "Making ${soname} from ${libstatic}"
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		${LINK:-$(tc-getCC)} ${LDFLAGS}  \
-			-dynamiclib -install_name "${EPREFIX}"/usr/lib/"${soname}" \
-			-Wl,-all_load -Wl,${libstatic} \
-			"$@" -o ${libdir}/${soname} || die "${soname} failed"
-	else
-		${LINK:-$(tc-getCC)} ${LDFLAGS}  \
-			-shared -Wl,-soname=${soname} \
-			-Wl,--whole-archive ${libstatic} -Wl,--no-whole-archive \
-			"$@" -o ${libdir}/${soname} || die "${soname} failed"
-		[[ $(get_version_component_count) -gt 1 ]] && \
-			ln -s ${soname} ${libdir}/${libname}$(get_libname $(get_major_version))
-		ln -s ${soname} ${libdir}/${libname}$(get_libname)
-	fi
-}
-
-src_prepare() {
-	# distributed pc file not so useful
-	cat <<-EOF > ${PN}.pc
-		prefix=${EPREFIX}/usr
-		libdir=\${prefix}/$(get_libdir)
-		includedir=\${prefix}/include/${PN}
-		Name: ${PN}
-		Description: ${DESCRIPTION}
-		Version: ${PV}
-		URL: ${HOMEPAGE}
-		Libs: -L\${libdir} -lplasma -lcoreblas -lquark
-		Libs.private: -lm
-		Cflags: -I\${includedir}
-		Requires: blas cblas lapack lapacke hwloc
-	EOF
-}
-
-src_configure() {
-	cat <<-EOF > make.inc
-		ARCH = $(tc-getAR)
-		ARCHFLAGS = cr
-		RANLIB = $(tc-getRANLIB)
-		CC = $(tc-getCC)
-		FC = $(tc-getFC)
-		CFLAGS = ${CFLAGS} -DADD_ -fPIC
-		FFLAGS = ${FFLAGS} -fPIC
-		LOADER = $(tc-getFC)
-		LIBBLAS = $($(tc-getPKG_CONFIG) --libs blas)
-		LIBCBLAS = $($(tc-getPKG_CONFIG) --libs cblas)
-		LIBLAPACK = $($(tc-getPKG_CONFIG) --libs lapack)
-		LIBCLAPACK = $($(tc-getPKG_CONFIG) --libs lapacke)
-		$(use fortran && echo "PLASMA_F90 = 1")
-	EOF
-}
-
-src_compile() {
-	emake lib
-	static_to_shared quark/libquark.a $($(tc-getPKG_CONFIG --libs hwloc)) -pthread
-	static_to_shared lib/libcoreblas.a quark/libquark.so $($(tc-getPKG_CONFIG --libs cblas lapacke))
-	static_to_shared lib/libplasma.a quark/libquark.so lib/libcoreblas.so
-	if use static-libs; then
-		emake cleanall
-		sed 's/-fPIC//g' make.inc
-		emake lib
-	fi
-}
-
-src_test() {
-	emake test
-	cd testing
-	LD_LIBRARY_PATH="../lib:../quark:${LD_LIBRARY_PATH}" ./plasma_testing.py || die
-}
-
-src_install() {
-	dolib.so lib/lib*$(get_libname)* quark/libquark$(get_libname)*
-	use static-libs && dolib.a lib/lib*.a quark/libquark.a
-	insinto /usr/include/${PN}
-	doins quark/quark{,_unpack_args}.h quark/icl_{hash,list}.h include/*.h
-	use fortran && doins include/*.mod
-	insinto /usr/$(get_libdir)/pkgconfig
-	doins ${PN}.pc
-	dodoc README ToDo ReleaseNotes
-	use doc && dodoc docs/pdf/*.pdf && dohtml docs/doxygen/out/html/*
-	if use examples; then
-		emake -C examples cleanall
-		insinto /usr/share/doc/${PF}
-		doins -r examples
-	fi
-}

diff --git a/sci-libs/plasma/plasma-2.5.1.ebuild b/sci-libs/plasma/plasma-2.5.2.ebuild
similarity index 100%
rename from sci-libs/plasma/plasma-2.5.1.ebuild
rename to sci-libs/plasma/plasma-2.5.2.ebuild


^ permalink raw reply related	[flat|nested] 9+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-libs/plasma/
@ 2014-01-28 19:01 Sebastien Fabbro
  0 siblings, 0 replies; 9+ messages in thread
From: Sebastien Fabbro @ 2014-01-28 19:01 UTC (permalink / raw
  To: gentoo-commits

commit:     bf895d3c343fe466c08d7f900c6a876a43cf43e4
Author:     Sébastien Fabbro <bicatali <AT> gentoo <DOT> org>
AuthorDate: Mon Dec  9 18:47:38 2013 +0000
Commit:     Sebastien Fabbro <bicatali <AT> gentoo <DOT> org>
CommitDate: Mon Dec  9 18:47:38 2013 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=bf895d3c

sci-libs/plasma: Version bump

Package-Manager: portage-2.2.7-prefix

---
 sci-libs/plasma/ChangeLog           |  3 +++
 sci-libs/plasma/plasma-2.5.2.ebuild | 25 ++++++++++++++++---------
 2 files changed, 19 insertions(+), 9 deletions(-)

diff --git a/sci-libs/plasma/ChangeLog b/sci-libs/plasma/ChangeLog
index 63aa673..6311120 100644
--- a/sci-libs/plasma/ChangeLog
+++ b/sci-libs/plasma/ChangeLog
@@ -2,6 +2,9 @@
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+  09 Dec 2013; Sébastien Fabbro <bicatali@gentoo.org> plasma-2.5.2.ebuild:
+  sci-libs/plasma: Version bump
+
 *plasma-2.5.1 (12 Jul 2013)
 
   12 Jul 2013; Sébastien Fabbro <bicatali@gentoo.org> +plasma-2.5.1.ebuild:

diff --git a/sci-libs/plasma/plasma-2.5.2.ebuild b/sci-libs/plasma/plasma-2.5.2.ebuild
index 5609c24..0d4af6a 100644
--- a/sci-libs/plasma/plasma-2.5.2.ebuild
+++ b/sci-libs/plasma/plasma-2.5.2.ebuild
@@ -3,7 +3,7 @@
 # $Header: $
 
 EAPI=5
-inherit eutils fortran-2 toolchain-funcs versionator multilib
+inherit eutils fortran-2 toolchain-funcs versionator multilib flag-o-matic
 
 MYP=${PN}_${PV}
 
@@ -55,7 +55,15 @@ static_to_shared() {
 }
 
 src_prepare() {
-	# distributed pc file not so useful
+	# rename plasma to avoid collision (https://github.com/gentoo-science/sci/issues/34)
+	# lib name conflict with kde plasma, rename
+	PLASMA_LIBNAME=plasmca
+	sed -i \
+		-e "s/-lplasma/-l${PLASMA_LIBNAME}/g" \
+		-e "s/libplasma.a/lib${PLASMA_LIBNAME}.a/" \
+		Makefile.internal || die
+
+	# distributed pc file not so useful, so redo it
 	cat <<-EOF > ${PN}.pc
 		prefix=${EPREFIX}/usr
 		libdir=\${prefix}/$(get_libdir)
@@ -64,7 +72,7 @@ src_prepare() {
 		Description: ${DESCRIPTION}
 		Version: ${PV}
 		URL: ${HOMEPAGE}
-		Libs: -L\${libdir} -lplasmca -lcoreblas -lquark
+		Libs: -L\${libdir} -l${PLASMA_LIBNAME} -lcoreblas -lquark
 		Libs.private: -lm
 		Cflags: -I\${includedir}
 		Requires: blas cblas lapack lapacke hwloc
@@ -78,12 +86,12 @@ src_configure() {
 		RANLIB = $(tc-getRANLIB)
 		CC = $(tc-getCC)
 		FC = $(tc-getFC)
-		CFLAGS = ${CFLAGS} -DADD_ -fPIC
+		CFLAGS = ${CFLAGS} -DADD_ -fPIC $(has_version ">=virtual/lapacke-3.5" && echo "-DDOXYGEN_SHOULD_SKIP_THIS=1")
 		FFLAGS = ${FFLAGS} -fPIC
 		LOADER = $(tc-getFC)
 		LIBBLAS = $($(tc-getPKG_CONFIG) --libs blas)
 		LIBCBLAS = $($(tc-getPKG_CONFIG) --libs cblas)
-		LIBLAPACK = $($(tc-getPKG_CONFIG) --libs lapack)
+		LIBLAPACK = $($(tc-getPKG_CONFIG) --libs lapack) -ltmglib
 		LIBCLAPACK = $($(tc-getPKG_CONFIG) --libs lapacke)
 		$(use fortran && echo "PLASMA_F90 = 1")
 	EOF
@@ -91,11 +99,10 @@ src_configure() {
 
 src_compile() {
 	emake lib
-	# rename plasma to avoid collision (https://github.com/gentoo-science/sci/issues/34)
-	mv lib/libplasm{,c}a.a || die
+	#mv lib/libplasma.a lib/lib${PLASMA_LIBNAME}.a || die
 	static_to_shared quark/libquark.a $($(tc-getPKG_CONFIG --libs hwloc)) -pthread
 	static_to_shared lib/libcoreblas.a quark/libquark.so $($(tc-getPKG_CONFIG --libs cblas lapacke))
-	static_to_shared lib/libplasmca.a quark/libquark.so lib/libcoreblas.so
+	static_to_shared lib/lib${PLASMA_LIBNAME}.a quark/libquark.so lib/libcoreblas.so
 	if use static-libs; then
 		emake cleanall
 		sed 's/-fPIC//g' make.inc
@@ -127,7 +134,7 @@ src_install() {
 }
 
 pkg_postinst() {
-	elog "The plasma linear algebra library has been renamed plasmca"
+	elog "The plasma linear algebra library file has been renamed ${PLASMA_LIBNAME}"
 	elog "to avoid collision with KDE plasma."
 	elog "Compile and link your programs using the following command:"
 	elog "     pkg-config --cflags --libs plasma"


^ permalink raw reply related	[flat|nested] 9+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-libs/plasma/
@ 2014-01-28 19:02 Sebastien Fabbro
  0 siblings, 0 replies; 9+ messages in thread
From: Sebastien Fabbro @ 2014-01-28 19:02 UTC (permalink / raw
  To: gentoo-commits

commit:     b20f011da70601e1e003141148c7e6da5d959776
Author:     Sébastien Fabbro <bicatali <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 28 18:59:42 2014 +0000
Commit:     Sebastien Fabbro <bicatali <AT> gentoo <DOT> org>
CommitDate: Tue Jan 28 18:59:42 2014 +0000
URL:        http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=b20f011d

sci-libs/plasma: Version bump

Package-Manager: portage-2.2.8-prefix

---
 sci-libs/plasma/ChangeLog           |   7 +-
 sci-libs/plasma/plasma-2.6.0.ebuild | 142 ++++++++++++++++++++++++++++++++++++
 2 files changed, 148 insertions(+), 1 deletion(-)

diff --git a/sci-libs/plasma/ChangeLog b/sci-libs/plasma/ChangeLog
index 6311120..6072d19 100644
--- a/sci-libs/plasma/ChangeLog
+++ b/sci-libs/plasma/ChangeLog
@@ -1,7 +1,12 @@
 # ChangeLog for sci-libs/plasma
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*plasma-2.6.0 (28 Jan 2014)
+
+  28 Jan 2014; Sébastien Fabbro <bicatali@gentoo.org> +plasma-2.6.0.ebuild:
+  sci-libs/plasma: Version bump
+
   09 Dec 2013; Sébastien Fabbro <bicatali@gentoo.org> plasma-2.5.2.ebuild:
   sci-libs/plasma: Version bump
 

diff --git a/sci-libs/plasma/plasma-2.6.0.ebuild b/sci-libs/plasma/plasma-2.6.0.ebuild
new file mode 100644
index 0000000..067d27c
--- /dev/null
+++ b/sci-libs/plasma/plasma-2.6.0.ebuild
@@ -0,0 +1,142 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: $
+
+EAPI=5
+inherit eutils fortran-2 toolchain-funcs versionator multilib flag-o-matic
+
+MYP=${PN}_${PV}
+SOVER=$(get_version_component_range 1)
+
+DESCRIPTION="Parallel Linear Algebra for Scalable Multi-core Architecture"
+HOMEPAGE="http://icl.cs.utk.edu/plasma/"
+SRC_URI="http://icl.cs.utk.edu/projectsfiles/plasma/pubs/${MYP}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${SOVER}"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+IUSE="doc examples fortran static-libs test"
+
+RDEPEND="
+	sys-apps/hwloc
+	virtual/blas
+	virtual/cblas
+	virtual/lapack
+	virtual/lapacke"
+DEPEND="${RDEPEND}
+	virtual/pkgconfig
+	test? ( sci-libs/lapacke-reference[tmg] )"
+
+S="${WORKDIR}/${MYP}"
+
+# TODO: virtual/{blas,cblas,lapack} serial and threaded. plasma works properly
+# with serial blas/lapack (see README). not doable dynamically with atlas
+
+static_to_shared() {
+	local libstatic=${1}; shift
+	local libname=$(basename ${libstatic%.a})
+	local soname=${libname}$(get_libname ${SOVER})
+	local libdir=$(dirname ${libstatic})
+
+	einfo "Making ${soname} from ${libstatic}"
+	if [[ ${CHOST} == *-darwin* ]] ; then
+		${LINK:-$(tc-getCC)} ${LDFLAGS}  \
+			-dynamiclib -install_name "${EPREFIX}"/usr/lib/"${soname}" \
+			-Wl,-all_load -Wl,${libstatic} \
+			"$@" -o ${libdir}/${soname} || die "${soname} failed"
+	else
+		${LINK:-$(tc-getCC)} ${LDFLAGS}  \
+			-shared -Wl,-soname=${soname} \
+			-Wl,--whole-archive ${libstatic} -Wl,--no-whole-archive \
+			"$@" -o ${libdir}/${soname} || die "${soname} failed"
+		[[ $(get_version_component_count) -gt 1 ]] && \
+			ln -s ${soname} ${libdir}/${libname}$(get_libname $(get_major_version))
+		ln -s ${soname} ${libdir}/${libname}$(get_libname)
+	fi
+}
+
+src_prepare() {
+	# rename plasma to avoid collision (https://github.com/gentoo-science/sci/issues/34)
+	# lib name conflict with kde plasma, rename
+	PLASMA_LIBNAME=plasmca
+	sed -i \
+		-e "s/-lplasma/-l${PLASMA_LIBNAME}/g" \
+		-e "s/libplasma.a/lib${PLASMA_LIBNAME}.a/" \
+		Makefile.internal || die
+
+	# distributed pc file not so useful, so redo it
+	cat <<-EOF > ${PN}.pc
+		prefix=${EPREFIX}/usr
+		libdir=\${prefix}/$(get_libdir)
+		includedir=\${prefix}/include/${PN}
+		Name: ${PN}
+		Description: ${DESCRIPTION}
+		Version: ${PV}
+		URL: ${HOMEPAGE}
+		Libs: -L\${libdir} -l${PLASMA_LIBNAME} -lcoreblas -lquark
+		Libs.private: -lm
+		Cflags: -I\${includedir}
+		Requires: blas cblas lapack lapacke hwloc
+	EOF
+}
+
+src_configure() {
+	cat <<-EOF > make.inc
+		ARCH = $(tc-getAR)
+		ARCHFLAGS = cr
+		RANLIB = $(tc-getRANLIB)
+		CC = $(tc-getCC)
+		FC = $(tc-getFC)
+		CFLAGS = ${CFLAGS} -DADD_ -fPIC $(has_version ">=virtual/lapacke-3.5" && echo "-DDOXYGEN_SHOULD_SKIP_THIS=1")
+		FFLAGS = ${FFLAGS} -fPIC
+		LOADER = $(tc-getFC)
+		LIBBLAS = $($(tc-getPKG_CONFIG) --libs blas)
+		LIBCBLAS = $($(tc-getPKG_CONFIG) --libs cblas)
+		LIBLAPACK = $($(tc-getPKG_CONFIG) --libs lapack) -ltmglib
+		LIBCLAPACK = $($(tc-getPKG_CONFIG) --libs lapacke)
+		$(use fortran && echo "PLASMA_F90 = 1")
+	EOF
+}
+
+src_compile() {
+	emake lib
+	#mv lib/libplasma.a lib/lib${PLASMA_LIBNAME}.a || die
+	static_to_shared quark/libquark.a $($(tc-getPKG_CONFIG --libs hwloc)) -pthread
+	static_to_shared lib/libcoreblas.a quark/libquark.so $($(tc-getPKG_CONFIG --libs cblas lapacke))
+	static_to_shared lib/lib${PLASMA_LIBNAME}.a quark/libquark.so lib/libcoreblas.so
+	if use static-libs; then
+		emake cleanall
+		sed 's/-fPIC//g' make.inc
+		emake lib
+	fi
+}
+
+src_test() {
+	emake test
+	cd testing
+	LD_LIBRARY_PATH="../lib:../quark:${LD_LIBRARY_PATH}" ./plasma_testing.py || die
+}
+
+src_install() {
+	dolib.so lib/lib*$(get_libname)* quark/libquark$(get_libname)*
+	use static-libs && dolib.a lib/lib*.a quark/libquark.a
+	insinto /usr/include/${PN}
+	doins quark/quark{,_unpack_args}.h quark/icl_{hash,list}.h include/*.h
+	use fortran && doins include/*.mod
+	insinto /usr/$(get_libdir)/pkgconfig
+	doins ${PN}.pc
+	dodoc README ToDo ReleaseNotes
+	use doc && dodoc docs/pdf/*.pdf && dohtml docs/doxygen/out/html/*
+	if use examples; then
+		emake -C examples cleanall
+		insinto /usr/share/doc/${PF}
+		doins -r examples
+	fi
+}
+
+pkg_postinst() {
+	elog "The plasma linear algebra library file has been renamed ${PLASMA_LIBNAME}"
+	elog "to avoid collision with KDE plasma."
+	elog "Compile and link your programs using the following command:"
+	elog "     pkg-config --cflags --libs plasma"
+}


^ permalink raw reply related	[flat|nested] 9+ messages in thread

* [gentoo-commits] proj/sci:master commit in: sci-libs/plasma/
@ 2020-09-28  9:24 Horea Christian
  0 siblings, 0 replies; 9+ messages in thread
From: Horea Christian @ 2020-09-28  9:24 UTC (permalink / raw
  To: gentoo-commits

commit:     c45b4080dc3d671fbaa6d6691a1e32ab6f7301fc
Author:     Horea Christian <chr <AT> chymera <DOT> eu>
AuthorDate: Mon Sep 28 09:00:42 2020 +0000
Commit:     Horea Christian <horea.christ <AT> gmail <DOT> com>
CommitDate: Mon Sep 28 09:00:42 2020 +0000
URL:        https://gitweb.gentoo.org/proj/sci.git/commit/?id=c45b4080

sci-libs/plasma: removed unmaintained package

Package-Manager: Portage-3.0.8, Repoman-3.0.1
Signed-off-by: Horea Christian <chr <AT> chymera.eu>

 sci-libs/plasma/metadata.xml        |  15 ----
 sci-libs/plasma/plasma-2.5.2.ebuild | 140 -----------------------------------
 sci-libs/plasma/plasma-2.6.0.ebuild | 141 ------------------------------------
 3 files changed, 296 deletions(-)

diff --git a/sci-libs/plasma/metadata.xml b/sci-libs/plasma/metadata.xml
deleted file mode 100644
index b21b3df93..000000000
--- a/sci-libs/plasma/metadata.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>sci@gentoo.org</email>
-		<name>Gentoo Science Project</name>
-	</maintainer>
-	<longdescription lang="en">
-The Parallel Linear Algebra for Scalable Multi-core Architectures
-(PLASMA) project aims to address the critical and highly disruptive
-situation that is facing the Linear Algebra and High Performance
-Computing community due to the introduction of multi-core
-architectures.
-</longdescription>
-</pkgmetadata>

diff --git a/sci-libs/plasma/plasma-2.5.2.ebuild b/sci-libs/plasma/plasma-2.5.2.ebuild
deleted file mode 100644
index 1a33d3630..000000000
--- a/sci-libs/plasma/plasma-2.5.2.ebuild
+++ /dev/null
@@ -1,140 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils fortran-2 toolchain-funcs versionator multilib flag-o-matic
-
-MYP=${PN}_${PV}
-
-DESCRIPTION="Parallel Linear Algebra for Scalable Multi-core Architecture"
-HOMEPAGE="http://icl.cs.utk.edu/plasma/"
-SRC_URI="http://icl.cs.utk.edu/projectsfiles/plasma/pubs/${MYP}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc examples fortran static-libs test"
-
-RDEPEND="
-	sys-apps/hwloc
-	virtual/blas
-	virtual/cblas
-	virtual/lapack
-	virtual/lapacke"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	test? ( sci-libs/lapacke-reference[tmg] )"
-
-S="${WORKDIR}/${MYP}"
-
-# TODO: virtual/{blas,cblas,lapack} serial and threaded. plasma works properly
-# with serial blas/lapack (see README). not doable dynamically with atlas
-
-static_to_shared() {
-	local libstatic=${1}; shift
-	local libname=$(basename ${libstatic%.a})
-	local soname=${libname}$(get_libname $(get_version_component_range 1-2))
-	local libdir=$(dirname ${libstatic})
-
-	einfo "Making ${soname} from ${libstatic}"
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		${LINK:-$(tc-getCC)} ${LDFLAGS}  \
-			-dynamiclib -install_name "${EPREFIX}"/usr/lib/"${soname}" \
-			-Wl,-all_load -Wl,${libstatic} \
-			"$@" -o ${libdir}/${soname} || die "${soname} failed"
-	else
-		${LINK:-$(tc-getCC)} ${LDFLAGS}  \
-			-shared -Wl,-soname=${soname} \
-			-Wl,--whole-archive ${libstatic} -Wl,--no-whole-archive \
-			"$@" -o ${libdir}/${soname} || die "${soname} failed"
-		[[ $(get_version_component_count) -gt 1 ]] && \
-			ln -s ${soname} ${libdir}/${libname}$(get_libname $(get_major_version))
-		ln -s ${soname} ${libdir}/${libname}$(get_libname)
-	fi
-}
-
-src_prepare() {
-	# rename plasma to avoid collision (https://github.com/gentoo-science/sci/issues/34)
-	# lib name conflict with kde plasma, rename
-	PLASMA_LIBNAME=plasmca
-	sed -i \
-		-e "s/-lplasma/-l${PLASMA_LIBNAME}/g" \
-		-e "s/libplasma.a/lib${PLASMA_LIBNAME}.a/" \
-		Makefile.internal || die
-
-	# distributed pc file not so useful, so redo it
-	cat <<-EOF > ${PN}.pc
-		prefix=${EPREFIX}/usr
-		libdir=\${prefix}/$(get_libdir)
-		includedir=\${prefix}/include/${PN}
-		Name: ${PN}
-		Description: ${DESCRIPTION}
-		Version: ${PV}
-		URL: ${HOMEPAGE}
-		Libs: -L\${libdir} -l${PLASMA_LIBNAME} -lcoreblas -lquark
-		Libs.private: -lm
-		Cflags: -I\${includedir}
-		Requires: blas cblas lapack lapacke hwloc
-	EOF
-}
-
-src_configure() {
-	cat <<-EOF > make.inc
-		ARCH = $(tc-getAR)
-		ARCHFLAGS = cr
-		RANLIB = $(tc-getRANLIB)
-		CC = $(tc-getCC)
-		FC = $(tc-getFC)
-		CFLAGS = ${CFLAGS} -DADD_ -fPIC $(has_version ">=virtual/lapacke-3.5" && echo "-DDOXYGEN_SHOULD_SKIP_THIS=1")
-		FFLAGS = ${FFLAGS} -fPIC
-		LOADER = $(tc-getFC)
-		LIBBLAS = $($(tc-getPKG_CONFIG) --libs blas)
-		LIBCBLAS = $($(tc-getPKG_CONFIG) --libs cblas)
-		LIBLAPACK = $($(tc-getPKG_CONFIG) --libs lapack) -ltmglib
-		LIBCLAPACK = $($(tc-getPKG_CONFIG) --libs lapacke)
-		$(use fortran && echo "PLASMA_F90 = 1")
-	EOF
-}
-
-src_compile() {
-	emake lib
-	#mv lib/libplasma.a lib/lib${PLASMA_LIBNAME}.a || die
-	static_to_shared quark/libquark.a $($(tc-getPKG_CONFIG --libs hwloc)) -pthread
-	static_to_shared lib/libcoreblas.a quark/libquark.so $($(tc-getPKG_CONFIG --libs cblas lapacke))
-	static_to_shared lib/lib${PLASMA_LIBNAME}.a quark/libquark.so lib/libcoreblas.so
-	if use static-libs; then
-		emake cleanall
-		sed 's/-fPIC//g' make.inc
-		emake lib
-	fi
-}
-
-src_test() {
-	emake test
-	cd testing
-	LD_LIBRARY_PATH="../lib:../quark:${LD_LIBRARY_PATH}" ./plasma_testing.py || die
-}
-
-src_install() {
-	dolib.so lib/lib*$(get_libname)* quark/libquark$(get_libname)*
-	use static-libs && dolib.a lib/lib*.a quark/libquark.a
-	insinto /usr/include/${PN}
-	doins quark/quark{,_unpack_args}.h quark/icl_{hash,list}.h include/*.h
-	use fortran && doins include/*.mod
-	insinto /usr/$(get_libdir)/pkgconfig
-	doins ${PN}.pc
-	dodoc README ToDo ReleaseNotes
-	use doc && dodoc docs/pdf/*.pdf && dohtml docs/doxygen/out/html/*
-	if use examples; then
-		emake -C examples cleanall
-		insinto /usr/share/doc/${PF}
-		doins -r examples
-	fi
-}
-
-pkg_postinst() {
-	elog "The plasma linear algebra library file has been renamed ${PLASMA_LIBNAME}"
-	elog "to avoid collision with KDE plasma."
-	elog "Compile and link your programs using the following command:"
-	elog "     pkg-config --cflags --libs plasma"
-}

diff --git a/sci-libs/plasma/plasma-2.6.0.ebuild b/sci-libs/plasma/plasma-2.6.0.ebuild
deleted file mode 100644
index 851a4d00e..000000000
--- a/sci-libs/plasma/plasma-2.6.0.ebuild
+++ /dev/null
@@ -1,141 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-inherit eutils fortran-2 toolchain-funcs versionator multilib flag-o-matic
-
-MYP=${PN}_${PV}
-SOVER=$(get_version_component_range 1)
-
-DESCRIPTION="Parallel Linear Algebra for Scalable Multi-core Architecture"
-HOMEPAGE="http://icl.cs.utk.edu/plasma/"
-SRC_URI="http://icl.cs.utk.edu/projectsfiles/plasma/pubs/${MYP}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0/${SOVER}"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc examples fortran static-libs test"
-
-RDEPEND="
-	sys-apps/hwloc
-	virtual/blas
-	virtual/cblas
-	virtual/lapack
-	virtual/lapacke"
-DEPEND="${RDEPEND}
-	virtual/pkgconfig
-	test? ( sci-libs/lapacke-reference[tmg] )"
-
-S="${WORKDIR}/${MYP}"
-
-# TODO: virtual/{blas,cblas,lapack} serial and threaded. plasma works properly
-# with serial blas/lapack (see README). not doable dynamically with atlas
-
-static_to_shared() {
-	local libstatic=${1}; shift
-	local libname=$(basename ${libstatic%.a})
-	local soname=${libname}$(get_libname ${SOVER})
-	local libdir=$(dirname ${libstatic})
-
-	einfo "Making ${soname} from ${libstatic}"
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		${LINK:-$(tc-getCC)} ${LDFLAGS}  \
-			-dynamiclib -install_name "${EPREFIX}"/usr/lib/"${soname}" \
-			-Wl,-all_load -Wl,${libstatic} \
-			"$@" -o ${libdir}/${soname} || die "${soname} failed"
-	else
-		${LINK:-$(tc-getCC)} ${LDFLAGS}  \
-			-shared -Wl,-soname=${soname} \
-			-Wl,--whole-archive ${libstatic} -Wl,--no-whole-archive \
-			"$@" -o ${libdir}/${soname} || die "${soname} failed"
-		[[ $(get_version_component_count) -gt 1 ]] && \
-			ln -s ${soname} ${libdir}/${libname}$(get_libname $(get_major_version))
-		ln -s ${soname} ${libdir}/${libname}$(get_libname)
-	fi
-}
-
-src_prepare() {
-	# rename plasma to avoid collision (https://github.com/gentoo-science/sci/issues/34)
-	# lib name conflict with kde plasma, rename
-	PLASMA_LIBNAME=plasmca
-	sed -i \
-		-e "s/-lplasma/-l${PLASMA_LIBNAME}/g" \
-		-e "s/libplasma.a/lib${PLASMA_LIBNAME}.a/" \
-		Makefile.internal || die
-
-	# distributed pc file not so useful, so redo it
-	cat <<-EOF > ${PN}.pc
-		prefix=${EPREFIX}/usr
-		libdir=\${prefix}/$(get_libdir)
-		includedir=\${prefix}/include/${PN}
-		Name: ${PN}
-		Description: ${DESCRIPTION}
-		Version: ${PV}
-		URL: ${HOMEPAGE}
-		Libs: -L\${libdir} -l${PLASMA_LIBNAME} -lcoreblas -lquark
-		Libs.private: -lm
-		Cflags: -I\${includedir}
-		Requires: blas cblas lapack lapacke hwloc
-	EOF
-}
-
-src_configure() {
-	cat <<-EOF > make.inc
-		ARCH = $(tc-getAR)
-		ARCHFLAGS = cr
-		RANLIB = $(tc-getRANLIB)
-		CC = $(tc-getCC)
-		FC = $(tc-getFC)
-		CFLAGS = ${CFLAGS} -DADD_ -fPIC $(has_version ">=virtual/lapacke-3.5" && echo "-DDOXYGEN_SHOULD_SKIP_THIS=1")
-		FFLAGS = ${FFLAGS} -fPIC
-		LOADER = $(tc-getFC)
-		LIBBLAS = $($(tc-getPKG_CONFIG) --libs blas)
-		LIBCBLAS = $($(tc-getPKG_CONFIG) --libs cblas)
-		LIBLAPACK = $($(tc-getPKG_CONFIG) --libs lapack) -ltmglib
-		LIBCLAPACK = $($(tc-getPKG_CONFIG) --libs lapacke)
-		$(use fortran && echo "PLASMA_F90 = 1")
-	EOF
-}
-
-src_compile() {
-	emake lib
-	#mv lib/libplasma.a lib/lib${PLASMA_LIBNAME}.a || die
-	static_to_shared quark/libquark.a $($(tc-getPKG_CONFIG --libs hwloc)) -pthread
-	static_to_shared lib/libcoreblas.a quark/libquark.so $($(tc-getPKG_CONFIG --libs cblas lapacke))
-	static_to_shared lib/lib${PLASMA_LIBNAME}.a quark/libquark.so lib/libcoreblas.so
-	if use static-libs; then
-		emake cleanall
-		sed 's/-fPIC//g' make.inc
-		emake lib
-	fi
-}
-
-src_test() {
-	emake test
-	cd testing
-	LD_LIBRARY_PATH="../lib:../quark:${LD_LIBRARY_PATH}" ./plasma_testing.py || die
-}
-
-src_install() {
-	dolib.so lib/lib*$(get_libname)* quark/libquark$(get_libname)*
-	use static-libs && dolib.a lib/lib*.a quark/libquark.a
-	insinto /usr/include/${PN}
-	doins quark/quark{,_unpack_args}.h quark/icl_{hash,list}.h include/*.h
-	use fortran && doins include/*.mod
-	insinto /usr/$(get_libdir)/pkgconfig
-	doins ${PN}.pc
-	dodoc README ToDo ReleaseNotes
-	use doc && dodoc docs/pdf/*.pdf && dohtml docs/doxygen/out/html/*
-	if use examples; then
-		emake -C examples cleanall
-		insinto /usr/share/doc/${PF}
-		doins -r examples
-	fi
-}
-
-pkg_postinst() {
-	elog "The plasma linear algebra library file has been renamed ${PLASMA_LIBNAME}"
-	elog "to avoid collision with KDE plasma."
-	elog "Compile and link your programs using the following command:"
-	elog "     pkg-config --cflags --libs plasma"
-}


^ permalink raw reply related	[flat|nested] 9+ messages in thread

end of thread, other threads:[~2020-09-28  9:24 UTC | newest]

Thread overview: 9+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-07-12 20:43 [gentoo-commits] proj/sci:master commit in: sci-libs/plasma/ Sebastien Fabbro
  -- strict thread matches above, loose matches on Subject: below --
2020-09-28  9:24 Horea Christian
2014-01-28 19:02 Sebastien Fabbro
2014-01-28 19:01 Sebastien Fabbro
2014-01-28 19:01 Sebastien Fabbro
2013-07-12 17:37 Sebastien Fabbro
2012-11-29  0:06 Sebastien Fabbro
2012-02-24 19:17 Sebastien Fabbro
2012-02-24 18:30 Sebastien Fabbro

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox