aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSébastien Fabbro <bicatali@gentoo.org>2014-01-20 09:53:04 -0800
committerSébastien Fabbro <bicatali@gentoo.org>2014-01-20 09:53:04 -0800
commit8e0fd242591a6596aedb323d7655a69090334b8f (patch)
treea8a18b57d76aa4b0a20633b6fdeb619838ee4a0b /virtual/lapack
parentMerge github.com:gentoo-science/sci (diff)
parentMoved dependency on gtextlib (diff)
downloadsci-8e0fd242591a6596aedb323d7655a69090334b8f.tar.gz
sci-8e0fd242591a6596aedb323d7655a69090334b8f.tar.bz2
sci-8e0fd242591a6596aedb323d7655a69090334b8f.zip
Merge branch 'master' of git://git.overlays.gentoo.org/proj/sci
Conflicts: virtual/lapack/ChangeLog
Diffstat (limited to 'virtual/lapack')
-rw-r--r--virtual/lapack/ChangeLog9
-rw-r--r--virtual/lapack/lapack-3.4-r1.ebuild (renamed from virtual/lapack/lapack-3.4.ebuild)18
-rw-r--r--virtual/lapack/lapack-3.5.ebuild12
-rw-r--r--virtual/lapack/metadata.xml4
4 files changed, 32 insertions, 11 deletions
diff --git a/virtual/lapack/ChangeLog b/virtual/lapack/ChangeLog
index 3ab480289..fcc9ba4e8 100644
--- a/virtual/lapack/ChangeLog
+++ b/virtual/lapack/ChangeLog
@@ -1,11 +1,10 @@
# ChangeLog for virtual/lapack
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
# $Header: /var/cvsroot/gentoo-x86/virtual/lapack/ChangeLog,v 1.5 2010/01/11 11:04:19 ulm Exp $
-*lapack-3.5 (08 Dec 2013)
-
- 08 Dec 2013; Sébastien Fabbro <bicatali@gentoo.org> +lapack-3.5.ebuild:
- virtual/lapack: Version bump
+ 19 Jan 2014; Justin Lecher <jlec@gentoo.org> -lapack-3.4.ebuild,
+ +lapack-3.4-r1.ebuild, metadata.xml:
+ Warn if old ${EPREFIX}/usr/$(get_libdir)/lib${PN}.so is present
*lapack-3.4 (21 Feb 2013)
diff --git a/virtual/lapack/lapack-3.4.ebuild b/virtual/lapack/lapack-3.4-r1.ebuild
index c1c978c7f..b662bb40f 100644
--- a/virtual/lapack/lapack-3.4.ebuild
+++ b/virtual/lapack/lapack-3.4-r1.ebuild
@@ -1,8 +1,10 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
-EAPI=2
+EAPI=5
+
+inherit multilib
DESCRIPTION="Virtual for Linear Algebra Package FORTRAN 77 implementation"
HOMEPAGE=""
@@ -13,7 +15,8 @@ SLOT="0"
KEYWORDS="~amd64 ~x86 ~amd64-linux"
IUSE="doc"
-RDEPEND="|| (
+RDEPEND="
+ || (
>=sci-libs/lapack-reference-${PV}
>=sci-libs/atlas-3.10.1[lapack]
>=sci-libs/mkl-11.0
@@ -21,3 +24,12 @@ RDEPEND="|| (
)
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.ebuild b/virtual/lapack/lapack-3.5.ebuild
index 226cf9714..ea254e512 100644
--- a/virtual/lapack/lapack-3.5.ebuild
+++ b/virtual/lapack/lapack-3.5.ebuild
@@ -2,7 +2,7 @@
# Distributed under the terms of the GNU General Public License v2
# $Header: $
-EAPI=2
+EAPI=5
DESCRIPTION="Virtual for Linear Algebra Package FORTRAN 77 implementation"
HOMEPAGE=""
@@ -19,3 +19,13 @@ RDEPEND="|| (
)
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/metadata.xml b/virtual/lapack/metadata.xml
index de50c1f99..e16cd365b 100644
--- a/virtual/lapack/metadata.xml
+++ b/virtual/lapack/metadata.xml
@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="UTF-8"?>
<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
<pkgmetadata>
-<herd>sci</herd>
-<longdescription lang="en">
+ <herd>sci</herd>
+ <longdescription lang="en">
Gentoo virtual package for the Linear Algebra PACKAge
FORTRAN 77 implementation. The version number corresponds to the
version of the LAPACK reference implementation.