aboutsummaryrefslogtreecommitdiff
path: root/dev-ml
diff options
context:
space:
mode:
authorJustin Lecher <jlec@gentoo.org>2013-02-22 11:22:45 +0100
committerJustin Lecher <jlec@gentoo.org>2013-02-22 11:22:45 +0100
commit6eecfc495aefe047b4e9aa2709d23672c692870e (patch)
treead6a4d7a6f8663116629e8fd5201df15c429269c /dev-ml
parentMerge branch 'master' of github.com:gentoo-science/sci (diff)
downloadsci-6eecfc495aefe047b4e9aa2709d23672c692870e.tar.gz
sci-6eecfc495aefe047b4e9aa2709d23672c692870e.tar.bz2
sci-6eecfc495aefe047b4e9aa2709d23672c692870e.zip
Revert "dev-ml/lacaml: Use tc-getPKG_CONFIG from toolchain-funcs.eclass instead of plain pkg-config"
This reverts commit feee3be41866e292a945d0494f9329dad2f43998.
Diffstat (limited to 'dev-ml')
-rw-r--r--dev-ml/lacaml/ChangeLog6
-rw-r--r--dev-ml/lacaml/lacaml-7.0.3.ebuild12
-rw-r--r--dev-ml/lacaml/metadata.xml4
3 files changed, 8 insertions, 14 deletions
diff --git a/dev-ml/lacaml/ChangeLog b/dev-ml/lacaml/ChangeLog
index d66dc0b54..d9eb022ae 100644
--- a/dev-ml/lacaml/ChangeLog
+++ b/dev-ml/lacaml/ChangeLog
@@ -1,11 +1,7 @@
# ChangeLog for dev-ml/lacaml
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
- 22 Feb 2013; Justin Lecher <jlec@gentoo.org> lacaml-7.0.3.ebuild,
- metadata.xml:
- Use tc-getPKG_CONFIG from toolchain-funcs.eclass instead of plain pkg-config
-
*lacaml-7.0.3 (28 Jul 2012)
28 Jul 2012; Guillaume Horel <guillaume.horel@gmail.com>
diff --git a/dev-ml/lacaml/lacaml-7.0.3.ebuild b/dev-ml/lacaml/lacaml-7.0.3.ebuild
index 1b6d6f541..ad9fbd152 100644
--- a/dev-ml/lacaml/lacaml-7.0.3.ebuild
+++ b/dev-ml/lacaml/lacaml-7.0.3.ebuild
@@ -1,12 +1,11 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2012 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
EAPI=4
OASIS_BUILD_DOCS=1
-
-inherit oasis toolchain-funcs
+inherit oasis
DESCRIPTION="BLAS/LAPACK interface for OCaml"
HOMEPAGE="http://forge.ocamlcore.org/projects/lacaml"
@@ -17,8 +16,7 @@ SLOT="0"
KEYWORDS="~x86"
IUSE=""
-RDEPEND="
- virtual/blas
+RDEPEND="virtual/blas
virtual/lapack"
DEPEND="${DEPEND}
virtual/pkgconfig"
@@ -29,10 +27,10 @@ src_prepare() {
if use doc; then
cp "${FILESDIR}/API.odocl" . || die
fi
- cclib="$($(tc-getPKG_CONFIG) --libs blas lapack)"
+ cclib="$(pkg-config --libs blas lapack)"
cclib="[$(echo $cclib|sed -e 's/\(-[a-z0-9]*\) /\"\1\"\;/g' -e \
's/\(-[a-z0-9]*\)$/\"\1\"/')]"
sed -i "s/cclib = \[\]/cclib = ${cclib}/" setup.conf
#would like to do the below, but doesn't work from ebuild
- #oasis_configure_opts="--override conf_cclib $($(tc-getPKG_CONFIG) --libs blas lapack)"
+ #oasis_configure_opts="--override conf_cclib $(pkg-config --libs blas lapack)"
}
diff --git a/dev-ml/lacaml/metadata.xml b/dev-ml/lacaml/metadata.xml
index e0b7a097d..8925df672 100644
--- a/dev-ml/lacaml/metadata.xml
+++ b/dev-ml/lacaml/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'>
BLAS/LAPACK-interface for OCaml
</longdescription>
</pkgmetadata>