aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat (limited to 'dev-ml/zarith')
-rw-r--r--dev-ml/zarith/ChangeLog7
-rw-r--r--dev-ml/zarith/Manifest2
-rw-r--r--dev-ml/zarith/files/zarith-1.0-bytecode.patch31
-rw-r--r--dev-ml/zarith/files/zarith-1.0-optnotrequired.patch22
-rw-r--r--dev-ml/zarith/zarith-1.1.ebuild (renamed from dev-ml/zarith/zarith-1.0.ebuild)28
5 files changed, 16 insertions, 74 deletions
diff --git a/dev-ml/zarith/ChangeLog b/dev-ml/zarith/ChangeLog
index 7c3b19f2d..94e752916 100644
--- a/dev-ml/zarith/ChangeLog
+++ b/dev-ml/zarith/ChangeLog
@@ -2,6 +2,13 @@
# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+*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,
+ +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,
diff --git a/dev-ml/zarith/Manifest b/dev-ml/zarith/Manifest
index f8612f14d..5ba03d9d8 100644
--- a/dev-ml/zarith/Manifest
+++ b/dev-ml/zarith/Manifest
@@ -1 +1 @@
-DIST zarith-1.0.tgz 66484 RMD160 468d94aa9ef83ceba313afc5d4b8954d86fe6289 SHA1 11c86c5403f44f596e4785be3ff71f76aa84c28e SHA256 1531680808d79f83869db581bf389e7bc07f7ee9c1eb132c057eb30cf3a8d25c
+DIST zarith-1.1.tgz 68383 SHA256 a0ba322c8d4f5bffa43f1c571e839baa0c7b155b67630bbd8481df21eb636b6e SHA512 60f36282eb5721df164437a0b24f36b601639914b4369ed0b9ca089fda1e75191163c1c57a3890f6f9c92c64eb99f9092f045822223c448298eccf9baed535e5 WHIRLPOOL 5671caa5f942084215d52f691257fb40229607f6394ad1a1e4c932df3cf3c0bcf598caf72dc16a23c849e2bba4e9caaad659a186475ea0173b78fad6799bd859
diff --git a/dev-ml/zarith/files/zarith-1.0-bytecode.patch b/dev-ml/zarith/files/zarith-1.0-bytecode.patch
deleted file mode 100644
index 2de677214..000000000
--- a/dev-ml/zarith/files/zarith-1.0-bytecode.patch
+++ /dev/null
@@ -1,31 +0,0 @@
---- project.mak.orig 2011-11-14 18:18:05.702705850 -0500
-+++ project.mak 2011-11-14 18:18:58.142704311 -0500
-@@ -23,12 +23,14 @@
-
- CMIOBJ = $(MLISRC:%.mli=%.cmi)
- TOINSTALL = zarith.a zarith.cma zarith.cmxa zarith.cmxs libzarith.a $(MLISRC) $(CMIOBJ)
--
-+TOINSTALLbyte = zarith.cma libzarith.a $(MLISRC) $(CMIOBJ)
-
- # build targets
- ###############
-
--all: $(TOINSTALL) test
-+all: $(TOINSTALL)
-+
-+all-byte: $(TOINSTALLbyte)
-
- zarith.cma: $(MLSRC:%.ml=%.cmo)
- $(OCAMLMKLIB) -o zarith $+ $(LIBS)
-@@ -80,8 +82,9 @@
-
- ifeq ($(INSTMETH),findlib)
- install:
-- $(OCAMLFIND) install -destdir $(INSTALLDIR) zarith META $(TOINSTALL) dllzarith.so
--
-+ $(OCAMLFIND) install zarith META $(TOINSTALL) dllzarith.so
-+install-byte:
-+ $(OCAMLFIND) install zarith META $(TOINSTALLbyte) dllzarith.so
- uninstall:
- $(OCAMLFIND) remove -destdir $(INSTALLDIR) zarith
- endif
diff --git a/dev-ml/zarith/files/zarith-1.0-optnotrequired.patch b/dev-ml/zarith/files/zarith-1.0-optnotrequired.patch
deleted file mode 100644
index 2bd1b4df8..000000000
--- a/dev-ml/zarith/files/zarith-1.0-optnotrequired.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-From: Mehdi Dogguy <mehdi@debian.org>
-Date: Sun, 2 Oct 2011 11:53:22 +0200
-Subject: [PATCH] ocamlopt is not really required
-
----
- configure | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/configure b/configure
-index 5bd80d3..980aedd 100755
---- a/configure
-+++ b/configure
-@@ -186,7 +186,7 @@ checkcc()
-
- searchbinreq $ocaml
- searchbinreq $ocamlc
--searchbinreq $ocamlopt
-+searchbin $ocamlopt
- searchbinreq $ocamldep
- searchbinreq $ocamlmklib
- searchbinreq $ocamldoc
---
diff --git a/dev-ml/zarith/zarith-1.0.ebuild b/dev-ml/zarith/zarith-1.1.ebuild
index 49a1b3c2b..8d208bef8 100644
--- a/dev-ml/zarith/zarith-1.0.ebuild
+++ b/dev-ml/zarith/zarith-1.1.ebuild
@@ -8,37 +8,29 @@ inherit findlib eutils
DESCRIPTION="Arithmetic and logic operations over arbitrary-precision integers"
HOMEPAGE="https://forge.ocamlcore.org/projects/zarith/"
-SRC_URI="http://forge.ocamlcore.org/frs/download.php/683/${P}.tgz"
+SRC_URI="http://forge.ocamlcore.org/frs/download.php/835/${P}.tgz"
LICENSE="LGPL-2.1-linking-exception"
SLOT="0"
KEYWORDS="~amd64 ~x86"
-IUSE="debug doc mpir +ocamlopt"
+IUSE="doc mpir +ocamlopt"
RDEPEND=">=dev-lang/ocaml-3.12.1[ocamlopt?]
!mpir? ( dev-libs/gmp )
mpir? ( sci-libs/mpir )"
-DEPEND="${DEPEND}
+DEPEND="${RDEPEND}
dev-lang/perl"
-src_prepare() {
- epatch "${FILESDIR}/${P}-optnotrequired.patch"
- epatch "${FILESDIR}/${P}-bytecode.patch"
-}
-
src_configure() {
- MY_OPTS="-ocamllibdir /usr/$(get_libdir) -installdir ${D}"
+ MY_OPTS="-ocamllibdir /usr/$(get_libdir) -installdir \
+ ${D}/usr/$(get_libdir)/ocaml"
use mpir && MY_OPTS="${MY_OPTS} -mpir"
./configure ${MY_OPTS}|| die
}
src_compile() {
- if use ocamlopt; then
- emake all
- else
- emake all-byte
- fi
+ emake all
use doc && emake doc
}
@@ -52,11 +44,7 @@ src_test() {
src_install() {
findlib_src_preinst
- if use ocamlopt; then
- emake install
- else
- emake install-byte
- fi
- dodoc README
+ emake install
+ dodoc Changes README
use doc && dodoc -r html/
}