Gentoo Archives: gentoo-commits

From: Guillaume Horel <guillaume.horel@×××××.com>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/sci:master commit in: dev-ml/lacaml/
Date: Fri, 30 Mar 2012 00:23:32
Message-Id: 1333066267.746048cf38c3ed125b92dc20e085218ec1021862.guillaume_horel@gentoo
1 commit: 746048cf38c3ed125b92dc20e085218ec1021862
2 Author: Guillaume Horel <guillaume.horel <AT> gmail <DOT> com>
3 AuthorDate: Fri Mar 30 00:11:07 2012 +0000
4 Commit: Guillaume Horel <guillaume.horel <AT> gmail <DOT> com>
5 CommitDate: Fri Mar 30 00:11:07 2012 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=746048cf
7
8 [dev-ml/lacaml] moved to new oasis eclass
9
10 ---
11 dev-ml/lacaml/ChangeLog | 3 ++
12 dev-ml/lacaml/lacaml-6.0.4.ebuild | 39 +++++++++++++++---------------------
13 2 files changed, 19 insertions(+), 23 deletions(-)
14
15 diff --git a/dev-ml/lacaml/ChangeLog b/dev-ml/lacaml/ChangeLog
16 index d3d8095..0f5b40f 100644
17 --- a/dev-ml/lacaml/ChangeLog
18 +++ b/dev-ml/lacaml/ChangeLog
19 @@ -2,6 +2,9 @@
20 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
21 # $Header: $
22
23 + 30 Mar 2012; Guillaume Horel <guillaume.horel@×××××.com> lacaml-6.0.4.ebuild:
24 + moved to new oasis eclass
25 +
26 *lacaml-6.0.4 (02 Mar 2012)
27
28 02 Mar 2012; Guillaume Horel <guillaume.horel@×××××.com>
29
30 diff --git a/dev-ml/lacaml/lacaml-6.0.4.ebuild b/dev-ml/lacaml/lacaml-6.0.4.ebuild
31 index 00c7a9a..c0439cd 100644
32 --- a/dev-ml/lacaml/lacaml-6.0.4.ebuild
33 +++ b/dev-ml/lacaml/lacaml-6.0.4.ebuild
34 @@ -4,7 +4,8 @@
35
36 EAPI=4
37
38 -inherit eutils findlib
39 +OASIS_BUILD_DOCS=1
40 +inherit oasis
41
42 DESCRIPTION="BLAS/LAPACK interface for OCaml"
43 HOMEPAGE="http://forge.ocamlcore.org/projects/lacaml"
44 @@ -13,28 +14,20 @@ SRC_URI="http://forge.ocamlcore.org/frs/download.php/806/${P}.tar.gz"
45 LICENSE="LGPL-2.1-linking-exception"
46 SLOT="0"
47 KEYWORDS="~x86"
48 -IUSE="doc"
49 +IUSE=""
50
51 -DEPEND="dev-lang/ocaml[ocamlopt]
52 - virtual/blas
53 +RDEPEND="virtual/blas
54 virtual/lapack"
55 -RDEPEND="${DEPEND}"
56 -
57 -src_configure() {
58 - ocaml setup.ml -configure \
59 - --override conf_cclib "$(pkg-config --libs blas) \
60 -$(pkg-config --libs lapack)" \
61 - --destdir "${ED}" \
62 - --prefix "/usr" \
63 - --docdir "/usr/share/${PF}/doc" || die "configuration failed"
64 -}
65 -
66 -src_compile() {
67 - emake
68 - use doc && emake doc
69 -}
70 -
71 -src_install() {
72 - findlib_src_install
73 - dodoc README.txt Changelog
74 +DEPEND="${DEPEND}
75 + dev-util/pkgconfig"
76 +
77 +DOCS=( "README.txt" "Changelog" )
78 +
79 +src_prepare() {
80 + cclib="$(pkg-config --libs blas lapack)"
81 + cclib="[$(echo $cclib|sed -e 's/\(-[a-z0-9]*\) /\"\1\"\;/g' -e \
82 + 's/\(-[a-z0-9]*\)$/\"\1\"/')]"
83 + sed -i "s/cclib = \[\]/cclib = ${cclib}/" setup.conf
84 + #would like to do the below, but doesn't work from ebuild
85 + #oasis_configure_opts="--override conf_cclib $(pkg-config --libs blas atlas)
86 }