EAPI5, define suslot and add := dep on ocaml

Package-Manager: portage-2.2.0/cvs/Linux x86_64
Manifest-Sign-Key: 0x160F534A

3 files changed, 29 insertions, 16 deletions

diff --git a/dev-ml/ocaml-expat/ChangeLog b/dev-ml/ocaml-expat/ChangeLog
index c8d9aada5a2d..a062ea6cd1dd 100644
--- a/dev-ml/ocaml-expat/ChangeLog
+++ b/dev-ml/ocaml-expat/ChangeLog
@@ -1,6 +1,9 @@
 # ChangeLog for dev-ml/ocaml-expat
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ml/ocaml-expat/ChangeLog,v 1.5 2009/09/28 16:53:50 betelgeuse Exp $
+# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/ocaml-expat/ChangeLog,v 1.6 2013/08/19 13:33:11 aballier Exp $
+
+  19 Aug 2013; Alexis Ballier <aballier@gentoo.org> ocaml-expat-0.9.1.ebuild:
+  EAPI5, define suslot and add := dep on ocaml
 
   28 Sep 2009; Petteri Räty <betelgeuse@gentoo.org>
   ocaml-expat-0.9.1.ebuild:
diff --git a/dev-ml/ocaml-expat/Manifest b/dev-ml/ocaml-expat/Manifest
index 54b49609e057..09b396c8aa53 100644
--- a/dev-ml/ocaml-expat/Manifest
+++ b/dev-ml/ocaml-expat/Manifest
@@ -1,5 +1,15 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX ocaml-expat-0.9.1-test.patch 870 SHA256 f53c0612c19d8b101dacedb7f737d22d4ba17249c9cfeb95783248d75cd0f15a SHA512 e767d35b1ff61c880a897be1c87f8e17710556b491b0f537ef91e60f9b5e5c665a895070b7c31dda75260ddb31103f63127426bf8d75ef8df6a90b088df6d09e WHIRLPOOL d661e30af7edda62cdc35bbee4ce5a8fa6104e8b38756e2991be57067a6eba46c02e1a8d990143154b39e519879d6844e5e151584b2daaeff12659beac5964fd
 DIST ocaml-expat-0.9.1.tar.gz 25223 SHA256 5fbe8c38f3ab45da5f850aae6b37183f4a8b79a63771a83d7e3d3109fc90c29a SHA512 0dca5bb3279e248acd76bc1b14511c58f2e60d8c40d806f3d270b6a47ab0e90efb636faed0dd8c34cf00a0b0834aa458421f4f9718d2a8c43dcf77854c11b3f4 WHIRLPOOL 483ca73680cba94cbf9c7573824c2085e85334b2ec33809fc895c4bce9f52d593776aad6d1761e92aeb3db2ba2a73319b8d1196647c53200c8817bcbd9e09010
-EBUILD ocaml-expat-0.9.1.ebuild 1099 SHA256 cec2efd5a860abcbd42617fbf4128d4fa7629d632814e6af613f359bb9d655d2 SHA512 38a76b885b8f9fb194818e75863907227ab2725e3d0684827587f719dc15cf552a174438ef73c1e81f58a3e6e8c6a4897d3c33fc242910b61a1f651431d72ec9 WHIRLPOOL 2d6a00aa29dbb4462eb6ef9bfa9407797f0d029698c9074328e8d4c0e51999bb49c6b41a9d40427b2ee3c27b2a6a584f949c76a45bfef16f2fdfa7c43e6de124
-MISC ChangeLog 1113 SHA256 affc870b377f35198005ffd1ca35b3348721e43099f59028213e21b3264ea421 SHA512 b53feb2cfa32d9d3d5f020bac250f2d814a94538a9f50e73011fe4355158ac075fcb3e595f9c3485efad6ffe6b79ec548243461f252b31b5f94a756776483d9a WHIRLPOOL fe5ec04a6f2f87de4d490af061af1f77afa42b64a8cd498a10046a76fb9d1e80394575b555b24e4e76261fe6f642f79cd333388991a7f5e84365684e788db2cb
+EBUILD ocaml-expat-0.9.1.ebuild 929 SHA256 fb8c12d269807c3f66e9fdfdea3eeb65a5954c85ee3d38ad5fb7c9d73ad4334e SHA512 cfd069c58812b22aeb9b9efe417eaf1197acd8843d8b993db5fbf47cdab01f9c98827d64adc74eed9370d1f71fce26ae1bb343a08c1c7cbf42729ed9e0ea1463 WHIRLPOOL d3344f16ee15938e6b98a7170e9cf087379fd1a0dbf65f59478959a80bedbf72b6793981fd098a21e423698e9757d735894e44ff3246482384756a442efbbf8b
+MISC ChangeLog 1237 SHA256 31462aa2cdb0fda4123550028acb20f571dd5a420242c73581232749af3156c3 SHA512 a89580e21d64b1547b0e1885718b084bba5b1eb1cb8475394a095a2da5e086d160b8fce3d56fa0967b6de8cbce773b671d27ea2e82414f0183f4b3e0fb6fe8f3 WHIRLPOOL 490d7d7f2160d471d464e5ce3b89a945fe152822a388b584b23f7e09488e8d8c36f783166b6c8e607130ed24b31dfa0b2ed7a50f009c3309bde9bf6785f7a8a3
 MISC metadata.xml 157 SHA256 d14b8b08774f2a40f42d70ff40b1b4f1c4725e7095d702143a32909553eac799 SHA512 5e4a17ffdcc021c3d28f9ac71f8ec0b35a243e269281ba7db2e17845d7990221040ab16db6fa13c708f7d8db154d8d65d2d7f80f3a7dd84bc001449369738f2f WHIRLPOOL 79ae48d5df04eab0d90848c85d48c62b0e3901cc5c9a74d0b85de5becac5de0f55a3c9c719bf716bb757cfd8be306a222f247a0749fb346f6589893698b25c63
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.20 (GNU/Linux)
+
+iEYEAREIAAYFAlISHpgACgkQvFcC4BYPU0ptaACguB2SKVormRNIW43CP0mdFsM8
+8HoAniZS0hTx/yPGhDyXYqBE54F5hCpO
+=jeGj
+-----END PGP SIGNATURE-----
diff --git a/dev-ml/ocaml-expat/ocaml-expat-0.9.1.ebuild b/dev-ml/ocaml-expat/ocaml-expat-0.9.1.ebuild
index d14debb42c3b..cd01e15dd377 100644
--- a/dev-ml/ocaml-expat/ocaml-expat-0.9.1.ebuild
+++ b/dev-ml/ocaml-expat/ocaml-expat-0.9.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2009 Gentoo Foundation
+# Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-ml/ocaml-expat/ocaml-expat-0.9.1.ebuild,v 1.5 2009/09/28 16:53:50 betelgeuse Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-ml/ocaml-expat/ocaml-expat-0.9.1.ebuild,v 1.6 2013/08/19 13:33:11 aballier Exp $
 
-EAPI="2"
+EAPI=5
 
 inherit findlib eutils
 
@@ -13,12 +13,12 @@ SRC_URI="http://www.xs4all.nl/~mmzeeman/ocaml/${P}.tar.gz"
 HOMEPAGE="http://www.xs4all.nl/~mmzeeman/ocaml/"
 
 RDEPEND="dev-libs/expat
-	>=dev-lang/ocaml-3.10.2[ocamlopt?]"
+	>=dev-lang/ocaml-3.10.2:=[ocamlopt?]"
 
 DEPEND="${RDEPEND}
 	test? ( dev-ml/ounit )"
 
-SLOT="0"
+SLOT="0/${PV}"
 LICENSE="MIT"
 KEYWORDS="~amd64 ~ppc ~x86"
 
@@ -27,25 +27,25 @@ src_prepare(){
 }
 
 src_compile() {
-	emake depend || die "make depend failed"
-	emake all || die "make failed"
+	emake depend
+	emake all
 	if use ocamlopt; then
-		emake allopt || die "failed to build native code programs"
+		emake allopt
 	fi
 }
 
 src_test() {
-	emake test || die "bytecode tests failed"
+	emake test
 	if use ocamlopt; then
-		emake testopt || die "native code tests failed"
+		emake testopt
 	fi
 }
 src_install() {
 	findlib_src_preinst
-	emake install || die
+	emake install
 
 	if use doc ; then
 		dohtml -r doc/html/*
 	fi
-	dodoc README || die
+	dodoc README
 }