multiple version bumps

4 files changed, 57 insertions, 32 deletions

diff --git a/dev-ml/ocamlgraph/ChangeLog b/dev-ml/ocamlgraph/ChangeLog
index 18e109637..42f0c5b82 100644
--- a/dev-ml/ocamlgraph/ChangeLog
+++ b/dev-ml/ocamlgraph/ChangeLog
@@ -1,24 +1,32 @@
 # ChangeLog for dev-ml/ocamlgraph
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
 # $Header: $
 
-  14 Jan 2013; J.-C. Demay <jcdemay@gmail.com>
-  +ocamlgraph-1.8.2.ebuild, +ocamlgraph-1.8.1.ebuild:
+  21 Jun 2014; Jonathan-Christofer Demay  <jcdemay@gmail.com>
+  -ocamlgraph-1.8.3.ebuild, +ocamlgraph-1.8.5.ebuild:
   version bump
 
-  21 Dec 2011; J.-C. Demay <jcdemay@gmail.com>
+  10 Jan 2014; Jonathan-Christofer Demay <jcdemay@gmail.com>
+  -ocamlgraph-1.8.2.ebuild, +ocamlgraph-1.8.3.ebuild:
+  version bump
+
+  14 Jan 2013; Jonathan-Christofer Demay <jcdemay@gmail.com>
+  -ocamlgraph-1.8.1.ebuild, +ocamlgraph-1.8.2.ebuild:
+  version bump
+
+  21 Dec 2011; Jonathan-Christofer Demay <jcdemay@gmail.com>
   -ocamlgraph-1.7.ebuild, +ocamlgraph-1.8.1.ebuild:
   version bump
 
-  06 May 2011; J.-C. Demay <jcdemay@gmail.com>
+  06 May 2011; Jonathan-Christofer Demay <jcdemay@gmail.com>
   -ocamlgraph-1.6.ebuild, +ocamlgraph-1.7.ebuild:
   version bump
 
-  13 Jul 2010; J.-C. Demay <jcdemay@gmail.com>
+  13 Jul 2010; Jonathan-Christofer Demay <jcdemay@gmail.com>
   -files/ocamlgraph-1.5-makefile.patch, +files/ocamlgraph-makefile.patch, -ocamlgraph-1.5.ebuild, +ocamlgraph-1.6.ebuild:
   version bump
 
-  04 Jul 2010; J.-C. Demay <jcdemay@gmail.com>
+  04 Jul 2010; Jonathan-Christofer 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
 
diff --git a/dev-ml/ocamlgraph/Manifest b/dev-ml/ocamlgraph/Manifest
index 4b4f6d4f0..123489c97 100644
--- a/dev-ml/ocamlgraph/Manifest
+++ b/dev-ml/ocamlgraph/Manifest
@@ -1 +1,5 @@
-DIST ocamlgraph-1.8.2.tar.gz 249253 SHA256 e54ae60cd977a032854166dad56348d0fb76c6cd8e03e960af455268f0c8b5a6 SHA512 93995dbacc571569a3f168ae141808ac5053ad895ad3ee4dddd311f1e5b3123a8096a5a4b4d10695b5c02d41efa15a92c425987836a5db6ef6469ef77cd23750 WHIRLPOOL 7d36a4b33fb1e981b5ae7b94627de918ad60610ecc8f364b1895593da98f78cfdb606325e862534ecdb9ef53b00de50d31df1e67a5e4fa5325327d8d1e4588a8
+AUX ocamlgraph-makefile.patch 1564 SHA256 c36612f740033a3d158f5d2a458697b1a41dacf2d1964484c1fd0c0f39fd276b SHA512 a0251220741069e729ffebdf7d9f2b3f02119dec48c09321cc9cbc8b82286d4081ccd89dbe5c1fe634ea415aa5e48d162f522ce6509812847dba2909c7572adb WHIRLPOOL 56765554649d5e5d38016ad22183b7b0d46c3780beeffb7f79d46c30e33967a3fd5f8ed92335dd8b5dd727743d25d8975c52d839817e276d13f595b25b7d82f4
+DIST ocamlgraph-1.8.5.tar.gz 269438 SHA256 d167466435a155c779d5ec25b2db83ad851feb42ebc37dca8ffa345ddaefb82f SHA512 e3bf7f43f7b5167cbd23ea44a510d1a569d35771882ab7ae83bacc73822c5f4c944f62c95e0efa813b765e1e385a6b3ebff342cbf1c5589c73d022b8591a52dc WHIRLPOOL d25e124c2814e3196a441e706ca91a0429ab48669309c5dec2ae6697e48064ce54efc9d24440d9e52f3a1af8cfdd5c3ae04cd549fde4e9abc860a3506bd2de8d
+EBUILD ocamlgraph-1.8.5.ebuild 1086 SHA256 3f0b493eb204938e5fbe27db188f1c0d2aaf697a78d1964178e79d2eac5a27e2 SHA512 cc8bf450cfd95177d417e638ad082f7f13a84bf7f0b2059ab5aa10b63d4ad3e87998b35c6d4fca6714bb981ea08180b77c2297e8b74693f93968d74bcd31346e WHIRLPOOL 205b37506e016e9f27158720ea828a71000dfeafa2da331a0145cb524abb27517e7053ee13afb6239ea7c2bd0aef0967872b8cc9eb86fafb188399a6ba8ceb14
+MISC ChangeLog 1288 SHA256 e6b9aa482e6272815905a96ebeb959b8333947336de304fc75ed8bc1bc3ba361 SHA512 7718a1990e660bf8f5194b7aa3a1b7bf0203b27f35c9e6d614cd8fecf055d1a92072ae1829148b98322dce8f6ea5c13112d30a58bf97396ae5a283dcb60edf47 WHIRLPOOL ebfc633797de5dfe2952c5e07d8edfa3d3dfe009bda6e5fc505c7054a152a205e32bca24ddef2a403ebacc8a2afb65c531da8fc5b6d61d6d19ccfc1b1358c7c3
+MISC metadata.xml 1550 SHA256 cf29ffe695398a61363b2f993b7e904ae259447488f14e072f77a098798ed1e0 SHA512 a824c62089e03b1c8936930100b893b25706cbcb5747e218d72120332e14597f2823ac1da64b59a62637d66295679202eb7142867145e2ae28b0667492587103 WHIRLPOOL a91552ca140d206fb80768b25999f38047e8a82904a949c724ba188c8682222709dd9cb3ec3b662c8573b568a97d64e3a64b4dfeb415d212ab6d94209b0f6a78
diff --git a/dev-ml/ocamlgraph/metadata.xml b/dev-ml/ocamlgraph/metadata.xml
index 87fc10d58..763c1cd36 100644
--- a/dev-ml/ocamlgraph/metadata.xml
+++ b/dev-ml/ocamlgraph/metadata.xml
@@ -1,23 +1,32 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<herd>sci-mathematics</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>
+	<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>
+	<use>
+		<flag name="doc">?doc?</flag>
+		<flag name="examples">?examples?</flag>
+		<flag name="gtk">?gtk?</flag>
+		<flag name="ocamlopt">?ocamlopt?</flag>
+	</use>
 </pkgmetadata>
diff --git a/dev-ml/ocamlgraph/ocamlgraph-1.8.2.ebuild b/dev-ml/ocamlgraph/ocamlgraph-1.8.5.ebuild
index 1442073be..d950b6f2d 100644
--- a/dev-ml/ocamlgraph/ocamlgraph-1.8.2.ebuild
+++ b/dev-ml/ocamlgraph/ocamlgraph-1.8.5.ebuild
@@ -7,12 +7,12 @@ EAPI="2"
 inherit eutils autotools
 
 DESCRIPTION="A graph library for Objective Caml"
-HOMEPAGE="http://ocamlgraph.lri.fr/"
-SRC_URI="http://ocamlgraph.lri.fr/download/${P}.tar.gz"
+HOMEPAGE="http://ocamlgraph.lri.fr"
+SRC_URI="${HOMEPAGE}/download/${P}.tar.gz"
 
 LICENSE="LGPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+KEYWORDS="~amd64 ~x86"
 IUSE="doc examples gtk +ocamlopt"
 
 DEPEND=">=dev-lang/ocaml-3.10.2[ocamlopt?]
@@ -21,11 +21,15 @@ RDEPEND="${DEPEND}"
 
 src_prepare() {
 	epatch "${FILESDIR}/${PN}-makefile.patch"
+
+	#dirty fix for doc building
+	sed -i Makefile.in -e "s/-d doc -html \$(DGRAPH_INCLUDES) \$(DOC_SRC)/-d doc -html \$(DGRAPH_INCLUDES) \$(DOC_SRC:src\/merge.mli=)/g"
+
 	eautoreconf
 }
 
 src_compile() {
-	emake -j1 DESTDIR="/" || die "emake failed"
+	DESTDIR="/" emake -j1 || die "emake failed"
 
 	if use doc; then
 		emake doc || die "emake doc failed"
@@ -33,7 +37,7 @@ src_compile() {
 }
 
 src_install() {
-	emake install DESTDIR="${D}" || die "emake install failed"
+	DESTDIR="${D}" emake install || die "emake install failed"
 	dodoc CHANGES CREDITS FAQ README
 
 	if use doc; then