dev-ml/lacaml version bump and cleanup old version

5 files changed, 17 insertions, 47 deletions

diff --git a/dev-ml/lacaml/ChangeLog b/dev-ml/lacaml/ChangeLog
index 0f5b40fee..d9eb022ae 100644
--- a/dev-ml/lacaml/ChangeLog
+++ b/dev-ml/lacaml/ChangeLog
@@ -2,6 +2,13 @@
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
+*lacaml-7.0.3 (28 Jul 2012)
+
+  28 Jul 2012; Guillaume Horel <guillaume.horel@gmail.com>
+  -lacaml-5.5.2.ebuild, -lacaml-6.0.4.ebuild, +lacaml-7.0.3.ebuild,
+  +files/API.odocl:
+  version bump and remove old versions
+
   30 Mar 2012; Guillaume Horel <guillaume.horel@gmail.com> lacaml-6.0.4.ebuild:
   moved to new oasis eclass
 
diff --git a/dev-ml/lacaml/Manifest b/dev-ml/lacaml/Manifest
index 7cff51881..0b14f909a 100644
--- a/dev-ml/lacaml/Manifest
+++ b/dev-ml/lacaml/Manifest
@@ -1,2 +1 @@
-DIST lacaml-5.5.2.tar.bz2 91218 SHA256 433a502f6ebb325e6965b63a267667549d1d0786dbf8f472c36f8df941074b29 SHA512 b65c6e2755ce2c4a05f5010c59c26417e309f07cc4c0e019f33d80b24158e00a5cbbd9e5f7c4bd490e0b8160df4d3d4fcb7ab3b4f52541311ac020ed9e7881db WHIRLPOOL 387cda520a3e1c29ae6e13f88d83f7f63e717ebe0b8508f001c88847b3c4404a3baa5ab030753f5d1493666e8c5f85cd21137cf11f945873e9953948ff8888ee
-DIST lacaml-6.0.4.tar.gz 311807 SHA256 093e42deaf06bba2950c3a6b50c6b10ed215323f070bce3ea97b9577f278c7b6 SHA512 76d7915e8032afd860538cd59b3d5900a172482daef17c227213e19d5137acde6caec1ab83952b95b860d9b7821901b7b7b7f06ea044b4d0b71fbb7f970b18c6 WHIRLPOOL ceb57fc59624e4a418f055b461da47d68473bce8ca97897cbc6c0da220031ef6fff6fcb5027dabf01f44a797ceb25580a157eda92b6f0a85513f700bd870bead
+DIST lacaml-7.0.3.tar.gz 151742 SHA256 3ebd0b35ae0e4fe5cc5483e61a8bf1fb46ef8fed60f5c89a09e589b91b7ec982 SHA512 5f9267e64e5e2a858ba57b34ea41d64ae8724b5a6a9f9d81b6b2f2d4daeb42eb060f2b18d040d559a1baf356518c93c05db0a00af5bbf34084029e27320ad5b7 WHIRLPOOL 7af11d10e246850e2c1f39f3862b9269d783f2599cd7acd86e75662a5bf43bd2487e3ae3de2374070ea799aaef1377792d9d2d14c268742b8bf1a91975b4a2a9
diff --git a/dev-ml/lacaml/files/API.odocl b/dev-ml/lacaml/files/API.odocl
new file mode 100644
index 000000000..4e6cc95b8
--- /dev/null
+++ b/dev-ml/lacaml/files/API.odocl
@@ -0,0 +1 @@
+lib/Lacaml
diff --git a/dev-ml/lacaml/lacaml-5.5.2.ebuild b/dev-ml/lacaml/lacaml-5.5.2.ebuild
deleted file mode 100644
index 8a17c7f71..000000000
--- a/dev-ml/lacaml/lacaml-5.5.2.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: $
-
-EAPI=4
-
-inherit eutils findlib
-
-DESCRIPTION="BLAS/LAPACK interface for OCaml"
-HOMEPAGE="http://www.ocaml.info/home/ocaml_sources.html"
-SRC_URI="http://hg.ocaml.info/release/${PN}/archive/release-${PV}.tar.bz2
--> ${P}.tar.bz2"
-
-LICENSE="LGPL-2.1-linking-exception"
-SLOT="0"
-KEYWORDS="~x86"
-IUSE="doc"
-
-DEPEND="dev-lang/ocaml[ocamlopt]
-	virtual/blas
-	virtual/lapack"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${PN}-release-${PV}"
-
-src_prepare() {
-	sed -i -e "s/blas/$(pkg-config --libs blas|sed s/-l//g)/" \
-		   -e "s/lapack/$(pkg-config --libs lapack|sed s/-l//g)/" Makefile.conf ||die
-}
-
-src_compile() {
-	emake
-	use doc && emake doc
-}
-
-src_install() {
-	findlib_src_install
-	dodoc README.txt Changelog
-	use doc && dodoc -r doc/lacaml/html doc/lacaml/latex
-}
diff --git a/dev-ml/lacaml/lacaml-6.0.4.ebuild b/dev-ml/lacaml/lacaml-7.0.3.ebuild
index c0439cd33..ad9fbd152 100644
--- a/dev-ml/lacaml/lacaml-6.0.4.ebuild
+++ b/dev-ml/lacaml/lacaml-7.0.3.ebuild
@@ -9,9 +9,9 @@ inherit oasis
 
 DESCRIPTION="BLAS/LAPACK interface for OCaml"
 HOMEPAGE="http://forge.ocamlcore.org/projects/lacaml"
-SRC_URI="http://forge.ocamlcore.org/frs/download.php/806/${P}.tar.gz"
+SRC_URI="https://bitbucket.org/mmottl/lacaml/downloads/${P}.tar.gz"
 
-LICENSE="LGPL-2.1-linking-exception"
+LICENSE="LGPL-2.1-with-linking-exception"
 SLOT="0"
 KEYWORDS="~x86"
 IUSE=""
@@ -19,15 +19,18 @@ IUSE=""
 RDEPEND="virtual/blas
 	virtual/lapack"
 DEPEND="${DEPEND}
-	dev-util/pkgconfig"
+	virtual/pkgconfig"
 
-DOCS=( "README.txt" "Changelog" )
+DOCS=( "README.md" "CHANGES.txt" "TODO.md" )
 
 src_prepare() {
+	if use doc; then
+		cp "${FILESDIR}/API.odocl" . || die
+	fi
 	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 $(pkg-config --libs blas atlas)
+	#oasis_configure_opts="--override conf_cclib $(pkg-config --libs blas lapack)"
 }