multiple move to EAPI=5 and regression fixes

4 files changed, 27 insertions, 32 deletions

diff --git a/dev-ml/ocamlgraph/ChangeLog b/dev-ml/ocamlgraph/ChangeLog
index 42f0c5b82..5e0ac6b1b 100644
--- a/dev-ml/ocamlgraph/ChangeLog
+++ b/dev-ml/ocamlgraph/ChangeLog
@@ -18,6 +18,10 @@
   -ocamlgraph-1.7.ebuild, +ocamlgraph-1.8.1.ebuild:
   version bump
 
+  24 Jun 2011; Justin Lecher <jlec@gentoo.org>
+  ocamlgraph-1.7.ebuild:
+  Sort inherit and/or USE
+
   06 May 2011; Jonathan-Christofer Demay <jcdemay@gmail.com>
   -ocamlgraph-1.6.ebuild, +ocamlgraph-1.7.ebuild:
   version bump
diff --git a/dev-ml/ocamlgraph/Manifest b/dev-ml/ocamlgraph/Manifest
index 123489c97..4d282fcb3 100644
--- a/dev-ml/ocamlgraph/Manifest
+++ b/dev-ml/ocamlgraph/Manifest
@@ -1,5 +1,5 @@
 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
+EBUILD ocamlgraph-1.8.5.ebuild 1086 SHA256 3e191b1c74ea13e98aaa929df0b5479be4cb56a417c393140c1ad2a867412742 SHA512 69e7460f9e516c65f52eb9e8948a64baf9c9e6f18f9f4bc66ef08030142925febd728563ab8d3466bb2bb0bf10f894dff77f4879dde717fa2441429f5aa0cfb1 WHIRLPOOL 864a2bc22239f72cbd996e4857a9663b076da64bfe88275e8b75344fd240bda34ed22a1d0601bfc0c8455b4dc3d0271b5728214e16507f9cfc7fdd8d6fe029ef
+MISC ChangeLog 1387 SHA256 9060320c8db4044c211893d84654862189015081f1c5ccf8b46d3652aa1e4c1b SHA512 3d1324f8901970edd96846d1284a3c42c60572c7559cff07105acca29c52ef1277bddd6bf53d62a1d6e66daa633b1f0ca64b03f83b6225805ca8d7a0749bbf80 WHIRLPOOL 698c08349275aa77848d3dce9f296c434a920948fb762870888f6472c67a60245c9807d53396e7f1917369f40420904e936757ec080a6458a0bf103d4af0026a
+MISC metadata.xml 1333 SHA256 82d3c80dcba8ffb14abc03224090efebde80d91f4d76a4b39d876ee6f23a74dc SHA512 ea92efe856cb03778ab6985bd456b22ba588cb773e06cbc079d3566d93bf9c7260ed64a14cab4f69c6ad5e04d05807743b73cdefe08ec02a3822ff69f62de684 WHIRLPOOL d4b2b38fc0a63edfb690e22fdcbc0156cb32e34a2086f4b994d870acb3d763d511acb2d752c3dfb133e45acec3a682a2e8a6521fd54ad90341ecadd4f057ce18
diff --git a/dev-ml/ocamlgraph/metadata.xml b/dev-ml/ocamlgraph/metadata.xml
index 763c1cd36..87fc10d58 100644
--- a/dev-ml/ocamlgraph/metadata.xml
+++ b/dev-ml/ocamlgraph/metadata.xml
@@ -1,32 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<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>
+<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>
 </pkgmetadata>
diff --git a/dev-ml/ocamlgraph/ocamlgraph-1.8.5.ebuild b/dev-ml/ocamlgraph/ocamlgraph-1.8.5.ebuild
index d950b6f2d..2a653f2dc 100644
--- a/dev-ml/ocamlgraph/ocamlgraph-1.8.5.ebuild
+++ b/dev-ml/ocamlgraph/ocamlgraph-1.8.5.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="2"
+EAPI="5"
 
 inherit eutils autotools