commit: e8acaed31d2d3a383342acab203206286041386b Author: Alexis Ballier <aballier <AT> gentoo <DOT> org> AuthorDate: Tue Jan 19 11:31:25 2016 +0000 Commit: Alexis Ballier <aballier <AT> gentoo <DOT> org> CommitDate: Tue Jan 19 11:35:24 2016 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e8acaed3
dev-ml/ocamlgraph: bump to 1.8.6 Package-Manager: portage-2.2.27 Signed-off-by: Alexis Ballier <aballier <AT> gentoo.org> dev-ml/ocamlgraph/Manifest | 1 + .../files/ocamlgraph-1.8.6-installfindlib.patch | 38 +++++++++++++ dev-ml/ocamlgraph/ocamlgraph-1.8.6.ebuild | 62 ++++++++++++++++++++++ 3 files changed, 101 insertions(+) diff --git a/dev-ml/ocamlgraph/Manifest b/dev-ml/ocamlgraph/Manifest index 8b3693b..aa6e651 100644 --- a/dev-ml/ocamlgraph/Manifest +++ b/dev-ml/ocamlgraph/Manifest @@ -1,2 +1,3 @@ DIST ocamlgraph-0.99b.tar.gz 175958 SHA256 c4a646cfd152791268d9c2716c5e1c55bf3f39e8637a85f3c3937e3dd4dafec7 SHA512 1301d766679f59714d2adee1cb8cf31ebcc23f1fd425927dc6fd0c23e18849aaf93f04f3d694ea2e05f9570e8ec03734d96abb2668339b45b273e9d78197c0f9 WHIRLPOOL 96a805dcc9ccab532d6590b112f61f255bb7e320990497abea49fed908735671558fa2d83e586322cac7249bf206830ca816efac25ee64776376a49da7f4f341 DIST ocamlgraph-1.8.5.tar.gz 269438 SHA256 d167466435a155c779d5ec25b2db83ad851feb42ebc37dca8ffa345ddaefb82f SHA512 e3bf7f43f7b5167cbd23ea44a510d1a569d35771882ab7ae83bacc73822c5f4c944f62c95e0efa813b765e1e385a6b3ebff342cbf1c5589c73d022b8591a52dc WHIRLPOOL d25e124c2814e3196a441e706ca91a0429ab48669309c5dec2ae6697e48064ce54efc9d24440d9e52f3a1af8cfdd5c3ae04cd549fde4e9abc860a3506bd2de8d +DIST ocamlgraph-1.8.6.tar.gz 273615 SHA256 bd75ef4de817e430c9d8982561971c8943bb103f4402db01cc2fecaf58f2dbef SHA512 2e6060d008880ac916257bcf3ea73138b0a56aa64d846ab6cc9c7c3c660bba2a394e5c5133badb33babf9f0030b553196b38b5ab1ab288eb4f5eff1442d89b26 WHIRLPOOL 873407c29cc4db33bb3def4d10cd0529a04df0e580b0c77377560abc74c4f585ef8c2d6aa703cc48c54acf324e8e641d87f0e5dd6876cb5066262e7636f3f33e diff --git a/dev-ml/ocamlgraph/files/ocamlgraph-1.8.6-installfindlib.patch b/dev-ml/ocamlgraph/files/ocamlgraph-1.8.6-installfindlib.patch new file mode 100644 index 0000000..cb980b6 --- /dev/null +++ b/dev-ml/ocamlgraph/files/ocamlgraph-1.8.6-installfindlib.patch @@ -0,0 +1,38 @@ +Index: ocamlgraph-1.8.6/Makefile.in +=================================================================== +--- ocamlgraph-1.8.6.orig/Makefile.in ++++ ocamlgraph-1.8.6/Makefile.in +@@ -421,21 +421,25 @@ ifdef DESTDIR + OCAMLFINDDEST := -destdir $(DESTDIR) + endif + ++ifneq ($(WANT_OCAMLOPT),no) ++INSTALL_OPT=graph$(LIBEXT) graph.cmx $(CMXA) ++INSTALL_GTK_OPT=$(VIEWER_CMXLIB) $(VIEWER_CMXLIB:.cmx=.o) $(DGRAPH_CMXLIB) $(DGRAPH_CMXLIB:.cmx=.o) graph$(OBJEXT) ++endif ++ + install-findlib: META + ifdef OCAMLFIND +-ifeq (@LABLGNOMECANVAS@,yes) ++ifeq ($(WANT_GTK),yes) + $(OCAMLFIND) install $(OCAMLFINDDEST) ocamlgraph META \ + $(SRCDIR)/*.mli $(VIEWER_DIR)/*.mli $(DGRAPH_DIR)/*.mli \ +- graph$(OBJEXT) graph$(LIBEXT) graph.cmx graph.cmo graph.cmi \ +- $(CMA) $(CMXA) \ +- $(VIEWER_CMXLIB) $(VIEWER_CMOLIB) $(VIEWER_CMILIB) \ +- $(VIEWER_CMXLIB:.cmx=.o) \ +- $(DGRAPH_CMXLIB) $(DGRAPH_CMOLIB) $(DGRAPH_CMILIB) \ +- $(DGRAPH_CMXLIB:.cmx=.o) ++ $(INSTALL_OPT) graph.cmo graph.cmi \ ++ $(CMA) \ ++ $(INSTALL_GTK_OPT) \ ++ $(VIEWER_CMOLIB) $(VIEWER_CMILIB) \ ++ $(DGRAPH_CMOLIB) $(DGRAPH_CMILIB) + else + $(OCAMLFIND) install $(OCAMLFINDDEST) ocamlgraph META \ + $(SRCDIR)/*.mli $(VIEWER_DIR)/*.mli $(DGRAPH_DIR)/*.mli \ +- graph$(LIBEXT) graph.cmx graph.cmo graph.cmi $(CMA) $(CMXA) ++ $(INSTALL_OPT) graph.cmo graph.cmi $(CMA) + endif + endif + diff --git a/dev-ml/ocamlgraph/ocamlgraph-1.8.6.ebuild b/dev-ml/ocamlgraph/ocamlgraph-1.8.6.ebuild new file mode 100644 index 0000000..efa355e --- /dev/null +++ b/dev-ml/ocamlgraph/ocamlgraph-1.8.6.ebuild @@ -0,0 +1,62 @@ +# Copyright 1999-2014 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 +# $Id$ + +EAPI=5 + +inherit findlib eutils + +DESCRIPTION="O'Caml Graph library" +HOMEPAGE="http://ocamlgraph.lri.fr/index.en.html"; +SRC_URI="http://ocamlgraph.lri.fr/download/${P}.tar.gz"; +LICENSE="LGPL-2.1" +SLOT="0/${PV}" +KEYWORDS="~amd64 ~ppc ~x86" +RDEPEND=">=dev-lang/ocaml-3.10.2:=[ocamlopt?] + gtk? ( dev-ml/lablgtk:=[gnomecanvas,ocamlopt?] )" +DEPEND="${RDEPEND} + doc? ( dev-tex/hevea dev-ml/ocamlweb )" +IUSE="doc examples gtk +ocamlopt" + +src_prepare() { + epatch "${FILESDIR}/${P}-installfindlib.patch" +} + +src_compile() { + emake byte + use ocamlopt && emake opt + + if use doc; then + emake doc + fi + + if use gtk; then + emake OCAMLBEST=$(usex ocamlopt opt byte) viewer dgraph editor + fi +} + +src_install() { + findlib_src_preinst + use ocamlopt || export WANT_OCAMLOPT=no + use gtk && export WANT_GTK=yes + emake install-findlib + + if use gtk ; then + local ext=byte + use ocamlopt && ext=opt + newbin dgraph/dgraph.${ext} ${PN}-dgraph + newbin editor/editor.${ext} ${PN}-editor + newbin view_graph/viewgraph.${ext} ${PN}-viewgraph + fi + + dodoc README CREDITS FAQ CHANGES + if use doc; then + dohtml doc/* + fi + + if use examples; then + insinto /usr/share/doc/${PF} + doins -r examples + docompress -x /usr/share/doc/${PF}/examples + fi +}
