commit: b305884f5c719ec617cd267cf3040428c55e1697 Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at> AuthorDate: Sun Mar 14 16:48:07 2021 +0000 Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org> CommitDate: Sun Mar 14 18:57:31 2021 +0000 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 <mmk <AT> levelnine.at> Signed-off-by: Conrad Kostecki <conikost <AT> 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..00000000000 --- 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..00000000000 --- a/dev-ml/ocamlgraph/files/ocamlgraph-1.8.7-test.patch +++ /dev/null @@ -1,19 +0,0 @@ -commit 726e8d6e31224eb70f75655579da9a374e910b98 -Author: Jean-Christophe Filliatre <jean-christophe.fillia...@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
