aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'virtual')
-rw-r--r--virtual/blas/blas-2.1-r1.ebuild38
-rw-r--r--virtual/blas/blas-2.1-r2.ebuild41
-rw-r--r--virtual/blas/blas-2.1-r3.ebuild11
-rw-r--r--virtual/blas/metadata.xml6
-rw-r--r--virtual/cblas/cblas-2.0-r1.ebuild28
-rw-r--r--virtual/cblas/cblas-2.0-r2.ebuild31
-rw-r--r--virtual/cblas/cblas-2.0-r3.ebuild14
-rw-r--r--virtual/cblas/cblas-2.0.ebuild24
-rw-r--r--virtual/lapack/lapack-3.4-r1.ebuild35
-rw-r--r--virtual/lapack/lapack-3.5-r1.ebuild33
-rw-r--r--virtual/lapack/lapack-3.5-r2.ebuild6
11 files changed, 21 insertions, 246 deletions
diff --git a/virtual/blas/blas-2.1-r1.ebuild b/virtual/blas/blas-2.1-r1.ebuild
deleted file mode 100644
index 7b846bd31..000000000
--- a/virtual/blas/blas-2.1-r1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit multilib
-
-DESCRIPTION="Virtual for FORTRAN 77 BLAS implementation"
-HOMEPAGE=""
-SRC_URI=""
-
-LICENSE=""
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc"
-
-RDEPEND="
- || (
- >=sci-libs/blas-reference-20110417
- >=dev-cpp/eigen-3.1.2
- sci-libs/atlas[fortran]
- sci-libs/openblas
- >=sci-libs/acml-4.4
- sci-libs/gotoblas2
- >=sci-libs/mkl-10.3
- )
- doc? ( >=app-doc/blas-docs-3.2 )"
-DEPEND=""
-
-pkg_pretend() {
- if [[ -e "${EROOT%/}"/usr/$(get_libdir)/lib${PN}.so ]]; then
- ewarn "You have still the old ${PN} library symlink present"
- ewarn "Please delete"
- ewarn "${EROOT%/}/usr/$(get_libdir)/lib${PN}.so"
- ewarn "to avoid problems with new ${PN} structure"
- fi
-}
diff --git a/virtual/blas/blas-2.1-r2.ebuild b/virtual/blas/blas-2.1-r2.ebuild
deleted file mode 100644
index b7380d082..000000000
--- a/virtual/blas/blas-2.1-r2.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit multilib
-
-DESCRIPTION="Virtual for FORTRAN 77 BLAS implementation"
-HOMEPAGE=""
-SRC_URI=""
-
-LICENSE=""
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc int64"
-
-RDEPEND="
- int64? (
- sci-libs/openblas[int64]
- )
- || (
- >=sci-libs/blas-reference-20110417
- >=dev-cpp/eigen-3.1.2
- sci-libs/atlas[fortran]
- sci-libs/openblas[int64?]
- >=sci-libs/acml-4.4
- sci-libs/gotoblas2
- >=sci-libs/mkl-10.3
- )
- doc? ( >=app-doc/blas-docs-3.2 )"
-DEPEND=""
-
-pkg_pretend() {
- if [[ -e "${EROOT%/}"/usr/$(get_libdir)/lib${PN}.so ]]; then
- ewarn "You have still the old ${PN} library symlink present"
- ewarn "Please delete"
- ewarn "${EROOT%/}/usr/$(get_libdir)/lib${PN}.so"
- ewarn "to avoid problems with new ${PN} structure"
- fi
-}
diff --git a/virtual/blas/blas-2.1-r3.ebuild b/virtual/blas/blas-2.1-r3.ebuild
index 8c83e5309..48f4d0e8c 100644
--- a/virtual/blas/blas-2.1-r3.ebuild
+++ b/virtual/blas/blas-2.1-r3.ebuild
@@ -4,7 +4,7 @@
EAPI=5
-inherit multilib
+inherit multilib-build
DESCRIPTION="Virtual for FORTRAN 77 BLAS implementation"
HOMEPAGE=""
@@ -18,15 +18,15 @@ IUSE="doc int64"
RDEPEND="
int64? (
|| (
- >=sci-libs/openblas-0.2.11[int64]
- >=sci-libs/blas-reference-20131116-r1[int64]
+ sci-libs/blas-reference[int64,${MULTILIB_USEDEP}]
+ >=sci-libs/openblas-0.2.11[int64,${MULTILIB_USEDEP}]
)
)
|| (
- >=sci-libs/blas-reference-20131116-r1[int64?]
+ sci-libs/blas-reference[int64?,${MULTILIB_USEDEP}]
+ >=sci-libs/openblas-0.2.11[int64?,${MULTILIB_USEDEP}]
>=dev-cpp/eigen-3.1.4
sci-libs/atlas[fortran]
- >=sci-libs/openblas-0.2.11[int64?]
>=sci-libs/acml-4.4
sci-libs/gotoblas2
>=sci-libs/mkl-10.3
@@ -40,5 +40,6 @@ pkg_pretend() {
ewarn "Please delete"
ewarn "${EROOT%/}/usr/$(get_libdir)/lib${PN}.so"
ewarn "to avoid problems with new ${PN} structure"
+ die "Old lib${PN} detected"
fi
}
diff --git a/virtual/blas/metadata.xml b/virtual/blas/metadata.xml
index a27bb5a01..cc94dad69 100644
--- a/virtual/blas/metadata.xml
+++ b/virtual/blas/metadata.xml
@@ -6,8 +6,8 @@
Gentoo virtual package for the Basic Linear Algebra Subprograms
FORTRAN 77 implementation.
</longdescription>
-<use>
- <flag name="int64">Add eselect module for blas libraries built with 64 bits
+ <use>
+ <flag name="int64">Add eselect module for blas libraries built with 64 bits
integer ABI</flag>
-</use>
+ </use>
</pkgmetadata>
diff --git a/virtual/cblas/cblas-2.0-r1.ebuild b/virtual/cblas/cblas-2.0-r1.ebuild
deleted file mode 100644
index aab813fe9..000000000
--- a/virtual/cblas/cblas-2.0-r1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-DESCRIPTION="Virtual for BLAS C implementation"
-HOMEPAGE=""
-SRC_URI=""
-
-LICENSE=""
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="int64"
-
-RDEPEND="
- int64? (
- sci-libs/openblas[int64]
- )
- || (
- >=sci-libs/cblas-reference-20110218
- sci-libs/openblas[int64?]
- >=sci-libs/gsl-1.15-r3[-cblas-external]
- >=sci-libs/gotoblas2-1.13
- >=sci-libs/atlas-3.9.34
- >=sci-libs/mkl-10.3
- )"
-DEPEND=""
diff --git a/virtual/cblas/cblas-2.0-r2.ebuild b/virtual/cblas/cblas-2.0-r2.ebuild
deleted file mode 100644
index a4772e257..000000000
--- a/virtual/cblas/cblas-2.0-r2.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-DESCRIPTION="Virtual for BLAS C implementation"
-HOMEPAGE=""
-SRC_URI=""
-
-LICENSE=""
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~hppa ~ppc ~ppc64 ~s390 ~sparc ~x86 ~x86-fbsd ~amd64-linux ~x86-linux ~x64-macos ~x86-macos"
-IUSE="int64"
-
-RDEPEND="
- int64? (
- || (
- >=sci-libs/openblas-0.2.11[int64]
- >=sci-libs/cblas-reference-20110218-r1[int64]
- )
- )
- || (
- >=sci-libs/cblas-reference-20110218-r1[int64?]
- >=sci-libs/openblas-0.2.11[int64?]
- >=sci-libs/gsl-1.15-r3[-cblas-external]
- >=sci-libs/gotoblas2-1.13
- >=sci-libs/atlas-3.9.34
- >=sci-libs/mkl-10.3
- )"
-DEPEND=""
diff --git a/virtual/cblas/cblas-2.0-r3.ebuild b/virtual/cblas/cblas-2.0-r3.ebuild
index 252154d18..852a70fbe 100644
--- a/virtual/cblas/cblas-2.0-r3.ebuild
+++ b/virtual/cblas/cblas-2.0-r3.ebuild
@@ -26,10 +26,14 @@ RDEPEND="
>=sci-libs/cblas-reference-20110218-r1[int64?,${MULTILIB_USEDEP}]
>=sci-libs/openblas-0.2.11[int64?,${MULTILIB_USEDEP}]
>=sci-libs/gsl-1.16-r2[-cblas-external,${MULTILIB_USEDEP}]
- abi_x86_64? ( !abi_x86_32? ( || (
- >=sci-libs/gotoblas2-1.13
- >=sci-libs/atlas-3.9.34
- >=sci-libs/mkl-10.3
- ) ) )
+ abi_x86_64? (
+ !abi_x86_32? (
+ || (
+ >=sci-libs/gotoblas2-1.13
+ >=sci-libs/atlas-3.9.34
+ >=sci-libs/mkl-10.3
+ )
+ )
+ )
)"
DEPEND=""
diff --git a/virtual/cblas/cblas-2.0.ebuild b/virtual/cblas/cblas-2.0.ebuild
deleted file mode 100644
index cb1449e4f..000000000
--- a/virtual/cblas/cblas-2.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-DESCRIPTION="Virtual for BLAS C implementation"
-HOMEPAGE=""
-SRC_URI=""
-
-LICENSE=""
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE=""
-
-RDEPEND="|| (
- >=sci-libs/cblas-reference-20110218
- sci-libs/openblas
- >=sci-libs/gsl-1.15-r3[-cblas-external]
- >=sci-libs/gotoblas2-1.13
- >=sci-libs/atlas-3.9.34
- >=sci-libs/mkl-10.3
- )"
-DEPEND=""
diff --git a/virtual/lapack/lapack-3.4-r1.ebuild b/virtual/lapack/lapack-3.4-r1.ebuild
deleted file mode 100644
index 57124ab65..000000000
--- a/virtual/lapack/lapack-3.4-r1.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit multilib
-
-DESCRIPTION="Virtual for Linear Algebra Package FORTRAN 77 implementation"
-HOMEPAGE=""
-SRC_URI=""
-
-LICENSE=""
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux"
-IUSE="doc"
-
-RDEPEND="
- || (
- >=sci-libs/lapack-reference-${PV}
- >=sci-libs/atlas-3.10.1[lapack]
- >=sci-libs/mkl-11.0
- >=sci-libs/acml-5.3
- )
- doc? ( >=app-doc/lapack-docs-3.3 )"
-DEPEND=""
-
-pkg_pretend() {
- if [[ -e "${EPREFIX}"/usr/$(get_libdir)/lib${PN}.so ]]; then
- ewarn "You have still the old ${PN} library symlink present"
- ewarn "Please delete"
- ewarn "${EPREFIX}/usr/$(get_libdir)/lib${PN}.so"
- ewarn "to avoid problems with new ${PN} structure"
- fi
-}
diff --git a/virtual/lapack/lapack-3.5-r1.ebuild b/virtual/lapack/lapack-3.5-r1.ebuild
deleted file mode 100644
index 2c127c0d2..000000000
--- a/virtual/lapack/lapack-3.5-r1.ebuild
+++ /dev/null
@@ -1,33 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-EAPI=5
-
-inherit multilib
-
-DESCRIPTION="Virtual for Linear Algebra Package FORTRAN 77 implementation"
-HOMEPAGE=""
-SRC_URI=""
-
-LICENSE=""
-SLOT="0"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-IUSE="doc"
-
-RDEPEND="
- || (
- >=sci-libs/lapack-reference-${PV}
- >=sci-libs/atlas-3.10.1[lapack]
- )
- doc? ( >=app-doc/lapack-docs-3.3 )"
-DEPEND=""
-
-pkg_pretend() {
- if [[ -e "${EROOT%/}"/usr/$(get_libdir)/lib${PN}.so ]]; then
- ewarn "You have still the old ${PN} library symlink present"
- ewarn "Please delete"
- ewarn "${EROOT%/}/usr/$(get_libdir)/lib${PN}.so"
- ewarn "to avoid problems with new ${PN} structure"
- fi
-}
diff --git a/virtual/lapack/lapack-3.5-r2.ebuild b/virtual/lapack/lapack-3.5-r2.ebuild
index 2282d9884..7bbf0a183 100644
--- a/virtual/lapack/lapack-3.5-r2.ebuild
+++ b/virtual/lapack/lapack-3.5-r2.ebuild
@@ -4,7 +4,7 @@
EAPI=5
-inherit multilib
+inherit multilib-build
DESCRIPTION="Virtual for Linear Algebra Package FORTRAN 77 implementation"
HOMEPAGE=""
@@ -17,10 +17,10 @@ IUSE="doc int64"
RDEPEND="
|| (
- >=sci-libs/lapack-reference-${PV}[int64?]
+ >=sci-libs/lapack-reference-${PV}[int64?,${MULTILIB_USEDEP}]
>=sci-libs/atlas-3.10.1[lapack]
)
- int64? ( >=sci-libs/lapack-reference-${PV}[int64] )
+ int64? ( >=sci-libs/lapack-reference-${PV}[int64,${MULTILIB_USEDEP}] )
doc? ( >=app-doc/lapack-docs-3.3 )"
DEPEND=""