diff options
| -rw-r--r-- | dev-ml/ocamlgraph/ChangeLog | 4 | ||||
| -rw-r--r-- | dev-ml/ocamlgraph/Manifest | 30 | ||||
| -rw-r--r-- | dev-ml/ocamlgraph/files/ocamlgraph-1.2-makefile.patch | 102 | ||||
| -rw-r--r-- | dev-ml/ocamlgraph/files/ocamlgraph-1.5-makefile.patch | 37 | ||||
| -rw-r--r-- | dev-ml/ocamlgraph/metadata.xml | 26 | ||||
| -rw-r--r-- | dev-ml/ocamlgraph/ocamlgraph-1.5.ebuild (renamed from dev-ml/ocamlgraph/ocamlgraph-1.2.ebuild) | 4 |
6 files changed, 70 insertions, 133 deletions
diff --git a/dev-ml/ocamlgraph/ChangeLog b/dev-ml/ocamlgraph/ChangeLog index 8628a4ef0..78439f00d 100644 --- a/dev-ml/ocamlgraph/ChangeLog +++ b/dev-ml/ocamlgraph/ChangeLog @@ -2,6 +2,10 @@ # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2 # $Header: $ + 04 Jul 2010; J.-C. Demay <jcdemay@gmail.com> + -files/ocamlgraph-1.2-makefile.patch, +files/ocamlgraph-1.5-makefile.patch, -ocamlgraph-1.2.ebuild, +ocamlgraph-1.5.ebuild: + Version bump + 22 Jun 2010; Andreas K. Huettel (dilfridge) <mail@akhuettel.de> ocamlgraph-1.2.ebuild, +metadata.xml: QA fixes diff --git a/dev-ml/ocamlgraph/Manifest b/dev-ml/ocamlgraph/Manifest index 04e895d90..0153fcd09 100644 --- a/dev-ml/ocamlgraph/Manifest +++ b/dev-ml/ocamlgraph/Manifest @@ -1,25 +1,5 @@ ------BEGIN PGP SIGNED MESSAGE----- -Hash: SHA1 - -AUX ocamlgraph-1.2-makefile.patch 3980 RMD160 fda851982c979d4c4d667bdd803bb9a570f8e3f8 SHA1 74eec2569ad39f35fd784fc13fa16f7d37cbe3f8 SHA256 fa5ce23b1561555c07d51a75b7e2850fdb1b6abe41bc902b9d4f8f99a1473e0c -DIST ocamlgraph-1.2.tar.gz 213426 RMD160 c5ef73069a912ba179adbad3c4e0d629cc91cd54 SHA1 087cd2720c1a3df3f6543db4ad8d81983fcddba0 SHA256 0695a91a3f2abc0f47eafdae4af8a6022154727aec00784a12362d3719ff51f2 -EBUILD ocamlgraph-1.2.ebuild 936 RMD160 96373ab204091fd4140860d4282913e62429a5f6 SHA1 3336c9a5f327e74179582646afabe732bec0c2c3 SHA256 b854030c09ddb780f580d8ecdc3937086331b90687e72723cbe025dac1737d13 -MISC ChangeLog 236 RMD160 67880e66ebff71c01d24421c41bf6fe90ff5a396 SHA1 d86465a564a15d8fef4c3506f7cb537ec49d913c SHA256 c1a31521bc18f78b862d94f4aafe0358d918c12bf5ba4eb756c8cbe765df02fa -MISC metadata.xml 215 RMD160 bc9c07aa91f2f175542244e4e4522a73558210a1 SHA1 facb283386de1c0b6b938cdcd4dde04d1694298b SHA256 13f32353652adbd3d934d41381cfc2cacc9e1127c508cebc73806cc1026ee80c ------BEGIN PGP SIGNATURE----- -Version: GnuPG v2.0.15 (GNU/Linux) - -iQIcBAEBAgAGBQJMIShXAAoJENwGBM22xffeA+kP/A325YGzitb+hsG7lHexRDcg -CP+MeN4kg7Wnngt+RHCrniq5S3wh2Myno79qO+4T6KcPGHd+/BxFCyRSYefjBVIe -n3mYEscWCm3KbbsW160aaK5SuUVMyJ3VLSuyRgzh7GUwrHxIrR7G2/rTSMWaVp0z -r5ZzMyyzYu9/RNMGSGue4V7+tdZA9LU0Ae6vlitG93BA18lX2XYYdJPDoScSveQG -YbNwjJXGGpbuYUBkeOCHIh3ohCKpNY8sgqYayZ1mgr/oTIm0p9URQTT1wKFQxAOY -VHYsCvR0rnyPQ5Iq+HnFQ9t5tRY74UfRcfZJmyrplAEw6bJIDFVxAi34cPQN3VkV -F8zBKIzlA/gG2zU28M6+G6f8qY5ApDtcOhskor1Gg1nKORvHi55IYuSIK8NQtMBb -pl+9aKdOvJFSV5Px0w9DNjaF7OJ0xqi/xgMGmo3AZpQOO95lQReU2jMD4XNeYoPn -viv1QeeMnh2Je75RW3TAX5j5T+fDRyaq3ziSf4l5xnD8/QRSirb37lYcaQwlfDsP -1b0T0zcakTNyq9AjetURHPCXaSv20XUTQQheuz4JtARjkEaSEWx6gQ7gbVA5fF2x -goD5Ge4YpE9aDFw1hXdOvdpcwyqqOQViKKHKYP5TpcSpfR+Ind4OU988WOo/FBu1 -qTGFw4HHgzDsECGxX2xb -=zDzP ------END PGP SIGNATURE----- +AUX ocamlgraph-1.5-makefile.patch 1564 RMD160 f1a4949963658165492b67d456ff57b40af1608e SHA1 963e31c341579f9417eb46dd61a6851d7c27d3dd SHA256 c36612f740033a3d158f5d2a458697b1a41dacf2d1964484c1fd0c0f39fd276b +DIST ocamlgraph-1.5.tar.gz 220307 RMD160 d51a3009dd8430a9a2f340cefee01d3759dda6e1 SHA1 a0e3a68d6cece2481bc5c6978a02c556c4afc077 SHA256 24a72e46ad38feedde5c30787707dbc9966088149a18100b9691c7ed0e3cd9f1 +EBUILD ocamlgraph-1.5.ebuild 920 RMD160 adffa6921a5c6a7a348151da8ec5862050f20767 SHA1 39cef5b49373aa91e275f5a85f5af75e38631e0f SHA256 c853ad01eb1223be2c4eac663eb774da6c58c1dac965559380dd9a51ed8f4610 +MISC ChangeLog 425 RMD160 09d1be52402bf5a3d5ed2e878e30570456156316 SHA1 af8e0679ede5909d8ba533d7ea5471ae274cc91a SHA256 ee6c676a09385dfbc6ed17ce3c79007e21c4905d650ca84e17ef5f3bbdb6fcc2 +MISC metadata.xml 1387 RMD160 8fc86d9fb0b1ae585c9ed9c8cca5a47416ea1a2c SHA1 654c9811c01e785f5a6c3ea31a5a15c0f90f3634 SHA256 2a242778c24a7fb97cce396194c7e5813d1cb9f9a12f3d00a1fc8bdfad988cbf diff --git a/dev-ml/ocamlgraph/files/ocamlgraph-1.2-makefile.patch b/dev-ml/ocamlgraph/files/ocamlgraph-1.2-makefile.patch deleted file mode 100644 index fd7b8de5c..000000000 --- a/dev-ml/ocamlgraph/files/ocamlgraph-1.2-makefile.patch +++ /dev/null @@ -1,102 +0,0 @@ -diff -Naurd ocamlgraph-1.2-orign/Makefile.in ocamlgraph-1.2-patch/Makefile.in ---- ocamlgraph-1.2-orign/Makefile.in 2009-08-31 05:57:53.000000000 +0000 -+++ ocamlgraph-1.2-patch/Makefile.in 2009-09-11 13:23:51.000000000 +0000 -@@ -31,7 +31,7 @@ - OCAMLDOC = @OCAMLDOC@ - OCAMLLEX = @OCAMLLEX@ - OCAMLYACC= @OCAMLYACC@ --OCAMLLIB = @OCAMLLIB@ -+OCAMLLIB = @OCAMLLIB@/ocamlgraph/ - OCAMLBEST= @OCAMLBEST@ - OCAMLVERSION = @OCAMLVERSION@ - OCAMLWEB = @OCAMLWEB@ -@@ -147,6 +147,7 @@ - VIEWER_CMO:=$(patsubst %,$(VIEWER_DIR)/%.cmo, $(VIEWER_CMO)) - VIEWER_CMX=$(VIEWER_CMO:.cmo=.cmx) - VIEWER_CMI=$(VIEWER_CMO:.cmo=.cmi) -+VIEWER_OBJ=$(VIEWER_CMO:.cmo=.o) - - VIEWER_INCLUDES= @INCLUDEGTK2@ -I $(VIEWER_DIR) $(INCLUDES) -I . - -@@ -175,6 +176,7 @@ - DGRAPH_CMO:=$(patsubst %,$(DGRAPH_DIR)/%.cmo, $(DGRAPH_CMO)) - DGRAPH_CMX=$(DGRAPH_CMO:.cmo=.cmx) - DGRAPH_CMI=$(DGRAPH_CMO:.cmo=.cmi) -+DGRAPH_OBJ=$(DGRAPH_CMO:.cmo=.o) - - DGRAPH_INCLUDES= @INCLUDEGTK2@ -I $(DGRAPH_DIR) $(INCLUDES) -I . - -@@ -270,42 +272,48 @@ - - install: install-$(OCAMLBEST) install-byte - ifeq (@LABLGNOMECANVAS@,yes) -+ mkdir -p $(DESTDIR)$(BINDIR) - ifeq ($(OCAMLBEST),byte) -- cp -f $(BINDIR)/graph-editor.byte $(BINDIR)/graph-editor$(EXE) -- cp -f $(BINDIR)/graph-viewer.byte $(BINDIR)/graph-viewer$(EXE) -+ ln -s $(BINDIR)/ocamlgraph-editor.byte $(DESTDIR)$(BINDIR)/ocamlgraph-editor$(EXE) -+ ln -s $(BINDIR)/ocamlgraph-viewer.byte $(DESTDIR)$(BINDIR)/ocamlgraph-viewer$(EXE) - else -- cp -f $(BINDIR)/graph-editor.opt $(BINDIR)/graph-editor$(EXE) -- cp -f $(BINDIR)/graph-viewer.opt $(BINDIR)/graph-viewer$(EXE) -+ mv $(DESTDIR)$(BINDIR)/ocamlgraph-editor.opt $(DESTDIR)$(BINDIR)/ocamlgraph-editor$(EXE) -+ mv $(DESTDIR)$(BINDIR)/ocamlgraph-viewer.opt $(DESTDIR)$(BINDIR)/ocamlgraph-viewer$(EXE) - endif - endif - - install-byte: -+ mkdir -p "$(DESTDIR)$(OCAMLLIB)" - cp -f graph.cmo graph.cmi $(CMA) "$(DESTDIR)$(OCAMLLIB)" - ifeq (@LABLGNOMECANVAS@,yes) -- cp -f $(ED_DIR)/editor.byte $(BINDIR)/graph-editor.byte -- cp -f $(VIEWER_CMO) "$(DESTDIR)$(OCAMLLIB)" -- cp -f $(DGRAPH_CMO) "$(DESTDIR)$(OCAMLLIB)" -- cp -f $(DGRAPH_DIR)/dgraph.byte $(BINDIR)/graph-viewer.byte -+ mkdir -p $(DESTDIR)$(BINDIR) -+ cp -f $(ED_DIR)/editor.byte $(DESTDIR)$(BINDIR)/ocamlgraph-editor.byte -+ cp -f $(VIEWER_CMO) $(VIEWER_CMI) "$(DESTDIR)$(OCAMLLIB)" -+ cp -f $(DGRAPH_CMO) $(DGRAPH_CMI) "$(DESTDIR)$(OCAMLLIB)" -+ cp -f $(DGRAPH_DIR)/dgraph.byte $(DESTDIR)$(BINDIR)/ocamlgraph-viewer.byte - endif - - install-opt: install-byte -+ mkdir -p "$(DESTDIR)$(OCAMLLIB)" - cp -f graph$(LIBEXT) graph.cmx $(CMXA) "$(DESTDIR)$(OCAMLLIB)" - ifeq (@LABLGNOMECANVAS@,yes) -- cp -f $(ED_DIR)/editor.opt $(BINDIR)/graph-editor.opt -- cp -f $(VIEWER_CMX) "$(DESTDIR)$(OCAMLLIB)" -- cp -f $(DGRAPH_CMX) "$(DESTDIR)$(OCAMLLIB)" -- cp -f $(DGRAPH_DIR)/dgraph.opt $(BINDIR)/graph-viewer.opt -+ mkdir -p $(DESTDIR)$(BINDIR) -+ cp -f $(ED_DIR)/editor.opt $(DESTDIR)$(BINDIR)/ocamlgraph-editor.opt -+ cp -f $(VIEWER_CMX) $(VIEWER_OBJ) "$(DESTDIR)$(OCAMLLIB)" -+ cp -f $(DGRAPH_CMX) $(DGRAPH_OBJ) "$(DESTDIR)$(OCAMLLIB)" -+ cp -f $(DGRAPH_DIR)/dgraph.opt $(DESTDIR)$(BINDIR)/ocamlgraph-viewer.opt - endif - - install-findlib: META - ifdef OCAMLFIND -+ mkdir -p $(DESTDIR)/$(OCAMLLIB) - ifeq (@LABLGNOMECANVAS@,yes) -- $(OCAMLFIND) install ocamlgraph META $(SRCDIR)/*.mli \ -- graph$(LIBEXT) graph.cmx graph.cmo graph.cmi $(CMA) $(CMXA) \ -- $(VIEWER_CMX) $(VIEWER_CMO) $(DGRAPH_CMX) $(DGRAPH_CMO) -+ $(OCAMLFIND) install -destdir $(DESTDIR)/$(OCAMLLIB) \ -+ ocamlgraph META $(SRCDIR)/*.mli dgraph/*.mli dgraph/viewer.ml \ -+ dgraph/dGraphViewer.ml view_graph/*.mli view_graph/viewGraph_test.ml - else -- $(OCAMLFIND) install ocamlgraph META $(SRCDIR)/*.mli \ -- graph$(LIBEXT) graph.cmx graph.cmo graph.cmi $(CMA) $(CMXA) -+ $(OCAMLFIND) install -destdir $(DESTDIR)/$(OCAMLLIB) \ -+ ocamlgraph META $(SRCDIR)/*.mli - endif - endif - -@@ -328,7 +336,6 @@ - mkdir -p doc - rm -f doc/* - $(OCAMLDOC) -d doc -html $(INCLUDES) $(DOC_SRC) -- $(MAKE) -C $(VIEWER_DIR) doc - - # literate programming - $(NAME).tex: $(DOC_SRC) diff --git a/dev-ml/ocamlgraph/files/ocamlgraph-1.5-makefile.patch b/dev-ml/ocamlgraph/files/ocamlgraph-1.5-makefile.patch new file mode 100644 index 000000000..3e25630c5 --- /dev/null +++ b/dev-ml/ocamlgraph/files/ocamlgraph-1.5-makefile.patch @@ -0,0 +1,37 @@ +diff -Naurp ocamlgraph-1.5-orig/Makefile.in ocamlgraph-1.5-ptch/Makefile.in +--- ocamlgraph-1.5-orig/Makefile.in 2010-04-29 06:40:53.000000000 +0000 ++++ ocamlgraph-1.5-ptch/Makefile.in 2010-07-04 15:44:05.000000000 +0000 +@@ -16,7 +16,6 @@ + ########################################################################## + + # Where to install the binaries +-DESTDIR = + prefix =@prefix@ + exec_prefix=@exec_prefix@ + datarootdir=@datarootdir@ +@@ -293,11 +292,13 @@ install: install-$(OCAMLBEST) install-by + mkdir -p $(BINDIR) + ifeq (@LABLGNOMECANVAS@,yes) + ifeq ($(OCAMLBEST),byte) +- cp -f $(BINDIR)/graph-editor.byte $(BINDIR)/graph-editor$(EXE) +- cp -f $(BINDIR)/graph-viewer.byte $(BINDIR)/graph-viewer$(EXE) ++ mv $(BINDIR)/graph-editor.byte $(BINDIR)/ocamlgraph-editor$(EXE) ++ mv $(BINDIR)/graph-viewer.byte $(BINDIR)/ocamlgraph-viewer$(EXE) + else +- cp -f $(BINDIR)/graph-editor.opt $(BINDIR)/graph-editor$(EXE) +- cp -f $(BINDIR)/graph-viewer.opt $(BINDIR)/graph-viewer$(EXE) ++ mv $(BINDIR)/graph-editor.opt $(BINDIR)/ocamlgraph-editor$(EXE) ++ mv $(BINDIR)/graph-viewer.opt $(BINDIR)/ocamlgraph-viewer$(EXE) ++ mv $(BINDIR)/graph-editor.byte $(BINDIR)/ocamlgraph-editor.byte ++ mv $(BINDIR)/graph-viewer.byte $(BINDIR)/ocamlgraph-viewer.byte + endif + endif + +@@ -305,6 +306,7 @@ install-byte: + mkdir -p $(INSTALL_LIBDIR) + cp -f graph.cmo graph.cmi $(CMA) $(INSTALL_LIBDIR) + cp -f $(SRCDIR)/*.mli $(INSTALL_LIBDIR) ++ cp -f META $(SRCDIR)/*.mli $(INSTALL_LIBDIR) + ifeq (@LABLGNOMECANVAS@,yes) + mkdir -p $(BINDIR) + cp -f $(ED_DIR)/editor.byte $(BINDIR)/graph-editor.byte diff --git a/dev-ml/ocamlgraph/metadata.xml b/dev-ml/ocamlgraph/metadata.xml index efb490d78..44617945b 100644 --- a/dev-ml/ocamlgraph/metadata.xml +++ b/dev-ml/ocamlgraph/metadata.xml @@ -1,8 +1,26 @@ <?xml version="1.0" encoding="UTF-8"?> <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> <pkgmetadata> -<herd>sci</herd> -<maintainer> - <email>sci@gentoo.org</email> -</maintainer> + <herd>sci</herd> + <longdescription> + It provides an easy-to-use graph data structure together with several + operations and algorithms over graphs, in Graph.Pack. It is a reasonably + efficient imperative data structure for directed graphs with vertices + and edges labeled with integers. Several other graph implementations + are proposed for those not satisfied with the one above. Some are + persistent (imutable) and other imperative (mutable). Some are directed + and other are not. Some have labels for vertices, or labels for edges, + or both. Some have abstract types for vertices. etc. These + implementations are written as functors: you give the types of vertices + labels, edge labels, etc. and you get the data structure as a result. + it also provides several classic operations and algorithms over graphs. + They are also written as functors i.e. independently of the data + structure for graphs. One consequence is that you can define your own + data structure for graphs and yet re-use all the algorithms from this + library: you only need to provide a few operations such as iterating + over all vertices, over the successors of a vertex, etc. + </longdescription> + <maintainer> + <email>sci@gentoo.org</email> + </maintainer> </pkgmetadata> diff --git a/dev-ml/ocamlgraph/ocamlgraph-1.2.ebuild b/dev-ml/ocamlgraph/ocamlgraph-1.5.ebuild index 67dc4c764..dffb06128 100644 --- a/dev-ml/ocamlgraph/ocamlgraph-1.2.ebuild +++ b/dev-ml/ocamlgraph/ocamlgraph-1.5.ebuild @@ -25,7 +25,7 @@ src_prepare() { } src_compile() { - emake DESTDIR="/" -j1 || die "emake failed" + emake -j1 DESTDIR="/" || die "emake failed" if use doc; then emake doc || die "emake doc failed" @@ -33,7 +33,7 @@ src_compile() { } src_install() { - emake install install-findlib DESTDIR="${D}" || die "emake install failed" + emake install DESTDIR="${D}" || die "emake install failed" dodoc CHANGES CREDITS FAQ README if use doc; then |