public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] repo/gentoo:master commit in: dev-ml/ocamlgraph/, dev-ml/ocamlgraph/files/
@ 2016-01-19 11:35 Alexis Ballier
  0 siblings, 0 replies; 4+ messages in thread
From: Alexis Ballier @ 2016-01-19 11:35 UTC (permalink / raw
  To: gentoo-commits

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
+}


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-ml/ocamlgraph/, dev-ml/ocamlgraph/files/
@ 2016-12-13 13:57 Alexis Ballier
  0 siblings, 0 replies; 4+ messages in thread
From: Alexis Ballier @ 2016-12-13 13:57 UTC (permalink / raw
  To: gentoo-commits

commit:     3fbe9da179920cfcdc2557d7a98dcade676a0b23
Author:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Tue Dec 13 13:53:39 2016 +0000
Commit:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Tue Dec 13 13:53:39 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3fbe9da1

dev-ml/ocamlgraph: remove old

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 dev-ml/ocamlgraph/Manifest                         |  2 -
 .../files/ocamlgraph-1.8.5-installfindlib.patch    | 38 -------------
 dev-ml/ocamlgraph/ocamlgraph-1.8.5.ebuild          | 62 ----------------------
 dev-ml/ocamlgraph/ocamlgraph-1.8.6.ebuild          | 62 ----------------------
 4 files changed, 164 deletions(-)

diff --git a/dev-ml/ocamlgraph/Manifest b/dev-ml/ocamlgraph/Manifest
index 63e11e7..c876c57 100644
--- a/dev-ml/ocamlgraph/Manifest
+++ b/dev-ml/ocamlgraph/Manifest
@@ -1,4 +1,2 @@
 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
 DIST ocamlgraph-1.8.7.tar.gz 272625 SHA256 df06ca06d25231bb8e162d6b853177cb7fc1565c8f1ec99ca051727d46c985a0 SHA512 27559293bf576ecc9cf49090e24905c50d00ebaeb444a3c917826f3cfe1e7ceab34b43e30f98634811b1688b675d8747b590b5bb103a720d099304f5031feb2e WHIRLPOOL 3b290012a97c96c75b1b63dec056c7afb6d7c1882fc61fd3a88b32397a2e871aa9e872950e6a6e7333450f3b46181df6e27f4fc3464e5c9a3776285a904d4727

diff --git a/dev-ml/ocamlgraph/files/ocamlgraph-1.8.5-installfindlib.patch b/dev-ml/ocamlgraph/files/ocamlgraph-1.8.5-installfindlib.patch
deleted file mode 100644
index 30eb937..00000000
--- a/dev-ml/ocamlgraph/files/ocamlgraph-1.8.5-installfindlib.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-Index: ocamlgraph-1.8.5/Makefile.in
-===================================================================
---- ocamlgraph-1.8.5.orig/Makefile.in
-+++ ocamlgraph-1.8.5/Makefile.in
-@@ -417,21 +417,25 @@ ifeq (@LABLGNOMECANVAS@,yes)
- 	cp -f $(VIEWER_DIR)/*.mli $(DGRAPH_DIR)/*.mli $(INSTALL_LIBDIR)
- 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 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 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.5.ebuild b/dev-ml/ocamlgraph/ocamlgraph-1.8.5.ebuild
deleted file mode 100644
index efa355e..00000000
--- a/dev-ml/ocamlgraph/ocamlgraph-1.8.5.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# 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
-}

diff --git a/dev-ml/ocamlgraph/ocamlgraph-1.8.6.ebuild b/dev-ml/ocamlgraph/ocamlgraph-1.8.6.ebuild
deleted file mode 100644
index efa355e..00000000
--- a/dev-ml/ocamlgraph/ocamlgraph-1.8.6.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# 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
-}


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-ml/ocamlgraph/, dev-ml/ocamlgraph/files/
@ 2017-01-26 11:43 Alexis Ballier
  0 siblings, 0 replies; 4+ messages in thread
From: Alexis Ballier @ 2017-01-26 11:43 UTC (permalink / raw
  To: gentoo-commits

commit:     161a823fe688ad9e03c828885362608a71971e9c
Author:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 26 11:41:41 2017 +0000
Commit:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Thu Jan 26 11:41:41 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=161a823f

dev-ml/ocamlgraph: remove old

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 dev-ml/ocamlgraph/Manifest                         |  1 -
 .../files/ocamlgraph-0.99b-installfindlib.patch    | 21 --------
 dev-ml/ocamlgraph/ocamlgraph-0.99b.ebuild          | 56 ----------------------
 3 files changed, 78 deletions(-)

diff --git a/dev-ml/ocamlgraph/Manifest b/dev-ml/ocamlgraph/Manifest
index c876c57..f8415c1 100644
--- a/dev-ml/ocamlgraph/Manifest
+++ b/dev-ml/ocamlgraph/Manifest
@@ -1,2 +1 @@
-DIST ocamlgraph-0.99b.tar.gz 175958 SHA256 c4a646cfd152791268d9c2716c5e1c55bf3f39e8637a85f3c3937e3dd4dafec7 SHA512 1301d766679f59714d2adee1cb8cf31ebcc23f1fd425927dc6fd0c23e18849aaf93f04f3d694ea2e05f9570e8ec03734d96abb2668339b45b273e9d78197c0f9 WHIRLPOOL 96a805dcc9ccab532d6590b112f61f255bb7e320990497abea49fed908735671558fa2d83e586322cac7249bf206830ca816efac25ee64776376a49da7f4f341
 DIST ocamlgraph-1.8.7.tar.gz 272625 SHA256 df06ca06d25231bb8e162d6b853177cb7fc1565c8f1ec99ca051727d46c985a0 SHA512 27559293bf576ecc9cf49090e24905c50d00ebaeb444a3c917826f3cfe1e7ceab34b43e30f98634811b1688b675d8747b590b5bb103a720d099304f5031feb2e WHIRLPOOL 3b290012a97c96c75b1b63dec056c7afb6d7c1882fc61fd3a88b32397a2e871aa9e872950e6a6e7333450f3b46181df6e27f4fc3464e5c9a3776285a904d4727

diff --git a/dev-ml/ocamlgraph/files/ocamlgraph-0.99b-installfindlib.patch b/dev-ml/ocamlgraph/files/ocamlgraph-0.99b-installfindlib.patch
deleted file mode 100644
index 5c68c0c..00000000
--- a/dev-ml/ocamlgraph/files/ocamlgraph-0.99b-installfindlib.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Index: ocamlgraph-0.99b/Makefile.in
-===================================================================
---- ocamlgraph-0.99b.orig/Makefile.in
-+++ ocamlgraph-0.99b/Makefile.in
-@@ -208,10 +208,14 @@ install-byte: 
- install-opt: install-byte
- 	cp -f graph$(LIBEXT) graph.cmx $(CMXA) "$(OCAMLLIB)"
- 
-+ifneq ($(OCAMLOPT),no)
-+INSTALL_OPT=graph$(LIBEXT) graph.cmx $(CMXA)
-+endif
-+
- install-findlib: META
- ifdef OCAMLFIND
--	$(OCAMLFIND) install ocamlgraph META *.mli \
--		graph$(LIBEXT) graph.cmx graph.cmo graph.cmi $(CMA) $(CMXA)
-+	$(OCAMLFIND) install ocamlgraph META src/*.mli lib/*.mli \
-+		$(INSTALL_OPT) graph.cmo graph.cmi $(CMA)
- endif
- 
- # documentation

diff --git a/dev-ml/ocamlgraph/ocamlgraph-0.99b.ebuild b/dev-ml/ocamlgraph/ocamlgraph-0.99b.ebuild
deleted file mode 100644
index c11ed0e..00000000
--- a/dev-ml/ocamlgraph/ocamlgraph-0.99b.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2013 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://www.lri.fr/~filliatr/ocamlgraph/"
-SRC_URI="http://www.lri.fr/~filliatr/ftp/ocamlgraph/${P}.tar.gz"
-LICENSE="LGPL-2"
-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 -j1
-
-	if use doc;	then
-		emake doc
-	fi
-	if use gtk; then
-		emake -j1 editor
-	fi
-}
-
-src_install() {
-	findlib_src_preinst
-	emake install-findlib
-
-	if use gtk; then
-		if use ocamlopt; then
-			newbin editor/editor.opt ocamlgraph_editor
-		else
-			newbin editor/editor.byte ocamlgraph_editor
-		fi
-	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
-}


^ permalink raw reply related	[flat|nested] 4+ messages in thread

* [gentoo-commits] repo/gentoo:master commit in: dev-ml/ocamlgraph/, dev-ml/ocamlgraph/files/
@ 2017-02-14  9:36 Alexis Ballier
  0 siblings, 0 replies; 4+ messages in thread
From: Alexis Ballier @ 2017-02-14  9:36 UTC (permalink / raw
  To: gentoo-commits

commit:     986a8aa3a3f412a8f03bd1bad99f5af8387c6392
Author:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
AuthorDate: Tue Feb 14 09:35:37 2017 +0000
Commit:     Alexis Ballier <aballier <AT> gentoo <DOT> org>
CommitDate: Tue Feb 14 09:35:37 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=986a8aa3

dev-ml/ocamlgraph: Apply upstream patch to fix make check with ocaml 4.04. Bug #608554.

Package-Manager: Portage-2.3.3, Repoman-2.3.1

 dev-ml/ocamlgraph/files/ocamlgraph-1.8.7-test.patch | 19 +++++++++++++++++++
 dev-ml/ocamlgraph/ocamlgraph-1.8.7.ebuild           |  1 +
 2 files changed, 20 insertions(+)

diff --git a/dev-ml/ocamlgraph/files/ocamlgraph-1.8.7-test.patch b/dev-ml/ocamlgraph/files/ocamlgraph-1.8.7-test.patch
new file mode 100644
index 0000000000..f0d370cfd9
--- /dev/null
+++ b/dev-ml/ocamlgraph/files/ocamlgraph-1.8.7-test.patch
@@ -0,0 +1,19 @@
+commit 726e8d6e31224eb70f75655579da9a374e910b98
+Author: Jean-Christophe Filliatre <Jean-Christophe.Filliatre@lri.fr>
+Date:   Mon Feb 13 08:41:58 2017 +0100
+
+    fixed 'make check'
+
+diff --git a/Makefile.in b/Makefile.in
+index 58b9e9c..9ce40df 100644
+--- a/Makefile.in
++++ b/Makefile.in
+@@ -360,7 +360,7 @@ bin/testunix.opt: $(CMXA) myTest/testunix.ml
+ 	$(OCAMLOPT) -unsafe -inline 100 -o $@ unix.cmxa $^
+ 
+ check: $(CMA) tests/check.ml bin/test-ts
+-	ocaml $(CMA) tests/test_clique.ml tests/check.ml
++	ocaml -I . $(CMA) tests/test_clique.ml tests/check.ml
+ 	bin/test-ts 10
+ 
+ # Additional rules

diff --git a/dev-ml/ocamlgraph/ocamlgraph-1.8.7.ebuild b/dev-ml/ocamlgraph/ocamlgraph-1.8.7.ebuild
index 3cbbd5a4bf..1f4cef1a8b 100644
--- a/dev-ml/ocamlgraph/ocamlgraph-1.8.7.ebuild
+++ b/dev-ml/ocamlgraph/ocamlgraph-1.8.7.ebuild
@@ -20,6 +20,7 @@ IUSE="doc examples gtk +ocamlopt"
 
 src_prepare() {
 	epatch "${FILESDIR}/${PN}-1.8.6-installfindlib.patch"
+	epatch "${FILESDIR}/${P}-test.patch"
 }
 
 src_compile() {


^ permalink raw reply related	[flat|nested] 4+ messages in thread

end of thread, other threads:[~2017-02-14  9:36 UTC | newest]

Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-01-19 11:35 [gentoo-commits] repo/gentoo:master commit in: dev-ml/ocamlgraph/, dev-ml/ocamlgraph/files/ Alexis Ballier
  -- strict thread matches above, loose matches on Subject: below --
2016-12-13 13:57 Alexis Ballier
2017-01-26 11:43 Alexis Ballier
2017-02-14  9:36 Alexis Ballier

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox