dev-ml/zarith: initial commit

4 files changed, 41 insertions, 55 deletions

diff --git a/dev-ml/zarith/ChangeLog b/dev-ml/zarith/ChangeLog
index f0789a3ce..51d9f4486 100644
--- a/dev-ml/zarith/ChangeLog
+++ b/dev-ml/zarith/ChangeLog
@@ -1,21 +1,8 @@
 # ChangeLog for dev-ml/zarith
-# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
-  11 Aug 2012; Guillaume Horel <guillaume.horel@gmail.com> zarith-1.1.ebuild:
-  fix license and depend on multilib eclass
-
-*zarith-1.1 (30 Mar 2012)
-
-  30 Mar 2012; Guillaume Horel <guillaume.horel@gmail.com> -zarith-1.0.ebuild,
-  -files/zarith-1.0-bytecode.patch, -files/zarith-1.0-optnotrequired.patch,
+  14 Jan 2013; J.-C. Demay <jcdemay@gmail.com>
   +zarith-1.1.ebuild:
-  version bump
-
-*zarith-1.0 (02 Mar 2012)
-
-  02 Mar 2012; Guillaume Horel <guillaume.horel@gmail.com> +zarith-1.0.ebuild,
-  +files/zarith-1.0-bytecode.patch, +files/zarith-1.0-optnotrequired.patch,
-  +metadata.xml:
-  initial import
+  initial commit
 
diff --git a/dev-ml/zarith/Manifest b/dev-ml/zarith/Manifest
index 5ba03d9d8..2e431650c 100644
--- a/dev-ml/zarith/Manifest
+++ b/dev-ml/zarith/Manifest
@@ -1 +1,4 @@
 DIST zarith-1.1.tgz 68383 SHA256 a0ba322c8d4f5bffa43f1c571e839baa0c7b155b67630bbd8481df21eb636b6e SHA512 60f36282eb5721df164437a0b24f36b601639914b4369ed0b9ca089fda1e75191163c1c57a3890f6f9c92c64eb99f9092f045822223c448298eccf9baed535e5 WHIRLPOOL 5671caa5f942084215d52f691257fb40229607f6394ad1a1e4c932df3cf3c0bcf598caf72dc16a23c849e2bba4e9caaad659a186475ea0173b78fad6799bd859
+EBUILD zarith-1.1.ebuild 996 SHA256 8870a7c4d815a475711cbd0e7ab752a707cab028642c20fa1f56296db60d84f9 SHA512 71c6b10abf237818acbb87b379496d6da96247b11717f57a8a8f0b9a174d4f943469e7972b8cfec0e0014897fe54aea2422ba29886fa6ec53e16a1a4d79c9ede WHIRLPOOL dfb796f709914ad9b9f7dc24ee438f30b9dd8fff610010351d41f3d4c95ad67d725741011c98240ca30232a97064dae313761a16887f2d77b1b691285bea4508
+MISC ChangeLog 201 SHA256 9f3fca09e091ca62ee913a3a31991b1619e6cd359be9b8fec854c789a662b2bc SHA512 860a0454dd8b97d9cf700bfd287f9708c4b8451dc4f5f09b8fc39cb6576e4129efdde0d6a9ef3695409b980e30e55c668cb07273336682d72e996f17bba22d6b WHIRLPOOL cceda1002b2bc2fcf458fe0c5f3f27eb8c184bc718fcfa3b6c7244d0691d92d5ebe306f7dfe9f19385a2ee08e6c56d79dc17396727ab2cd1528307e9412edbca
+MISC metadata.xml 576 SHA256 f2e3b72798b53b5cc8de7f84bb15a4f936b202798dff0924a8dc3153fc02eba3 SHA512 fabad704c895e72ced7561f1e5db01869f3b5b7ecca6d96d3a1474e7febad1170a8ad9087346aa8caf8741a5cd719290567581297ef452cb1eb94f706cb14e6e WHIRLPOOL 15466f22d6b3f39bc2c294a642dccc215a34c84325443b385a9e4aeccef0e8a178b389ce76380769edd55992d6e665b8f440236a132141b85a8885d26d2de108
diff --git a/dev-ml/zarith/metadata.xml b/dev-ml/zarith/metadata.xml
index a87c2ac5f..d2e969145 100644
--- a/dev-ml/zarith/metadata.xml
+++ b/dev-ml/zarith/metadata.xml
@@ -1,11 +1,17 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci</herd>
-<longdescription lang='en'>
-Arithmetic and logic operations over arbitrary-precision integers in Ocaml
-</longdescription>
-<use>
-<flag name='mpir'>Use mpir library instead of gmp</flag>
-</use>
+	<herd>sci</herd>
+	<longdescription>
+		The Zarith library implements arithmetic and logical operations over
+		arbitrary-precision integers. It uses GMP to efficiently implement
+		arithmetic over big integers. Small integers are represented as Caml
+		unboxed integers, for speed and space economy.
+	</longdescription>
+	<maintainer>
+  		<email>sci@gentoo.org</email>
+	</maintainer>
+	<use>
+		<flag name="ocamlopt">?ocamlopt?</flag>
+	</use>
 </pkgmetadata>
diff --git a/dev-ml/zarith/zarith-1.1.ebuild b/dev-ml/zarith/zarith-1.1.ebuild
index 7afe5723b..795378fb7 100644
--- a/dev-ml/zarith/zarith-1.1.ebuild
+++ b/dev-ml/zarith/zarith-1.1.ebuild
@@ -1,50 +1,40 @@
-# Copyright 1999-2012 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="4"
+EAPI=4
 
-inherit findlib multilib
-
-DESCRIPTION="Arithmetic and logic operations over arbitrary-precision integers"
-HOMEPAGE="https://forge.ocamlcore.org/projects/zarith/"
+DESCRIPTION="The Zarith library implements arithmetic and logical operations over arbitrary-precision integers"
+HOMEPAGE="http://forge.ocamlcore.org/projects/zarith"
 SRC_URI="http://forge.ocamlcore.org/frs/download.php/835/${P}.tgz"
 
-LICENSE="LGPL-2.1-with-linking-exception"
+LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="doc mpir +ocamlopt"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE="+ocamlopt"
 
-RDEPEND=">=dev-lang/ocaml-3.12.1[ocamlopt?]
-!mpir? ( dev-libs/gmp )
-mpir? ( sci-libs/mpir )"
+OCAMLDIR=`ocamlc -where`
 
-DEPEND="${RDEPEND}
-dev-lang/perl"
+DEPEND=">=dev-lang/ocaml-3.10.2[ocamlopt?]
+		dev-libs/gmp"
+RDEPEND="${DEPEND}"
 
-src_configure() {
-	MY_OPTS="-ocamllibdir /usr/$(get_libdir) -installdir \
-	${D}/usr/$(get_libdir)/ocaml"
-	use mpir && MY_OPTS="${MY_OPTS} -mpir"
-	./configure ${MY_OPTS}|| die
+src_prepare(){
+	sed -i ${S}/project.mak -e "s:(OCAMLFIND) install:(OCAMLFIND) install -ldconf \$(INSTALLDIR)/ld.conf:g"
 }
 
-src_compile() {
-	emake all
-	use doc && emake doc
+src_configure(){
+    ./configure -installdir "${D}${OCAMLDIR}" || die "configure failed"
 }
 
-src_test() {
-	if use ocamlopt; then
-		emake test;LD_LIBRARY_PATH="." ./test || die
-	else
-		emake test.b;LD_LIBRARY_PATH="." ./test.b || die
-	fi
+src_compile(){
+	emake || die "emake failed"
 }
 
-src_install() {
-	findlib_src_preinst
-	emake install
+src_install(){
+	mkdir -p "${D}${OCAMLDIR}"
+	cp "${OCAMLDIR}/ld.conf" "${D}${OCAMLDIR}/ld.conf"
+	emake install || die "emake install failed"
+	rm "${D}${OCAMLDIR}/ld.conf"
 	dodoc Changes README
-	use doc && dodoc -r html/
 }