version bump

Signed-off-by: aballier@gentoo.org
Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0x160F534A

4 files changed, 116 insertions, 7 deletions

diff --git a/dev-ml/ocamlgraph/ChangeLog b/dev-ml/ocamlgraph/ChangeLog
index 4987e1bb1271..ba19e2b4aa48 100644
--- a/dev-ml/ocamlgraph/ChangeLog
+++ b/dev-ml/ocamlgraph/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for dev-ml/ocamlgraph
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ml/ocamlgraph/ChangeLog,v 1.13 2013/08/19 13:46:39 aballier Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/ocamlgraph/ChangeLog,v 1.14 2014/10/28 08:13:27 aballier Exp $
+
+*ocamlgraph-1.8.5 (28 Oct 2014)
+
+  28 Oct 2014; Alexis Ballier <aballier@gentoo.org> +ocamlgraph-1.8.5.ebuild,
+  +files/ocamlgraph-1.8.5-installfindlib.patch:
+  version bump
 
   19 Aug 2013; Alexis Ballier <aballier@gentoo.org> ocamlgraph-0.99b.ebuild:
   eapi5, define subslot and add := dep on ocaml
diff --git a/dev-ml/ocamlgraph/Manifest b/dev-ml/ocamlgraph/Manifest
index d04735752baa..849958121e26 100644
--- a/dev-ml/ocamlgraph/Manifest
+++ b/dev-ml/ocamlgraph/Manifest
@@ -2,14 +2,17 @@
 Hash: SHA256
 
 AUX ocamlgraph-0.99b-installfindlib.patch 657 SHA256 b3a0bc51a64d1ef13d0a83e897620ead573c38c4185e46b1e0e34e58fa3f565a SHA512 a83bf9b9ba8ff9393b5c7d7c7c96ac066bc763d463376655c4d072b7ede20029a99447576e5e5ded6e3d96b8bb66a30024de503d00d02da99dbfa90fdd850a68 WHIRLPOOL 1649e9dd6b72210623cd73edcdffdf1c9ca24c63ea59d3c557dba18c9e8d4f0ea692813d1f92a1901ff6be90d5542f3f6da0f4d16653aae3471e54583fbf8740
+AUX ocamlgraph-1.8.5-installfindlib.patch 1392 SHA256 44e69687e3c074fcc23e9c65ecec005dfea7c12db3347859fd6c566bbd06d104 SHA512 aad009d2ef1ed5c6136bee8cd343d1e5dab1c41dfa59c78d8e77f62b74a229c81b25aff233eafab7097cbb700487c0f72afe2dd59f56c43177cabf9b1f784460 WHIRLPOOL ceb9c91973c59dbe891503120dbcdeb3e7233b12603d65507befd0b5ea4f4305de0181f5c55bea039a4cc09749d146617124a04fe793a3ab3bf94085dc0f56af
 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
 EBUILD ocamlgraph-0.99b.ebuild 1241 SHA256 7ff591010e7414b9123319685c9cc2a4cb9e6d1b2da442920a0b236c6e298f24 SHA512 329f15edab966c23f0652eb94e29e4bc6ec062d491cf1c1675288a84df07fee4b6ab68b192caf7ca1e83853f144712022a54febf4a86d507938b82ca679a2499 WHIRLPOOL d9f3817ed0018c958c7ac4c26e3c3ef8a6e701bd8b59eeb11162f15ca20877cb5a0f932c96e43db7c28dbde451eba46dd8992f0c07ccdc77620a98a247666a68
-MISC ChangeLog 2007 SHA256 75c6a2245295ccf2f3f93962885f62165a6643daf643d8010929b87c6b6204ef SHA512 061e933d5d1a2e84aa04921d6790a723a8fdcfb759dcf435ab593495cf4b0398b5c367f4a2896b3d7d87bda1e2d0989b2c483b33fc3484df3ad1bc12797cf674 WHIRLPOOL 75f40d574e8a6f224937bd3a11511b85c5b479bdc394f15ebfdd49562db6d093a30435e5bdaae9c2472057af2f94a5df17a53ca22f11e3f9fd3b1f792f7b8aa9
+EBUILD ocamlgraph-1.8.5.ebuild 1439 SHA256 4a2cb6d91de934c6c9d5aa2aac680f151877a51ac0a5604a892158f080ae2c13 SHA512 ab4d92dad782f44e700564b57e3938fe01c4625fc12be0c37b3f356f5b07022ca5979a2c051c482d84e467e0ada41441dbadbf220313762716e114cc7bb7ca1d WHIRLPOOL 7c67abe8f99eef48fc5beb03b2991e6f6eedd255f2c6e18979d847191937f60ce00b5b493c2f83bf7af373b7e59fa5ff896dd3f0976a89cf1e8c9e7529af2e26
+MISC ChangeLog 2182 SHA256 b469574d03896dda0e823d6c77852274b49e73ca7b187f8f3b6b9b3bc96fde18 SHA512 31294abcf75b5bffaf5dcd58bbd35cf16dddbdac2a3a98389848f4f943a2a71e0f88e2f6d2dcafdeaf38ee02841ca614b0b0e297902598b91988f8a95e5d5f00 WHIRLPOOL 9fb525c357e268fd7a6afb0c6b29f55a3f2e0f3056697d4497fef3338a69d7d5f9b5dfdd43bccb93efa065cf0d2463914d0b32e8becc657bb51867c2e7901a8c
 MISC metadata.xml 157 SHA256 d14b8b08774f2a40f42d70ff40b1b4f1c4725e7095d702143a32909553eac799 SHA512 5e4a17ffdcc021c3d28f9ac71f8ec0b35a243e269281ba7db2e17845d7990221040ab16db6fa13c708f7d8db154d8d65d2d7f80f3a7dd84bc001449369738f2f WHIRLPOOL 79ae48d5df04eab0d90848c85d48c62b0e3901cc5c9a74d0b85de5becac5de0f55a3c9c719bf716bb757cfd8be306a222f247a0749fb346f6589893698b25c63
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.20 (GNU/Linux)
+Version: GnuPG v2
 
-iEYEAREIAAYFAlISIcAACgkQvFcC4BYPU0quKACcCnRDg8mOhcyJVhitUdOc0nHv
-99wAn3CPKgaudYSZAO7GwbDttHXVM385
-=IRNY
+iEYEAREIAAYFAlRPUCgACgkQvFcC4BYPU0q4lwCggNl7tnmBP7G8S0BtgJbIZEyS
+qWQAn0Is9+y7CQA8mO246/9Yyjltzwqp
+=iT35
 -----END PGP SIGNATURE-----
diff --git a/dev-ml/ocamlgraph/files/ocamlgraph-1.8.5-installfindlib.patch b/dev-ml/ocamlgraph/files/ocamlgraph-1.8.5-installfindlib.patch
new file mode 100644
index 000000000000..30eb937069d0
--- /dev/null
+++ b/dev-ml/ocamlgraph/files/ocamlgraph-1.8.5-installfindlib.patch
@@ -0,0 +1,38 @@
+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
new file mode 100644
index 000000000000..f6def1163626
--- /dev/null
+++ b/dev-ml/ocamlgraph/ocamlgraph-1.8.5.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2014 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/ocamlgraph/ocamlgraph-1.8.5.ebuild,v 1.1 2014/10/28 08:13:27 aballier Exp $
+
+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
+}