multiple move to EAPI=5 and regression fixes

10 files changed, 63 insertions, 67 deletions

diff --git a/dev-ml/mlgmpidl/Manifest b/dev-ml/mlgmpidl/Manifest
index 81f2b7f30..7d12e5980 100644
--- a/dev-ml/mlgmpidl/Manifest
+++ b/dev-ml/mlgmpidl/Manifest
@@ -1,5 +1,5 @@
 AUX mlgmpidl-1.1-mpfr-3_compat.patch 496 SHA256 d888a1ad0930895ef2ec83bef6eef5a39ed18a38aa3a637f33b61b9a20d19e2b SHA512 b4979e4dbf1cc5aa1fba5ffb08557c6c32d16e4d2c3ae1fc14d999e52231efb344524e1dc2d6612021a0b4dba4b5f6d1394316abff4698f58d5decc3ff417cbf WHIRLPOOL a3f1c218c2de8413042f56f1de2a6257a895a44edd16daa0e301a20426da0c0275685e440d039d8db39b79853617c54b68002c4d5dd2b63a9d22a9341d987a7d
-DIST mlgmpidl-1.1.tgz 194002 SHA256 8990a56f4c1ff701bb922bacf7f23b40539d123216ac5f9fe0f35967735d6fc9
-EBUILD mlgmpidl-1.1.ebuild 1311 SHA256 756c0655b0045c2e8c2c4072f113023dd70d6e27dd31059db234df7ca586d188 SHA512 493266916193940b1701aea85cbb447e154820113b87ec87319d3ffd11689c08b3a77d5fd8e8c9290b05141ac83707f68ff97e2ba6b5050796b58aa11bc68c1e WHIRLPOOL 1861032f03cf71ec5c6d025c0f2f17964cf07822425d8fca1d1e19c1755ee9d985bc689f49ce123ebdd95f1b682c1c1a00d818900cb6ddae3cf550ae2596010d
+DIST mlgmpidl-1.1.tgz 194002 SHA256 8990a56f4c1ff701bb922bacf7f23b40539d123216ac5f9fe0f35967735d6fc9 SHA512 f7fe74e0e337c2ea33464c49bc1313a3c6a71fee89572d4c23dc26913d8fe1fb41907bfe327d085c39786b63267174be4445b31a5d29acf3e57974ac8b871d2e WHIRLPOOL f4b640f56d5654495c6dec46e8b395dbc86a95ff15a05eb47a07146c07fda956acdd05023ac59636f951ca77d84864b11c14755fe4bb49be3d5ebeb0216f5212
+EBUILD mlgmpidl-1.1.ebuild 1311 SHA256 5b9a199ae39054e96a19aa52a43a56b116a55045536f961779716d008d38570a SHA512 f73268cde4ffcd8610a0052e183b4e1652c8185148e517c8967e62a088dca71901e4b34b404fe5ee5bf4cbee1ce908f2a5fd6f5b9fc70e341130cf5a178a719d WHIRLPOOL 6730b81bdd9dcf99c7c34691174c3f05ae1a99c1f46429a7795c226c3b9ea324cb7ebdb8f386c37c2498a7ba5a6adc01e741da9d9374e954f85b34ec67257502
 MISC ChangeLog 394 SHA256 ec34f25ee458e0ce79b7209a31cfbb9e40975cc3e22e7b97fc9fc57372c9a549 SHA512 eafca747c958cb036ae7dfbd068d8be9c6db76342d42d458c886fc8dc1677d6b5d9bb758da7e138bc89c87816a58ddc50eabf115b5b9a41dfdca8ff3d5bd73eb WHIRLPOOL da7983220947c85972e778061bff3b0612a2de7a39a343a88ef204a6235050b32b8b3a791f485ba187b819f97adb88811c7437cc47096b5f723644ffabd3364b
-MISC metadata.xml 629 SHA256 c430bdc6e03131ed1ce7f991f1ad0d9fd641be877a5bd089da1179fa8d10eb1a SHA512 a5c827b6e812cc96befabb965377723eae2468e8d7ad8f3ae00c6c3ad70d459301225b8f76105ed8f02bdd2f261407b4d2dbd4fab1b1d17806fba0d14f1663b2 WHIRLPOOL 1fb51759a7409d3d3cc8178c3f4db215fb7fbb350bbe6c5314292f303749f1a655bcf0375c3960e9d86506a7981bbede2b9d2beffb5bd2fe861d02a9c7b081d9
+MISC metadata.xml 511 SHA256 78b63974bacd0a10445c1bae284a8e6f4c06b814588108f4f8ac0328526a5532 SHA512 7c80f39526b8c137d4bfe1cb3ee8077d9d5a2b5ea9e6b76209433ace60b1a4b9190b38a4442b1ba3e6622fa92320cf47e32c17ba0329ccfb98b86ddec13c0dd1 WHIRLPOOL 793a5fe5f3a639cef7addf469b7e8a91cbb4a21a67081182eb1ecdfdebdaecad719deb49f55d5463b9571e6a0c6c6983d72c8f9b92d35f52d131e54d2510cbfb
diff --git a/dev-ml/mlgmpidl/metadata.xml b/dev-ml/mlgmpidl/metadata.xml
index c6107f8e5..a3fac8132 100644
--- a/dev-ml/mlgmpidl/metadata.xml
+++ b/dev-ml/mlgmpidl/metadata.xml
@@ -1,17 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sci</herd>
-	<longdescription>
-		MLGMPIDL is a package offering an interface to the GMP and MPFR
-		libraries for OCaml version 3.07 or higher. The interface offers access
-		to almost all the functions of the library, and is decomposed into 7
-		submodules.
-	</longdescription>
-	<maintainer>
-		<email>sci@gentoo.org</email>
-	</maintainer>
-	<use>
-		<flag name="mpfr">add support for mpfr, the library for multiple-precision floating-point computations with exact rounding</flag>
-	</use>
+<herd>sci-mathematics</herd>
+<longdescription>
+  MLGMPIDL is a package offering an interface to the GMP and MPFR
+  libraries for OCaml version 3.07 or higher. The interface offers access
+  to almost all the functions of the library, and is decomposed into 7
+  submodules.
+</longdescription>
+<use>
+  <flag name="mpfr">Add support for <pkg>dev-libs/mpfr</pkg></flag>
+</use>
 </pkgmetadata>
diff --git a/dev-ml/mlgmpidl/mlgmpidl-1.1.ebuild b/dev-ml/mlgmpidl/mlgmpidl-1.1.ebuild
index 6efca0c5f..3063fdf37 100644
--- a/dev-ml/mlgmpidl/mlgmpidl-1.1.ebuild
+++ b/dev-ml/mlgmpidl/mlgmpidl-1.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2010 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Header: $
 
-EAPI="2"
+EAPI="5"
 
 inherit eutils toolchain-funcs
 
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
 
diff --git a/dev-ml/zarith/ChangeLog b/dev-ml/zarith/ChangeLog
index 2868b8432..434b2364a 100644
--- a/dev-ml/zarith/ChangeLog
+++ b/dev-ml/zarith/ChangeLog
@@ -5,7 +5,7 @@
   22 Jun 2014; Jonathan-Christofer Demay <jcdemay@gmail.com>
   zarith-1.2.1.ebuild:
   fix regression of pkg_setup
-  
+
   10 Jun 2014; Jonathan-Christofer Demay <jcdemay@gmail.com>
   -zarith-1.1.ebuild, +zarith-1.2.1.ebuild:
   version bump
@@ -14,7 +14,14 @@
   zarith-1.1.ebuild, metadata.xml:
   Clean wrong space and blank lines; move EAPI=5
 
-  14 Jan 2013; Jonathan-Christofer Demay <jcdemay@gmail.com>
-  +zarith-1.1.ebuild:
-  initial commit
+  11 Aug 2012; Guillaume Horel <guillaume.horel@gmail.com>
+  zarith-1.1.ebuild:
+  fix license and depend on multilib eclass
+
+  30 Mar 2012; Guillaume Horel <guillaume.horel@gmail.com>
+  -zarith-1.0.ebuild, -files/zarith-1.0-bytecode.patch, -files/zarith-1.0-optnotrequired.patch, +zarith-1.1.ebuild:
+  version bump
 
+  02 Mar 2012; Guillaume Horel <guillaume.horel@gmail.com> +zarith-1.0.ebuild,
+  +files/zarith-1.0-bytecode.patch, +files/zarith-1.0-optnotrequired.patch, +metadata.xml:
+  initial import
diff --git a/dev-ml/zarith/Manifest b/dev-ml/zarith/Manifest
index d7156cb11..abb9fd902 100644
--- a/dev-ml/zarith/Manifest
+++ b/dev-ml/zarith/Manifest
@@ -1 +1,4 @@
 DIST zarith-1.2.1.tgz 68654 SHA256 916801cc39599d3fca07384fbfeec4bfaa5ffcb497d68ef89320af40ba5e4144 SHA512 5c053e259469bf6a2d4aaa3e653da42d18015e815a0b922a4e317db091a54c560e7ed32f5cb1faae7df1e8a6d81ba3913d71e5b500ace1bd45d69e69858467a1 WHIRLPOOL e31770c23e7f77bff8f084eeb3e0a9cab7c1413f2da64926c403720df2351bb84598953ad1bae0436d9b3ba6e66c1543aee0dbd9151a3708d793abe5506f1e00
+EBUILD zarith-1.2.1.ebuild 1258 SHA256 34d07649a322771888cb26e0fbf64da4fdadb6bc0eae2b9d4d6bb702ec1f3e77 SHA512 f8a23a5aa3fff3148847076ab175dbb5c02cf0673eff6807e90b4a2e886ad2252812d224193a529a1e2388c928490d97dce5364b904b60a4b3b1c0575e122768 WHIRLPOOL e55a861fdf2085d16c7d1cb3a01d062a3bb0971e65a843aefeb8bf93c5026a2400463c2994c9e46ad80c0bb50ed4c48631c35eaa69abe9a1b2df40b3b8e19927
+MISC ChangeLog 985 SHA256 f7f5f77792f72bbfd65e6868b08989d0ca8cca602523528ff14381d0870823f8 SHA512 ebc2bbefdfab685ca3703d14262eaec90439426ec8c43a309c744dd420d86fb1bef93decdb15346211ab2b75bf639f45c75a3fd0328b79f5d06d9bda4129a8aa WHIRLPOOL 6cfbe33c6c803048b6a70dfe7c1154041fe34fcaeebf13f8fd4c984e94098cc262d45f7c97bc6b04c3c513b8ea4c0f3418a6c3dfb8e2b0f6a65333bd557e0faa
+MISC metadata.xml 465 SHA256 562d89dff0b27cf62e633567eda98e8f997a6b35fe931b83846f25d02813c012 SHA512 0a1e3a0f6a05a4ff9d5de7b3429228b662371e1ed77f0263beded417cae5989f3940b49bb70dab6a9854c37699cf603486772e89ac4269a7eacaa31a0ddd89de WHIRLPOOL 26b03abc839e37851f8b0d45297d2c876bb2ac51b4a88fef0d4ba3d1b7eb868094ed96e10300fa6c519edae7eedfa959d15cb42d0a17c5dd4d01d8758409ec25
diff --git a/dev-ml/zarith/metadata.xml b/dev-ml/zarith/metadata.xml
index d2e969145..1ff321877 100644
--- a/dev-ml/zarith/metadata.xml
+++ b/dev-ml/zarith/metadata.xml
@@ -1,17 +1,11 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<herd>sci</herd>
-	<longdescription>
-		The Zarith library implements arithmetic and logical operations over
-		arbitrary-precision integers. It uses GMP to efficiently implement
-		arithmetic over big integers. Small integers are represented as Caml
-		unboxed integers, for speed and space economy.
-	</longdescription>
-	<maintainer>
-  		<email>sci@gentoo.org</email>
-	</maintainer>
-	<use>
-		<flag name="ocamlopt">?ocamlopt?</flag>
-	</use>
+<herd>sci-mathematics</herd>
+<longdescription>
+  The Zarith library implements arithmetic and logical operations over
+  arbitrary-precision integers. It uses GMP to efficiently implement
+  arithmetic over big integers. Small integers are represented as Caml
+  unboxed integers, for speed and space economy.
+</longdescription>
 </pkgmetadata>