[gentoo-commits] repo/gentoo:master commit in: dev-ml/ocamlgraph/
commit: 9348a13ddd6784600b5fcf0c711ccfaff3c28fa7 Author: Alfredo Tupone gentoo org> AuthorDate: Thu Apr 6 06:45:40 2023 + Commit: Alfredo Tupone gentoo org> CommitDate: Thu Apr 6 06:45:40 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=9348a13d dev-ml/ocamlgraph: drop 1.8.8-r2 Signed-off-by: Alfredo Tupone gentoo.org> dev-ml/ocamlgraph/Manifest | 1 - dev-ml/ocamlgraph/ocamlgraph-1.8.8-r2.ebuild | 70 2 files changed, 71 deletions(-) diff --git a/dev-ml/ocamlgraph/Manifest b/dev-ml/ocamlgraph/Manifest index ae962e2e91dc..bb22ec3f3bd8 100644 --- a/dev-ml/ocamlgraph/Manifest +++ b/dev-ml/ocamlgraph/Manifest @@ -1,2 +1 @@ -DIST ocamlgraph-1.8.8.tar.gz 282729 BLAKE2B 79fdbcdd86fc5b6f36ad3399c890c31831a20fec22f0b4faf6da1fb61a12d25a54587e4b3ed8f9266ad1ce37bfffe76d66cf7a7e765e8046429943ad3c555208 SHA512 ccb07d4a7fb0c3026ad2d4563e1ca0a88483ac3cf43c9378989ae5c031961853a11c9673c06b54a16733c5755d9c0a2783c5f475afdcc7692d2bf3d4778f5bc5 DIST ocamlgraph-2.0.0.tbz 298912 BLAKE2B a4bb04c74f4dba8b0f37cdf8ab9a82ef5120b1e7f5b5570e67aac35de16e4553c93759acfa5c218e07dc7c036750d92d2c557c7d58247783718f691c5319ded8 SHA512 c4973ac03bdff52d1c8a1ed01c81e0fbe2f76486995e57ff4e4a11bcc7b1793556139d52a81ff14ee8c8de52f1b40e4bd359e60a2ae626cc630ebe8bccefb3f1 diff --git a/dev-ml/ocamlgraph/ocamlgraph-1.8.8-r2.ebuild b/dev-ml/ocamlgraph/ocamlgraph-1.8.8-r2.ebuild deleted file mode 100644 index f6f13183e6ff.. --- a/dev-ml/ocamlgraph/ocamlgraph-1.8.8-r2.ebuild +++ /dev/null @@ -1,70 +0,0 @@ -# Copyright 1999-2022 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit findlib - -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 arm arm64 ~ppc ppc64 x86" -IUSE="doc examples gtk +ocamlopt" - -RDEPEND=" - >=dev-lang/ocaml-3.10.2:=[ocamlopt?] - gtk? ( dev-ml/lablgtk:2=[gnomecanvas,ocamlopt?] ) -" -DEPEND="${RDEPEND}" -BDEPEND="doc? ( dev-tex/hevea dev-ml/ocamlweb )" - -src_configure() { - sed -i \ - -e "s:@LABLGNOMECANVAS@:$(usex gtk):g" \ - Makefile.in || die - - default -} - -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.adoc CREDITS FAQ CHANGES - - if use examples; then - dodoc -r examples - docompress -x /usr/share/doc/${PF}/examples - fi - - if use doc; then - docinto html - dodoc doc/* - fi -}
[gentoo-commits] repo/gentoo:master commit in: dev-ml/ocamlgraph/
commit: 3e80258c7f1020dfae14f7548187703fecc9a236 Author: Alfredo Tupone gentoo org> AuthorDate: Tue Jan 18 20:27:55 2022 + Commit: Alfredo Tupone gentoo org> CommitDate: Tue Jan 18 20:27:55 2022 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3e80258c dev-ml/ocamlgraph: lablgtk is no more automagically discovered Closes: https://bugs.gentoo.org/750263 Package-Manager: Portage-3.0.28, Repoman-3.0.3 Signed-off-by: Alfredo Tupone gentoo.org> dev-ml/ocamlgraph/ocamlgraph-1.8.8-r2.ebuild | 10 +- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/dev-ml/ocamlgraph/ocamlgraph-1.8.8-r2.ebuild b/dev-ml/ocamlgraph/ocamlgraph-1.8.8-r2.ebuild index a395027a55ff..feae626b35f7 100644 --- a/dev-ml/ocamlgraph/ocamlgraph-1.8.8-r2.ebuild +++ b/dev-ml/ocamlgraph/ocamlgraph-1.8.8-r2.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2021 Gentoo Authors +# Copyright 1999-2022 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=7 @@ -21,6 +21,14 @@ RDEPEND=" DEPEND="${RDEPEND}" BDEPEND="doc? ( dev-tex/hevea dev-ml/ocamlweb )" +src_configure() { + sed -i \ + -e "s:@LABLGNOMECANVAS@:$(usex gtk):g" \ + Makefile.in || die + + default +} + src_compile() { emake byte use ocamlopt && emake opt
[gentoo-commits] repo/gentoo:master commit in: dev-ml/ocamlgraph/
commit: 6cbc365a6e69cc1e674a762574e4b5ea15c9c7d2 Author: Sam James gentoo org> AuthorDate: Fri Apr 30 23:35:44 2021 + Commit: Sam James gentoo org> CommitDate: Fri Apr 30 23:35:44 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6cbc365a dev-ml/ocamlgraph: Stabilize 2.0.0-r1 arm64, #769320 Signed-off-by: Sam James gentoo.org> dev-ml/ocamlgraph/ocamlgraph-2.0.0-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-ml/ocamlgraph/ocamlgraph-2.0.0-r1.ebuild b/dev-ml/ocamlgraph/ocamlgraph-2.0.0-r1.ebuild index 3359f954e2c..f20fa2b8bb8 100644 --- a/dev-ml/ocamlgraph/ocamlgraph-2.0.0-r1.ebuild +++ b/dev-ml/ocamlgraph/ocamlgraph-2.0.0-r1.ebuild @@ -10,7 +10,7 @@ HOMEPAGE="http://ocamlgraph.lri.fr/index.en.html; SRC_URI="https://github.com/backtracking/${PN}/releases/download/${PV}/${P}.tbz; LICENSE="LGPL-2.1" SLOT="0/${PV}" -KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 x86" +KEYWORDS="amd64 ~arm arm64 ppc ppc64 x86" RDEPEND=" dev-ml/stdlib-shims:=[ocamlopt?] dev-ml/graphics:=[ocamlopt?]"
[gentoo-commits] repo/gentoo:master commit in: dev-ml/ocamlgraph/files/
commit: b305884f5c719ec617cd267cf3040428c55e1697 Author: Michael Mair-Keimberger levelnine at> AuthorDate: Sun Mar 14 16:48:07 2021 + Commit: Conrad Kostecki gentoo org> CommitDate: Sun Mar 14 18:57:31 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b305884f dev-ml/ocamlgraph: remove unused patch(es) Package-Manager: Portage-3.0.17, Repoman-3.0.2 Signed-off-by: Michael Mair-Keimberger levelnine.at> Signed-off-by: Conrad Kostecki gentoo.org> .../files/ocamlgraph-1.8.6-installfindlib.patch| 38 -- .../ocamlgraph/files/ocamlgraph-1.8.7-test.patch | 19 --- 2 files changed, 57 deletions(-) diff --git a/dev-ml/ocamlgraph/files/ocamlgraph-1.8.6-installfindlib.patch b/dev-ml/ocamlgraph/files/ocamlgraph-1.8.6-installfindlib.patch deleted file mode 100644 index cb980b6f19d..000 --- a/dev-ml/ocamlgraph/files/ocamlgraph-1.8.6-installfindlib.patch +++ /dev/null @@ -1,38 +0,0 @@ -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/files/ocamlgraph-1.8.7-test.patch b/dev-ml/ocamlgraph/files/ocamlgraph-1.8.7-test.patch deleted file mode 100644 index f0d370cfd94..000 --- a/dev-ml/ocamlgraph/files/ocamlgraph-1.8.7-test.patch +++ /dev/null @@ -1,19 +0,0 @@ -commit 726e8d6e31224eb70f75655579da9a374e910b98 -Author: Jean-Christophe Filliatre -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
[gentoo-commits] repo/gentoo:master commit in: dev-ml/ocamlgraph/
commit: c97516b870fcb65ebb8406ee903304352ff2ce73 Author: Sam James gentoo org> AuthorDate: Sun Mar 14 00:44:41 2021 + Commit: Sam James gentoo org> CommitDate: Sun Mar 14 00:47:48 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c97516b8 dev-ml/ocamlgraph: Stabilize 1.8.8-r2 arm64, #772833 Signed-off-by: Sam James gentoo.org> dev-ml/ocamlgraph/ocamlgraph-1.8.8-r2.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-ml/ocamlgraph/ocamlgraph-1.8.8-r2.ebuild b/dev-ml/ocamlgraph/ocamlgraph-1.8.8-r2.ebuild index 0a7b3f3cdd1..a395027a55f 100644 --- a/dev-ml/ocamlgraph/ocamlgraph-1.8.8-r2.ebuild +++ b/dev-ml/ocamlgraph/ocamlgraph-1.8.8-r2.ebuild @@ -11,7 +11,7 @@ SRC_URI="http://ocamlgraph.lri.fr/download/${P}.tar.gz; LICENSE="LGPL-2.1" SLOT="0/${PV}" -KEYWORDS="amd64 arm ~arm64 ppc ppc64 x86" +KEYWORDS="amd64 arm arm64 ppc ppc64 x86" IUSE="doc examples gtk +ocamlopt" RDEPEND="
[gentoo-commits] repo/gentoo:master commit in: dev-ml/ocamlgraph/
commit: 8c330a321e88af38a19711771ff4845a4e68b567 Author: Sam James gentoo org> AuthorDate: Thu Mar 11 13:30:39 2021 + Commit: Sam James gentoo org> CommitDate: Thu Mar 11 13:30:39 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8c330a32 dev-ml/ocamlgraph: Stabilize 2.0.0-r1 x86, #769320 Signed-off-by: Sam James gentoo.org> dev-ml/ocamlgraph/ocamlgraph-2.0.0-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-ml/ocamlgraph/ocamlgraph-2.0.0-r1.ebuild b/dev-ml/ocamlgraph/ocamlgraph-2.0.0-r1.ebuild index 629b5f0e464..3359f954e2c 100644 --- a/dev-ml/ocamlgraph/ocamlgraph-2.0.0-r1.ebuild +++ b/dev-ml/ocamlgraph/ocamlgraph-2.0.0-r1.ebuild @@ -10,7 +10,7 @@ HOMEPAGE="http://ocamlgraph.lri.fr/index.en.html; SRC_URI="https://github.com/backtracking/${PN}/releases/download/${PV}/${P}.tbz; LICENSE="LGPL-2.1" SLOT="0/${PV}" -KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 ~x86" +KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 x86" RDEPEND=" dev-ml/stdlib-shims:=[ocamlopt?] dev-ml/graphics:=[ocamlopt?]"
[gentoo-commits] repo/gentoo:master commit in: dev-ml/ocamlgraph/
commit: b493bd70671281070e730d25b4229b8f77a7035a Author: Sam James gentoo org> AuthorDate: Thu Mar 11 02:35:18 2021 + Commit: Sam James gentoo org> CommitDate: Thu Mar 11 02:35:18 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b493bd70 dev-ml/ocamlgraph: Stabilize 2.0.0-r1 amd64, #769320 Signed-off-by: Sam James gentoo.org> dev-ml/ocamlgraph/ocamlgraph-2.0.0-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-ml/ocamlgraph/ocamlgraph-2.0.0-r1.ebuild b/dev-ml/ocamlgraph/ocamlgraph-2.0.0-r1.ebuild index 8bf5401819d..629b5f0e464 100644 --- a/dev-ml/ocamlgraph/ocamlgraph-2.0.0-r1.ebuild +++ b/dev-ml/ocamlgraph/ocamlgraph-2.0.0-r1.ebuild @@ -10,7 +10,7 @@ HOMEPAGE="http://ocamlgraph.lri.fr/index.en.html; SRC_URI="https://github.com/backtracking/${PN}/releases/download/${PV}/${P}.tbz; LICENSE="LGPL-2.1" SLOT="0/${PV}" -KEYWORDS="~amd64 ~arm ~arm64 ppc ppc64 ~x86" +KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 ~x86" RDEPEND=" dev-ml/stdlib-shims:=[ocamlopt?] dev-ml/graphics:=[ocamlopt?]"
[gentoo-commits] repo/gentoo:master commit in: dev-ml/ocamlgraph/
commit: f87a71507df55a36212875c656d530bccd3ced9c Author: Sam James gentoo org> AuthorDate: Wed Mar 10 03:06:27 2021 + Commit: Sam James gentoo org> CommitDate: Wed Mar 10 03:06:27 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f87a7150 dev-ml/ocamlgraph: Stabilize 2.0.0-r1 ppc64, #769320 Signed-off-by: Sam James gentoo.org> dev-ml/ocamlgraph/ocamlgraph-2.0.0-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-ml/ocamlgraph/ocamlgraph-2.0.0-r1.ebuild b/dev-ml/ocamlgraph/ocamlgraph-2.0.0-r1.ebuild index 99c5c8a8d14..8bf5401819d 100644 --- a/dev-ml/ocamlgraph/ocamlgraph-2.0.0-r1.ebuild +++ b/dev-ml/ocamlgraph/ocamlgraph-2.0.0-r1.ebuild @@ -10,7 +10,7 @@ HOMEPAGE="http://ocamlgraph.lri.fr/index.en.html; SRC_URI="https://github.com/backtracking/${PN}/releases/download/${PV}/${P}.tbz; LICENSE="LGPL-2.1" SLOT="0/${PV}" -KEYWORDS="~amd64 ~arm ~arm64 ppc ~ppc64 ~x86" +KEYWORDS="~amd64 ~arm ~arm64 ppc ppc64 ~x86" RDEPEND=" dev-ml/stdlib-shims:=[ocamlopt?] dev-ml/graphics:=[ocamlopt?]"
[gentoo-commits] repo/gentoo:master commit in: dev-ml/ocamlgraph/
commit: c68905f1afaa69576199dfd99875e4816d9dad63 Author: Sam James gentoo org> AuthorDate: Wed Mar 10 03:06:09 2021 + Commit: Sam James gentoo org> CommitDate: Wed Mar 10 03:06:09 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c68905f1 dev-ml/ocamlgraph: Stabilize 2.0.0-r1 ppc, #769320 Signed-off-by: Sam James gentoo.org> dev-ml/ocamlgraph/ocamlgraph-2.0.0-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-ml/ocamlgraph/ocamlgraph-2.0.0-r1.ebuild b/dev-ml/ocamlgraph/ocamlgraph-2.0.0-r1.ebuild index 6001ee9fb27..99c5c8a8d14 100644 --- a/dev-ml/ocamlgraph/ocamlgraph-2.0.0-r1.ebuild +++ b/dev-ml/ocamlgraph/ocamlgraph-2.0.0-r1.ebuild @@ -10,7 +10,7 @@ HOMEPAGE="http://ocamlgraph.lri.fr/index.en.html; SRC_URI="https://github.com/backtracking/${PN}/releases/download/${PV}/${P}.tbz; LICENSE="LGPL-2.1" SLOT="0/${PV}" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" +KEYWORDS="~amd64 ~arm ~arm64 ppc ~ppc64 ~x86" RDEPEND=" dev-ml/stdlib-shims:=[ocamlopt?] dev-ml/graphics:=[ocamlopt?]"
[gentoo-commits] repo/gentoo:master commit in: dev-ml/ocamlgraph/
commit: 1cbd39c216c768505c36f8a25d11f67afb3cea38 Author: Alfredo Tupone gentoo org> AuthorDate: Sat Feb 27 14:17:24 2021 + Commit: Alfredo Tupone gentoo org> CommitDate: Sat Feb 27 14:17:24 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1cbd39c2 dev-ml/ocamlgraph: remove gtk use flag Bugs: https://bugs.gentoo.org/769320 Package-Manager: Portage-3.0.13, Repoman-3.0.2 Signed-off-by: Alfredo Tupone gentoo.org> dev-ml/ocamlgraph/ocamlgraph-2.0.0-r1.ebuild | 22 ++ 1 file changed, 22 insertions(+) diff --git a/dev-ml/ocamlgraph/ocamlgraph-2.0.0-r1.ebuild b/dev-ml/ocamlgraph/ocamlgraph-2.0.0-r1.ebuild new file mode 100644 index 000..6001ee9fb27 --- /dev/null +++ b/dev-ml/ocamlgraph/ocamlgraph-2.0.0-r1.ebuild @@ -0,0 +1,22 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit dune + +DESCRIPTION="O'Caml Graph library" +HOMEPAGE="http://ocamlgraph.lri.fr/index.en.html; +SRC_URI="https://github.com/backtracking/${PN}/releases/download/${PV}/${P}.tbz; +LICENSE="LGPL-2.1" +SLOT="0/${PV}" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" +RDEPEND=" + dev-ml/stdlib-shims:=[ocamlopt?] + dev-ml/graphics:=[ocamlopt?]" +DEPEND="${RDEPEND}" +IUSE="+ocamlopt" + +src_compile() { + dune build --only-packages ocamlgraph @install || die +}
[gentoo-commits] repo/gentoo:master commit in: dev-ml/ocamlgraph/
commit: 0b2d84e514e16e672796c50c4ac34ce1ea09ec6d Author: Sam James gentoo org> AuthorDate: Sun Feb 21 19:48:02 2021 + Commit: Sam James gentoo org> CommitDate: Sun Feb 21 19:48:02 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=0b2d84e5 dev-ml/ocamlgraph: Keyword 2.0.0 ppc, #769011 Signed-off-by: Sam James gentoo.org> dev-ml/ocamlgraph/ocamlgraph-2.0.0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-ml/ocamlgraph/ocamlgraph-2.0.0.ebuild b/dev-ml/ocamlgraph/ocamlgraph-2.0.0.ebuild index f26f2721707..6fca1bfe3b0 100644 --- a/dev-ml/ocamlgraph/ocamlgraph-2.0.0.ebuild +++ b/dev-ml/ocamlgraph/ocamlgraph-2.0.0.ebuild @@ -10,7 +10,7 @@ HOMEPAGE="http://ocamlgraph.lri.fr/index.en.html; SRC_URI="https://github.com/backtracking/${PN}/releases/download/${PV}/${P}.tbz; LICENSE="LGPL-2.1" SLOT="0/${PV}" -KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86" RDEPEND=" gtk? ( dev-ml/lablgtk:2=[ocamlopt?,gnomecanvas] ) dev-ml/stdlib-shims:=[ocamlopt?]
[gentoo-commits] repo/gentoo:master commit in: dev-ml/ocamlgraph/
commit: a7adf50a1f20cd73a765b0deb2bdac443769ee9f Author: Sam James gentoo org> AuthorDate: Sun Feb 21 19:47:43 2021 + Commit: Sam James gentoo org> CommitDate: Sun Feb 21 19:47:43 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=a7adf50a dev-ml/ocamlgraph: Keyword 2.0.0 arm64, #769011 Signed-off-by: Sam James gentoo.org> dev-ml/ocamlgraph/ocamlgraph-2.0.0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-ml/ocamlgraph/ocamlgraph-2.0.0.ebuild b/dev-ml/ocamlgraph/ocamlgraph-2.0.0.ebuild index e63d06fe371..f26f2721707 100644 --- a/dev-ml/ocamlgraph/ocamlgraph-2.0.0.ebuild +++ b/dev-ml/ocamlgraph/ocamlgraph-2.0.0.ebuild @@ -10,7 +10,7 @@ HOMEPAGE="http://ocamlgraph.lri.fr/index.en.html; SRC_URI="https://github.com/backtracking/${PN}/releases/download/${PV}/${P}.tbz; LICENSE="LGPL-2.1" SLOT="0/${PV}" -KEYWORDS="~amd64 ~arm ~ppc64 ~x86" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86" RDEPEND=" gtk? ( dev-ml/lablgtk:2=[ocamlopt?,gnomecanvas] ) dev-ml/stdlib-shims:=[ocamlopt?]
[gentoo-commits] repo/gentoo:master commit in: dev-ml/ocamlgraph/
commit: 395be8dbc513a6f774f18d33652457fbff25a69e Author: Sam James gentoo org> AuthorDate: Sun Feb 21 08:08:35 2021 + Commit: Sam James gentoo org> CommitDate: Sun Feb 21 08:08:35 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=395be8db dev-ml/ocamlgraph: Keyword 2.0.0 arm, #769011 Signed-off-by: Sam James gentoo.org> dev-ml/ocamlgraph/ocamlgraph-2.0.0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-ml/ocamlgraph/ocamlgraph-2.0.0.ebuild b/dev-ml/ocamlgraph/ocamlgraph-2.0.0.ebuild index 1c843c42933..e63d06fe371 100644 --- a/dev-ml/ocamlgraph/ocamlgraph-2.0.0.ebuild +++ b/dev-ml/ocamlgraph/ocamlgraph-2.0.0.ebuild @@ -10,7 +10,7 @@ HOMEPAGE="http://ocamlgraph.lri.fr/index.en.html; SRC_URI="https://github.com/backtracking/${PN}/releases/download/${PV}/${P}.tbz; LICENSE="LGPL-2.1" SLOT="0/${PV}" -KEYWORDS="~amd64 ~ppc64 ~x86" +KEYWORDS="~amd64 ~arm ~ppc64 ~x86" RDEPEND=" gtk? ( dev-ml/lablgtk:2=[ocamlopt?,gnomecanvas] ) dev-ml/stdlib-shims:=[ocamlopt?]
[gentoo-commits] repo/gentoo:master commit in: dev-ml/ocamlgraph/
commit: 2c0f1a9a787c2c4b49a6f678c9ad54bbb5c238b4 Author: Alfredo Tupone gentoo org> AuthorDate: Fri Feb 19 21:17:17 2021 + Commit: Alfredo Tupone gentoo org> CommitDate: Fri Feb 19 21:17:17 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2c0f1a9a dev-ml/ocamlgraph: dep on ocaml<4.06 Package-Manager: Portage-3.0.13, Repoman-3.0.2 Signed-off-by: Alfredo Tupone gentoo.org> dev-ml/ocamlgraph/ocamlgraph-1.8.7-r1.ebuild | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dev-ml/ocamlgraph/ocamlgraph-1.8.7-r1.ebuild b/dev-ml/ocamlgraph/ocamlgraph-1.8.7-r1.ebuild index 41454fc2208..1ae4977a6ef 100644 --- a/dev-ml/ocamlgraph/ocamlgraph-1.8.7-r1.ebuild +++ b/dev-ml/ocamlgraph/ocamlgraph-1.8.7-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -10,8 +10,8 @@ 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 ~arm ~arm64 ppc x86" -RDEPEND=">=dev-lang/ocaml-3.10.2:=[ocamlopt?] +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86" +RDEPEND="<=dev-lang/ocaml-4.06:=[ocamlopt?] gtk? ( dev-ml/lablgtk:2=[gnomecanvas,ocamlopt?] )" DEPEND="${RDEPEND} doc? ( dev-tex/hevea dev-ml/ocamlweb )"
[gentoo-commits] repo/gentoo:master commit in: dev-ml/ocamlgraph/
commit: e1950af8de0681f4e2959ab19c57a856d82ee319 Author: Alfredo Tupone gentoo org> AuthorDate: Fri Feb 12 07:34:16 2021 + Commit: Alfredo Tupone gentoo org> CommitDate: Fri Feb 12 07:34:16 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e1950af8 dev-ml/ocamlgraph: fix use dep Closes: https://bugs.gentoo.org/770130 Package-Manager: Portage-3.0.13, Repoman-3.0.2 Signed-off-by: Alfredo Tupone gentoo.org> dev-ml/ocamlgraph/ocamlgraph-2.0.0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-ml/ocamlgraph/ocamlgraph-2.0.0.ebuild b/dev-ml/ocamlgraph/ocamlgraph-2.0.0.ebuild index 58fd0cd07d6..1c843c42933 100644 --- a/dev-ml/ocamlgraph/ocamlgraph-2.0.0.ebuild +++ b/dev-ml/ocamlgraph/ocamlgraph-2.0.0.ebuild @@ -12,7 +12,7 @@ LICENSE="LGPL-2.1" SLOT="0/${PV}" KEYWORDS="~amd64 ~ppc64 ~x86" RDEPEND=" - gtk? ( dev-ml/lablgtk:2=[ocamlopt?] ) + gtk? ( dev-ml/lablgtk:2=[ocamlopt?,gnomecanvas] ) dev-ml/stdlib-shims:=[ocamlopt?] dev-ml/graphics:=[ocamlopt?]" DEPEND="${RDEPEND}"
[gentoo-commits] repo/gentoo:master commit in: dev-ml/ocamlgraph/
commit: 6fdddaa4f1e5b3488520d3e7f64fe786c517db24 Author: Sam James gentoo org> AuthorDate: Wed Feb 10 16:32:47 2021 + Commit: Sam James gentoo org> CommitDate: Wed Feb 10 16:32:47 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6fdddaa4 dev-ml/ocamlgraph: Stabilize 1.8.8-r1 ppc64, #769317 Signed-off-by: Sam James gentoo.org> dev-ml/ocamlgraph/ocamlgraph-1.8.8-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-ml/ocamlgraph/ocamlgraph-1.8.8-r1.ebuild b/dev-ml/ocamlgraph/ocamlgraph-1.8.8-r1.ebuild index 737b1b7e76f..e76a4464ef6 100644 --- a/dev-ml/ocamlgraph/ocamlgraph-1.8.8-r1.ebuild +++ b/dev-ml/ocamlgraph/ocamlgraph-1.8.8-r1.ebuild @@ -10,7 +10,7 @@ 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 ~arm ~arm64 ppc ~ppc64 x86" +KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 x86" RDEPEND=">=dev-lang/ocaml-3.10.2:=[ocamlopt?] gtk? ( dev-ml/lablgtk:2=[gnomecanvas,ocamlopt?] )" DEPEND="${RDEPEND}
[gentoo-commits] repo/gentoo:master commit in: dev-ml/ocamlgraph/
commit: bc79403766a9f4dcaffa8b6c42053ac470475112 Author: Sam James gentoo org> AuthorDate: Wed Feb 10 01:56:29 2021 + Commit: Sam James gentoo org> CommitDate: Wed Feb 10 01:56:29 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=bc794037 dev-ml/ocamlgraph: Stabilize 1.8.8-r1 ppc, #749669 Signed-off-by: Sam James gentoo.org> dev-ml/ocamlgraph/ocamlgraph-1.8.8-r1.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dev-ml/ocamlgraph/ocamlgraph-1.8.8-r1.ebuild b/dev-ml/ocamlgraph/ocamlgraph-1.8.8-r1.ebuild index 6d7936b9e15..737b1b7e76f 100644 --- a/dev-ml/ocamlgraph/ocamlgraph-1.8.8-r1.ebuild +++ b/dev-ml/ocamlgraph/ocamlgraph-1.8.8-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2020 Gentoo Authors +# Copyright 1999-2021 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -10,7 +10,7 @@ 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 ~arm ~arm64 ~ppc ~ppc64 x86" +KEYWORDS="amd64 ~arm ~arm64 ppc ~ppc64 x86" RDEPEND=">=dev-lang/ocaml-3.10.2:=[ocamlopt?] gtk? ( dev-ml/lablgtk:2=[gnomecanvas,ocamlopt?] )" DEPEND="${RDEPEND}
[gentoo-commits] repo/gentoo:master commit in: dev-ml/ocamlgraph/
commit: 521e564f7798b316080aa9dc744e5e5c243db028 Author: Sam James gentoo org> AuthorDate: Wed Feb 10 01:53:23 2021 + Commit: Sam James gentoo org> CommitDate: Wed Feb 10 01:55:43 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=521e564f dev-ml/ocamlgraph: add ml@ Package-Manager: Portage-3.0.14, Repoman-3.0.2 Signed-off-by: Sam James gentoo.org> dev-ml/ocamlgraph/metadata.xml | 5 - 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/dev-ml/ocamlgraph/metadata.xml b/dev-ml/ocamlgraph/metadata.xml index afed4e0937c..755517efcd9 100644 --- a/dev-ml/ocamlgraph/metadata.xml +++ b/dev-ml/ocamlgraph/metadata.xml @@ -1,7 +1,10 @@ http://www.gentoo.org/dtd/metadata.dtd;> - + + m...@gentoo.org + ML + backtracking/ocamlgraph
[gentoo-commits] repo/gentoo:master commit in: dev-ml/ocamlgraph/
commit: e3e2b2f5f0d46fea1fa06101544ca2edeaab478e Author: Sam James gentoo org> AuthorDate: Tue Feb 9 21:35:56 2021 + Commit: Sam James gentoo org> CommitDate: Tue Feb 9 21:35:56 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=e3e2b2f5 dev-ml/ocamlgraph: Keyword 2.0.0 ppc64, #769011 Signed-off-by: Sam James gentoo.org> dev-ml/ocamlgraph/ocamlgraph-2.0.0.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-ml/ocamlgraph/ocamlgraph-2.0.0.ebuild b/dev-ml/ocamlgraph/ocamlgraph-2.0.0.ebuild index 96971b5888b..58fd0cd07d6 100644 --- a/dev-ml/ocamlgraph/ocamlgraph-2.0.0.ebuild +++ b/dev-ml/ocamlgraph/ocamlgraph-2.0.0.ebuild @@ -10,7 +10,7 @@ HOMEPAGE="http://ocamlgraph.lri.fr/index.en.html; SRC_URI="https://github.com/backtracking/${PN}/releases/download/${PV}/${P}.tbz; LICENSE="LGPL-2.1" SLOT="0/${PV}" -KEYWORDS="~amd64 ~x86" +KEYWORDS="~amd64 ~ppc64 ~x86" RDEPEND=" gtk? ( dev-ml/lablgtk:2=[ocamlopt?] ) dev-ml/stdlib-shims:=[ocamlopt?]
[gentoo-commits] repo/gentoo:master commit in: dev-ml/ocamlgraph/
commit: 42c12e6e8e82abe43bc648960fd6d1c852e4af29 Author: Alfredo Tupone gentoo org> AuthorDate: Fri Feb 5 23:00:03 2021 + Commit: Alfredo Tupone gentoo org> CommitDate: Fri Feb 5 23:02:30 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=42c12e6e dev-ml/ocamlgraph: version bump to 2.0.0 Package-Manager: Portage-3.0.13, Repoman-3.0.2 Signed-off-by: Alfredo Tupone gentoo.org> dev-ml/ocamlgraph/Manifest| 1 + dev-ml/ocamlgraph/ocamlgraph-2.0.0.ebuild | 27 +++ 2 files changed, 28 insertions(+) diff --git a/dev-ml/ocamlgraph/Manifest b/dev-ml/ocamlgraph/Manifest index 1edb5afbb82..9bcbe739908 100644 --- a/dev-ml/ocamlgraph/Manifest +++ b/dev-ml/ocamlgraph/Manifest @@ -1,2 +1,3 @@ DIST ocamlgraph-1.8.7.tar.gz 272625 BLAKE2B 18df3f78cfe66e2259c770cfc3671096b06a185e3f407b22eb0a21ff6e7f7df4b0b705a830d740c64f66609b88e2fb76aa91e200ca4c0fadc7ae2a1910641f3d SHA512 27559293bf576ecc9cf49090e24905c50d00ebaeb444a3c917826f3cfe1e7ceab34b43e30f98634811b1688b675d8747b590b5bb103a720d099304f5031feb2e DIST ocamlgraph-1.8.8.tar.gz 282729 BLAKE2B 79fdbcdd86fc5b6f36ad3399c890c31831a20fec22f0b4faf6da1fb61a12d25a54587e4b3ed8f9266ad1ce37bfffe76d66cf7a7e765e8046429943ad3c555208 SHA512 ccb07d4a7fb0c3026ad2d4563e1ca0a88483ac3cf43c9378989ae5c031961853a11c9673c06b54a16733c5755d9c0a2783c5f475afdcc7692d2bf3d4778f5bc5 +DIST ocamlgraph-2.0.0.tbz 298912 BLAKE2B a4bb04c74f4dba8b0f37cdf8ab9a82ef5120b1e7f5b5570e67aac35de16e4553c93759acfa5c218e07dc7c036750d92d2c557c7d58247783718f691c5319ded8 SHA512 c4973ac03bdff52d1c8a1ed01c81e0fbe2f76486995e57ff4e4a11bcc7b1793556139d52a81ff14ee8c8de52f1b40e4bd359e60a2ae626cc630ebe8bccefb3f1 diff --git a/dev-ml/ocamlgraph/ocamlgraph-2.0.0.ebuild b/dev-ml/ocamlgraph/ocamlgraph-2.0.0.ebuild new file mode 100644 index 000..96971b5888b --- /dev/null +++ b/dev-ml/ocamlgraph/ocamlgraph-2.0.0.ebuild @@ -0,0 +1,27 @@ +# Copyright 1999-2021 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +inherit dune + +DESCRIPTION="O'Caml Graph library" +HOMEPAGE="http://ocamlgraph.lri.fr/index.en.html; +SRC_URI="https://github.com/backtracking/${PN}/releases/download/${PV}/${P}.tbz; +LICENSE="LGPL-2.1" +SLOT="0/${PV}" +KEYWORDS="~amd64 ~x86" +RDEPEND=" + gtk? ( dev-ml/lablgtk:2=[ocamlopt?] ) + dev-ml/stdlib-shims:=[ocamlopt?] + dev-ml/graphics:=[ocamlopt?]" +DEPEND="${RDEPEND}" +IUSE="gtk +ocamlopt" + +src_compile() { + if ! use gtk; then + dune build --only-packages ocamlgraph @install || die + else + dune build @install || die + fi +}
[gentoo-commits] repo/gentoo:master commit in: dev-ml/ocamlgraph/
commit: 1a16da72ad98f55e8b11d8fc6e914b3d2351d2e8 Author: Sam James gentoo org> AuthorDate: Wed Oct 28 03:33:16 2020 + Commit: Sam James gentoo org> CommitDate: Wed Oct 28 03:33:16 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1a16da72 dev-ml/ocamlgraph: ppc64 keyworded (bug #748576) Package-Manager: Portage-3.0.8, Repoman-3.0.2 Signed-off-by: Sam James gentoo.org> dev-ml/ocamlgraph/ocamlgraph-1.8.8-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-ml/ocamlgraph/ocamlgraph-1.8.8-r1.ebuild b/dev-ml/ocamlgraph/ocamlgraph-1.8.8-r1.ebuild index 2553a23774b..6d7936b9e15 100644 --- a/dev-ml/ocamlgraph/ocamlgraph-1.8.8-r1.ebuild +++ b/dev-ml/ocamlgraph/ocamlgraph-1.8.8-r1.ebuild @@ -10,7 +10,7 @@ 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 ~arm ~arm64 ~ppc x86" +KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 x86" RDEPEND=">=dev-lang/ocaml-3.10.2:=[ocamlopt?] gtk? ( dev-ml/lablgtk:2=[gnomecanvas,ocamlopt?] )" DEPEND="${RDEPEND}
[gentoo-commits] repo/gentoo:master commit in: dev-ml/ocamlgraph/
commit: 162aacccdbe02ee48da03083fa561a6c7adcba72 Author: Thomas Deutschmann gentoo org> AuthorDate: Sun Oct 18 18:44:20 2020 + Commit: Thomas Deutschmann gentoo org> CommitDate: Sun Oct 18 18:51:29 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=162aaccc dev-ml/ocamlgraph: x86 stable (bug #749669) Package-Manager: Portage-3.0.8, Repoman-3.0.1 Signed-off-by: Thomas Deutschmann gentoo.org> dev-ml/ocamlgraph/ocamlgraph-1.8.8-r1.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-ml/ocamlgraph/ocamlgraph-1.8.8-r1.ebuild b/dev-ml/ocamlgraph/ocamlgraph-1.8.8-r1.ebuild index df67c7f57f1..2553a23774b 100644 --- a/dev-ml/ocamlgraph/ocamlgraph-1.8.8-r1.ebuild +++ b/dev-ml/ocamlgraph/ocamlgraph-1.8.8-r1.ebuild @@ -10,7 +10,7 @@ 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 ~arm ~arm64 ~ppc ~x86" +KEYWORDS="amd64 ~arm ~arm64 ~ppc x86" RDEPEND=">=dev-lang/ocaml-3.10.2:=[ocamlopt?] gtk? ( dev-ml/lablgtk:2=[gnomecanvas,ocamlopt?] )" DEPEND="${RDEPEND}
[gentoo-commits] repo/gentoo:master commit in: dev-ml/ocamlgraph/
commit: 660c42c58598e9e049bc3358f194e3c302e8775d Author: Sam James gentoo org> AuthorDate: Sat Oct 17 12:18:43 2020 + Commit: Sam James gentoo org> CommitDate: Sat Oct 17 12:18:48 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=660c42c5 dev-ml/ocamlgraph: DeprecatedInsinto Package-Manager: Portage-3.0.8, Repoman-3.0.1 Signed-off-by: Sam James gentoo.org> dev-ml/ocamlgraph/ocamlgraph-1.8.7-r1.ebuild | 13 +++-- dev-ml/ocamlgraph/ocamlgraph-1.8.8-r1.ebuild | 11 ++- 2 files changed, 13 insertions(+), 11 deletions(-) diff --git a/dev-ml/ocamlgraph/ocamlgraph-1.8.7-r1.ebuild b/dev-ml/ocamlgraph/ocamlgraph-1.8.7-r1.ebuild index 7b7df7eac4c..41454fc2208 100644 --- a/dev-ml/ocamlgraph/ocamlgraph-1.8.7-r1.ebuild +++ b/dev-ml/ocamlgraph/ocamlgraph-1.8.7-r1.ebuild @@ -3,7 +3,7 @@ EAPI=5 -inherit findlib eutils +inherit eutils findlib DESCRIPTION="O'Caml Graph library" HOMEPAGE="http://ocamlgraph.lri.fr/index.en.html; @@ -50,13 +50,14 @@ src_install() { fi dodoc README.adoc CREDITS FAQ CHANGES - if use doc; then - dohtml doc/* - fi if use examples; then - insinto /usr/share/doc/${PF} - doins -r examples + dodoc -r examples docompress -x /usr/share/doc/${PF}/examples fi + + if use doc; then + docinto html + dodoc doc/* + fi } diff --git a/dev-ml/ocamlgraph/ocamlgraph-1.8.8-r1.ebuild b/dev-ml/ocamlgraph/ocamlgraph-1.8.8-r1.ebuild index 9c4e5391fc6..df67c7f57f1 100644 --- a/dev-ml/ocamlgraph/ocamlgraph-1.8.8-r1.ebuild +++ b/dev-ml/ocamlgraph/ocamlgraph-1.8.8-r1.ebuild @@ -45,13 +45,14 @@ src_install() { fi dodoc README.adoc CREDITS FAQ CHANGES - if use doc; then - dohtml doc/* - fi if use examples; then - insinto /usr/share/doc/${PF} - doins -r examples + dodoc -r examples docompress -x /usr/share/doc/${PF}/examples fi + + if use doc; then + docinto html + dodoc doc/* + fi }
[gentoo-commits] repo/gentoo:master commit in: dev-ml/ocamlgraph/
commit: 73f875a137b7a36b013bd2e3ff7f062738e29496 Author: Sam James gentoo org> AuthorDate: Sat Oct 17 09:31:24 2020 + Commit: Sam James gentoo org> CommitDate: Sat Oct 17 09:32:10 2020 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=73f875a1 dev-ml/ocamlgraph: fix MissingUseDepDefault Package-Manager: Portage-3.0.8, Repoman-3.0.1 Signed-off-by: Sam James gentoo.org> .../{ocamlgraph-1.8.7.ebuild => ocamlgraph-1.8.7-r1.ebuild} | 4 ++-- .../{ocamlgraph-1.8.8.ebuild => ocamlgraph-1.8.8-r1.ebuild} | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/dev-ml/ocamlgraph/ocamlgraph-1.8.7.ebuild b/dev-ml/ocamlgraph/ocamlgraph-1.8.7-r1.ebuild similarity index 93% rename from dev-ml/ocamlgraph/ocamlgraph-1.8.7.ebuild rename to dev-ml/ocamlgraph/ocamlgraph-1.8.7-r1.ebuild index 09d0810bef2..7b7df7eac4c 100644 --- a/dev-ml/ocamlgraph/ocamlgraph-1.8.7.ebuild +++ b/dev-ml/ocamlgraph/ocamlgraph-1.8.7-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -12,7 +12,7 @@ LICENSE="LGPL-2.1" SLOT="0/${PV}" KEYWORDS="~amd64 ~arm ~arm64 ppc x86" RDEPEND=">=dev-lang/ocaml-3.10.2:=[ocamlopt?] - gtk? ( dev-ml/lablgtk:=[gnomecanvas,ocamlopt?] )" + gtk? ( dev-ml/lablgtk:2=[gnomecanvas,ocamlopt?] )" DEPEND="${RDEPEND} doc? ( dev-tex/hevea dev-ml/ocamlweb )" IUSE="doc examples gtk +ocamlopt" diff --git a/dev-ml/ocamlgraph/ocamlgraph-1.8.8.ebuild b/dev-ml/ocamlgraph/ocamlgraph-1.8.8-r1.ebuild similarity index 92% rename from dev-ml/ocamlgraph/ocamlgraph-1.8.8.ebuild rename to dev-ml/ocamlgraph/ocamlgraph-1.8.8-r1.ebuild index b653703ff09..9c4e5391fc6 100644 --- a/dev-ml/ocamlgraph/ocamlgraph-1.8.8.ebuild +++ b/dev-ml/ocamlgraph/ocamlgraph-1.8.8-r1.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2018 Gentoo Authors +# Copyright 1999-2020 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -12,7 +12,7 @@ LICENSE="LGPL-2.1" SLOT="0/${PV}" KEYWORDS="amd64 ~arm ~arm64 ~ppc ~x86" RDEPEND=">=dev-lang/ocaml-3.10.2:=[ocamlopt?] - gtk? ( dev-ml/lablgtk:=[gnomecanvas,ocamlopt?] )" + gtk? ( dev-ml/lablgtk:2=[gnomecanvas,ocamlopt?] )" DEPEND="${RDEPEND} doc? ( dev-tex/hevea dev-ml/ocamlweb )" IUSE="doc examples gtk +ocamlopt"
[gentoo-commits] repo/gentoo:master commit in: dev-ml/ocamlgraph/
commit: 461806dcdde5216c7532409ce67f753919bda4a1 Author: Mikle Kolyada gentoo org> AuthorDate: Sat Dec 15 09:18:06 2018 + Commit: Mikle Kolyada gentoo org> CommitDate: Sat Dec 15 09:19:05 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=461806dc dev-ml/ocamlgraph: amd64 stable wrt bug #672444 Signed-off-by: Mikle Kolyada gentoo.org> Package-Manager: Portage-2.3.51, Repoman-2.3.11 dev-ml/ocamlgraph/ocamlgraph-1.8.8.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dev-ml/ocamlgraph/ocamlgraph-1.8.8.ebuild b/dev-ml/ocamlgraph/ocamlgraph-1.8.8.ebuild index 71e564d353d..b653703ff09 100644 --- a/dev-ml/ocamlgraph/ocamlgraph-1.8.8.ebuild +++ b/dev-ml/ocamlgraph/ocamlgraph-1.8.8.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2017 Gentoo Foundation +# Copyright 1999-2018 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=5 @@ -10,7 +10,7 @@ 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 ~arm ~arm64 ~ppc ~x86" +KEYWORDS="amd64 ~arm ~arm64 ~ppc ~x86" RDEPEND=">=dev-lang/ocaml-3.10.2:=[ocamlopt?] gtk? ( dev-ml/lablgtk:=[gnomecanvas,ocamlopt?] )" DEPEND="${RDEPEND}
[gentoo-commits] repo/gentoo:master commit in: dev-ml/ocamlgraph/
commit: 8798bf91e5d2965f4abf802302769ff3a196a6a7 Author: Alexis Ballier gentoo org> AuthorDate: Wed Oct 18 08:48:25 2017 + Commit: Alexis Ballier gentoo org> CommitDate: Wed Oct 18 08:48:25 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=8798bf91 dev-ml/ocamlgraph: bump to 1.8.8 Package-Manager: Portage-2.3.11, Repoman-2.3.3 dev-ml/ocamlgraph/Manifest| 1 + dev-ml/ocamlgraph/ocamlgraph-1.8.8.ebuild | 57 +++ 2 files changed, 58 insertions(+) diff --git a/dev-ml/ocamlgraph/Manifest b/dev-ml/ocamlgraph/Manifest index f8415c11499..d61796edf3a 100644 --- a/dev-ml/ocamlgraph/Manifest +++ b/dev-ml/ocamlgraph/Manifest @@ -1 +1,2 @@ DIST ocamlgraph-1.8.7.tar.gz 272625 SHA256 df06ca06d25231bb8e162d6b853177cb7fc1565c8f1ec99ca051727d46c985a0 SHA512 27559293bf576ecc9cf49090e24905c50d00ebaeb444a3c917826f3cfe1e7ceab34b43e30f98634811b1688b675d8747b590b5bb103a720d099304f5031feb2e WHIRLPOOL 3b290012a97c96c75b1b63dec056c7afb6d7c1882fc61fd3a88b32397a2e871aa9e872950e6a6e7333450f3b46181df6e27f4fc3464e5c9a3776285a904d4727 +DIST ocamlgraph-1.8.8.tar.gz 282729 SHA256 d9eabefb73cad7bc59b3870f832cd0154f8b60feca89ef087f06e59cb9092f55 SHA512 ccb07d4a7fb0c3026ad2d4563e1ca0a88483ac3cf43c9378989ae5c031961853a11c9673c06b54a16733c5755d9c0a2783c5f475afdcc7692d2bf3d4778f5bc5 WHIRLPOOL adebbe7c1807dace65a2f2cf8ed3ce88ba7dba053d58cd81edfa2ab83e84fda5cc7ce0f0e3101063692feb0db6ca02340dfee602c950a07b4784beab4b4a4b61 diff --git a/dev-ml/ocamlgraph/ocamlgraph-1.8.8.ebuild b/dev-ml/ocamlgraph/ocamlgraph-1.8.8.ebuild new file mode 100644 index 000..71e564d353d --- /dev/null +++ b/dev-ml/ocamlgraph/ocamlgraph-1.8.8.ebuild @@ -0,0 +1,57 @@ +# Copyright 1999-2017 Gentoo Foundation +# Distributed under the terms of the GNU General Public License v2 + +EAPI=5 + +inherit findlib + +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 ~arm ~arm64 ~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_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.adoc 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 +}
[gentoo-commits] repo/gentoo:master commit in: dev-ml/ocamlgraph/
commit: 7a5e4345845485941c9c64374b5db3ce5d644021 Author: Alexis Ballier gentoo org> AuthorDate: Thu Apr 27 10:36:04 2017 + Commit: Alexis Ballier gentoo org> CommitDate: Thu Apr 27 10:40:02 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=7a5e4345 dev-ml/ocamlgraph: add remoteid on the github mirror Package-Manager: Portage-2.3.5, Repoman-2.3.2 dev-ml/ocamlgraph/metadata.xml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/dev-ml/ocamlgraph/metadata.xml b/dev-ml/ocamlgraph/metadata.xml index ffa6c6b4395..3c1a3a18d2d 100644 --- a/dev-ml/ocamlgraph/metadata.xml +++ b/dev-ml/ocamlgraph/metadata.xml @@ -5,4 +5,7 @@ m...@gentoo.org Gentoo ML Project + + backtracking/ocamlgraph +
[gentoo-commits] repo/gentoo:master commit in: dev-ml/ocamlgraph/
commit: 2839ada6bbceaab550996e8385e2fd995b11a228 Author: Markus Meier gentoo org> AuthorDate: Wed Apr 5 17:35:57 2017 + Commit: Markus Meier gentoo org> CommitDate: Wed Apr 5 17:49:32 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2839ada6 dev-ml/ocamlgraph: add ~arm, bug #611014 Package-Manager: Portage-2.3.5, Repoman-2.3.2 RepoMan-Options: --include-arches="arm" dev-ml/ocamlgraph/ocamlgraph-1.8.7.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-ml/ocamlgraph/ocamlgraph-1.8.7.ebuild b/dev-ml/ocamlgraph/ocamlgraph-1.8.7.ebuild index 18efb1f5c8b..af971512a62 100644 --- a/dev-ml/ocamlgraph/ocamlgraph-1.8.7.ebuild +++ b/dev-ml/ocamlgraph/ocamlgraph-1.8.7.ebuild @@ -10,7 +10,7 @@ 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" +KEYWORDS="~amd64 ~arm ppc x86" RDEPEND=">=dev-lang/ocaml-3.10.2:=[ocamlopt?] gtk? ( dev-ml/lablgtk:=[gnomecanvas,ocamlopt?] )" DEPEND="${RDEPEND}
[gentoo-commits] repo/gentoo:master commit in: dev-ml/ocamlgraph/, dev-ml/ocamlgraph/files/
commit: 986a8aa3a3f412a8f03bd1bad99f5af8387c6392 Author: Alexis Ballier gentoo org> AuthorDate: Tue Feb 14 09:35:37 2017 + Commit: Alexis Ballier gentoo org> CommitDate: Tue Feb 14 09:35:37 2017 + 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 00..f0d370cfd9 --- /dev/null +++ b/dev-ml/ocamlgraph/files/ocamlgraph-1.8.7-test.patch @@ -0,0 +1,19 @@ +commit 726e8d6e31224eb70f75655579da9a374e910b98 +Author: Jean-Christophe Filliatre+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() {
[gentoo-commits] repo/gentoo:master commit in: dev-ml/ocamlgraph/, dev-ml/ocamlgraph/files/
commit: 161a823fe688ad9e03c828885362608a71971e9c Author: Alexis Ballier gentoo org> AuthorDate: Thu Jan 26 11:41:41 2017 + Commit: Alexis Ballier gentoo org> CommitDate: Thu Jan 26 11:41:41 2017 + 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.. --- 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.. --- 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 -}
[gentoo-commits] repo/gentoo:master commit in: dev-ml/ocamlgraph/
commit: 867f9162542953bd123f10c71aa445160627dfdb Author: Agostino Sarubbo gentoo org> AuthorDate: Thu Jan 26 10:58:43 2017 + Commit: Agostino Sarubbo gentoo org> CommitDate: Thu Jan 26 11:00:37 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=867f9162 dev-ml/ocamlgraph: ppc stable wrt bug #607038 Package-Manager: portage-2.3.0 RepoMan-Options: --include-arches="ppc" Signed-off-by: Agostino Sarubbo gentoo.org> dev-ml/ocamlgraph/ocamlgraph-1.8.7.ebuild | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev-ml/ocamlgraph/ocamlgraph-1.8.7.ebuild b/dev-ml/ocamlgraph/ocamlgraph-1.8.7.ebuild index cd24a5c..3cbbd5a 100644 --- a/dev-ml/ocamlgraph/ocamlgraph-1.8.7.ebuild +++ b/dev-ml/ocamlgraph/ocamlgraph-1.8.7.ebuild @@ -11,7 +11,7 @@ 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" +KEYWORDS="~amd64 ppc x86" RDEPEND=">=dev-lang/ocaml-3.10.2:=[ocamlopt?] gtk? ( dev-ml/lablgtk:=[gnomecanvas,ocamlopt?] )" DEPEND="${RDEPEND}
[gentoo-commits] repo/gentoo:master commit in: dev-ml/ocamlgraph/
commit: c8a3cc37b206cada8b326cd8ee7ae86efe3f6507 Author: Agostino Sarubbo gentoo org> AuthorDate: Wed Jan 25 10:58:00 2017 + Commit: Agostino Sarubbo gentoo org> CommitDate: Wed Jan 25 10:58:00 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c8a3cc37 dev-ml/ocamlgraph: x86 stable wrt bug #607038 Package-Manager: portage-2.3.0 RepoMan-Options: --include-arches="x86" Signed-off-by: Agostino Sarubbo gentoo.org> dev-ml/ocamlgraph/ocamlgraph-1.8.7.ebuild | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dev-ml/ocamlgraph/ocamlgraph-1.8.7.ebuild b/dev-ml/ocamlgraph/ocamlgraph-1.8.7.ebuild index 4360d22..cd24a5c 100644 --- a/dev-ml/ocamlgraph/ocamlgraph-1.8.7.ebuild +++ b/dev-ml/ocamlgraph/ocamlgraph-1.8.7.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2014 Gentoo Foundation +# Copyright 1999-2017 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 # $Id$ @@ -11,7 +11,7 @@ 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" +KEYWORDS="~amd64 ~ppc x86" RDEPEND=">=dev-lang/ocaml-3.10.2:=[ocamlopt?] gtk? ( dev-ml/lablgtk:=[gnomecanvas,ocamlopt?] )" DEPEND="${RDEPEND}
[gentoo-commits] repo/gentoo:master commit in: dev-ml/ocamlgraph/, dev-ml/ocamlgraph/files/
commit: 3fbe9da179920cfcdc2557d7a98dcade676a0b23 Author: Alexis Ballier gentoo org> AuthorDate: Tue Dec 13 13:53:39 2016 + Commit: Alexis Ballier gentoo org> CommitDate: Tue Dec 13 13:53:39 2016 + 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.. --- 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.. --- 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?] )"
[gentoo-commits] repo/gentoo:master commit in: dev-ml/ocamlgraph/
commit: ce997f70505ed206b69db9ab192a38b7d0203e8f Author: Alexis Ballier gentoo org> AuthorDate: Fri Apr 22 12:44:41 2016 + Commit: Alexis Ballier gentoo org> CommitDate: Fri Apr 22 13:01:44 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=ce997f70 dev-ml/ocamlgraph: restore keywords on 1.8.7 now that dose3 is fixed Package-Manager: portage-2.2.28 dev-ml/ocamlgraph/ocamlgraph-1.8.7.ebuild | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/dev-ml/ocamlgraph/ocamlgraph-1.8.7.ebuild b/dev-ml/ocamlgraph/ocamlgraph-1.8.7.ebuild index 0ba999e..4360d22 100644 --- a/dev-ml/ocamlgraph/ocamlgraph-1.8.7.ebuild +++ b/dev-ml/ocamlgraph/ocamlgraph-1.8.7.ebuild @@ -11,8 +11,7 @@ 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}" -#Breaks dev-ml/dose3 -#KEYWORDS="~amd64 ~ppc ~x86" +KEYWORDS="~amd64 ~ppc ~x86" RDEPEND=">=dev-lang/ocaml-3.10.2:=[ocamlopt?] gtk? ( dev-ml/lablgtk:=[gnomecanvas,ocamlopt?] )" DEPEND="${RDEPEND}
[gentoo-commits] repo/gentoo:master commit in: dev-ml/ocamlgraph/
commit: c032494c620faa33fc65be470f662da4f8c8a792 Author: Alexis Ballier gentoo org> AuthorDate: Thu Apr 21 09:07:30 2016 + Commit: Alexis Ballier gentoo org> CommitDate: Thu Apr 21 09:07:36 2016 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=c032494c dev-ml/ocamlgraph: bump to 1.8.7; without keywords because it breaks dose3 Package-Manager: portage-2.2.28 dev-ml/ocamlgraph/Manifest| 1 + dev-ml/ocamlgraph/ocamlgraph-1.8.7.ebuild | 63 +++ 2 files changed, 64 insertions(+) diff --git a/dev-ml/ocamlgraph/Manifest b/dev-ml/ocamlgraph/Manifest index aa6e651..63e11e7 100644 --- a/dev-ml/ocamlgraph/Manifest +++ b/dev-ml/ocamlgraph/Manifest @@ -1,3 +1,4 @@ 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/ocamlgraph-1.8.7.ebuild b/dev-ml/ocamlgraph/ocamlgraph-1.8.7.ebuild new file mode 100644 index 000..0ba999e --- /dev/null +++ b/dev-ml/ocamlgraph/ocamlgraph-1.8.7.ebuild @@ -0,0 +1,63 @@ +# 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}" +#Breaks dev-ml/dose3 +#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}/${PN}-1.8.6-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.adoc 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 +}
[gentoo-commits] repo/gentoo:master commit in: dev-ml/ocamlgraph/, dev-ml/ocamlgraph/files/
commit: e8acaed31d2d3a383342acab203206286041386b Author: Alexis Ballier gentoo org> AuthorDate: Tue Jan 19 11:31:25 2016 + Commit: Alexis Ballier gentoo org> CommitDate: Tue Jan 19 11:35:24 2016 + 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 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 000..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 000..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() {